Commit b770442
committed
Update xtensor
1 parent f1a64a8 commit b770442
5 files changed
Lines changed: 6 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -23,7 +23,7 @@ install: | |||
| 23 | 23 | - conda update -q conda | |
| 24 | 24 | - conda info -a | |
| 25 | 25 | - conda install gtest cmake -c conda-forge | |
| 26 | - - conda install xtensor==0.12.1 pytest numpy pybind11==2.2.1 -c conda-forge | ||
| 26 | + - conda install xtensor==0.13.0 pytest numpy pybind11==2.2.1 -c conda-forge | ||
| 27 | 27 | - "set PYTHONHOME=%MINICONDA%" | |
| 28 | 28 | - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe . | |
| 29 | 29 | - nmake test_xtensor_python | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -95,7 +95,7 @@ install: | |||
| 95 | 95 | - conda update -q conda | |
| 96 | 96 | # Useful for debugging any issues with conda | |
| 97 | 97 | - conda info -a | |
| 98 | - - conda install xtensor==0.12.1 pytest numpy pybind11==2.2.1 -c conda-forge | ||
| 98 | + - conda install xtensor==0.13.0 pytest numpy pybind11==2.2.1 -c conda-forge | ||
| 99 | 99 | - conda install cmake gtest -c conda-forge | |
| 100 | 100 | - cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda . | |
| 101 | 101 | - make -j2 test_xtensor_python | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -189,7 +189,7 @@ from the `docs` subdirectory. | |||
| 189 | 189 | ||
| 190 | 190 | | `xtensor-python` | `xtensor` | `pybind11` | | |
| 191 | 191 | |------------------|-----------|------------------| | |
| 192 | - | master | ^0.12.0 | ~2.1.0 or ~2.2.1 | | ||
| 192 | + | master | ^0.13.0 | ~2.1.0 or ~2.2.1 | | ||
| 193 | 193 | | 0.14.x | ^0.12.0 | ~2.1.0 or ~2.2.1 | | |
| 194 | 194 | | 0.13.x | ^0.11.0 | ~2.1.0 or ~2.2.1 | | |
| 195 | 195 | | 0.12.x | ^0.10.2 | 2.1.\* | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -291,11 +291,11 @@ namespace xt | |||
| 291 | 291 | template <class T> | |
| 292 | 292 | struct xcontainer_inner_types<pyarray<T>> | |
| 293 | 293 | { | |
| 294 | - using container_type = xbuffer_adaptor<T>; | ||
| 294 | + using container_type = xbuffer_adaptor<T*>; | ||
| 295 | 295 | using shape_type = std::vector<typename container_type::size_type>; | |
| 296 | 296 | using strides_type = shape_type; | |
| 297 | 297 | using backstrides_type = pyarray_backstrides<pyarray<T>>; | |
| 298 | - using inner_shape_type = xbuffer_adaptor<std::size_t>; | ||
| 298 | + using inner_shape_type = xbuffer_adaptor<std::size_t*>; | ||
| 299 | 299 | using inner_strides_type = pystrides_adaptor<sizeof(T)>; | |
| 300 | 300 | using inner_backstrides_type = backstrides_type; | |
| 301 | 301 | using temporary_type = pyarray<T>; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -110,7 +110,7 @@ namespace xt | |||
| 110 | 110 | template <class T, std::size_t N> | |
| 111 | 111 | struct xcontainer_inner_types<pytensor<T, N>> | |
| 112 | 112 | { | |
| 113 | - using container_type = xbuffer_adaptor<T>; | ||
| 113 | + using container_type = xbuffer_adaptor<T*>; | ||
| 114 | 114 | using shape_type = std::array<npy_intp, N>; | |
| 115 | 115 | using strides_type = shape_type; | |
| 116 | 116 | using backstrides_type = shape_type; | |
0 commit comments