Skip to content

Commit b770442

Browse files
committed
Update xtensor
1 parent f1a64a8 commit b770442

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ install:
2323
- conda update -q conda
2424
- conda info -a
2525
- 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
2727
- "set PYTHONHOME=%MINICONDA%"
2828
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
2929
- nmake test_xtensor_python

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ install:
9595
- conda update -q conda
9696
# Useful for debugging any issues with conda
9797
- 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
9999
- conda install cmake gtest -c conda-forge
100100
- cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda .
101101
- make -j2 test_xtensor_python

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ from the `docs` subdirectory.
189189

190190
| `xtensor-python` | `xtensor` | `pybind11` |
191191
|------------------|-----------|------------------|
192-
| master | ^0.12.0 | ~2.1.0 or ~2.2.1 |
192+
| master | ^0.13.0 | ~2.1.0 or ~2.2.1 |
193193
| 0.14.x | ^0.12.0 | ~2.1.0 or ~2.2.1 |
194194
| 0.13.x | ^0.11.0 | ~2.1.0 or ~2.2.1 |
195195
| 0.12.x | ^0.10.2 | 2.1.\* |

include/xtensor-python/pyarray.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,11 @@ namespace xt
291291
template <class T>
292292
struct xcontainer_inner_types<pyarray<T>>
293293
{
294-
using container_type = xbuffer_adaptor<T>;
294+
using container_type = xbuffer_adaptor<T*>;
295295
using shape_type = std::vector<typename container_type::size_type>;
296296
using strides_type = shape_type;
297297
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*>;
299299
using inner_strides_type = pystrides_adaptor<sizeof(T)>;
300300
using inner_backstrides_type = backstrides_type;
301301
using temporary_type = pyarray<T>;

include/xtensor-python/pytensor.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ namespace xt
110110
template <class T, std::size_t N>
111111
struct xcontainer_inner_types<pytensor<T, N>>
112112
{
113-
using container_type = xbuffer_adaptor<T>;
113+
using container_type = xbuffer_adaptor<T*>;
114114
using shape_type = std::array<npy_intp, N>;
115115
using strides_type = shape_type;
116116
using backstrides_type = shape_type;

0 commit comments

Comments
 (0)