diff --git a/.appveyor.yml b/.appveyor.yml index f150694..780e2b7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,7 +24,7 @@ install: - conda info -a - conda install gtest cmake -c conda-forge - conda install pytest numpy pybind11==2.2.1 -c conda-forge - - conda install xtensor==0.16.0 -c QuantStack + - conda install xtensor==0.17.0 -c QuantStack - "set PYTHONHOME=%MINICONDA%" - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe . - nmake test_xtensor_python diff --git a/.travis.yml b/.travis.yml index 7f9e339..5e6817b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,7 +97,7 @@ install: - conda info -a - conda install pytest numpy pybind11==2.2.1 -c conda-forge - conda install cmake gtest -c conda-forge - - conda install xtensor==0.16.0 -c QuantStack + - conda install xtensor==0.17.0 -c QuantStack - cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda . - make -j2 test_xtensor_python - make install diff --git a/include/xtensor-python/pyarray.hpp b/include/xtensor-python/pyarray.hpp index bad595c..d9706ed 100644 --- a/include/xtensor-python/pyarray.hpp +++ b/include/xtensor-python/pyarray.hpp @@ -288,7 +288,7 @@ namespace xt { using storage_type = xbuffer_adaptor; using shape_type = std::vector; - using strides_type = shape_type; + using strides_type = std::vector; using backstrides_type = pyarray_backstrides>; using inner_shape_type = xbuffer_adaptor; using inner_strides_type = pystrides_adaptor; diff --git a/test/test_common.hpp b/test/test_common.hpp index d8bdf2f..e2d1e2d 100644 --- a/test/test_common.hpp +++ b/test/test_common.hpp @@ -34,7 +34,7 @@ namespace xt using vector_type = uvector; using size_type = typename C::value_type; using shape_type = C; - using strides_type = C; + using strides_type = get_strides_t; using assigner_type = std::vector>;