Skip to content

Commit 52021de

Browse files
authored
Merge pull request xtensor-stack#159 from JohanMabille/xtensor_017
Upgrade to xtensor 0.17.0
2 parents b880516 + 10a62ef commit 52021de

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ install:
2424
- conda info -a
2525
- conda install gtest cmake -c conda-forge
2626
- conda install pytest numpy pybind11==2.2.1 -c conda-forge
27-
- conda install xtensor==0.16.0 -c QuantStack
27+
- conda install xtensor==0.17.0 -c QuantStack
2828
- "set PYTHONHOME=%MINICONDA%"
2929
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
3030
- nmake test_xtensor_python

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ install:
9797
- conda info -a
9898
- conda install pytest numpy pybind11==2.2.1 -c conda-forge
9999
- conda install cmake gtest -c conda-forge
100-
- conda install xtensor==0.16.0 -c QuantStack
100+
- conda install xtensor==0.17.0 -c QuantStack
101101
- cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda .
102102
- make -j2 test_xtensor_python
103103
- make install

include/xtensor-python/pyarray.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ namespace xt
288288
{
289289
using storage_type = xbuffer_adaptor<T*>;
290290
using shape_type = std::vector<typename storage_type::size_type>;
291-
using strides_type = shape_type;
291+
using strides_type = std::vector<typename storage_type::difference_type>;
292292
using backstrides_type = pyarray_backstrides<pyarray<T, L>>;
293293
using inner_shape_type = xbuffer_adaptor<std::size_t*>;
294294
using inner_strides_type = pystrides_adaptor<sizeof(T)>;

test/test_common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace xt
3434
using vector_type = uvector<int>;
3535
using size_type = typename C::value_type;
3636
using shape_type = C;
37-
using strides_type = C;
37+
using strides_type = get_strides_t<shape_type>;
3838

3939
using assigner_type = std::vector<std::vector<vector_type>>;
4040

0 commit comments

Comments
 (0)