Merge pull request #121 from SylvainCorlay/update-xtensor

Update xtensor

Author: JohanMabille

.appveyor.yml

@@ -23,7 +23,7 @@ install:
   - conda update -q conda
   - conda info -a
   - conda install gtest cmake -c conda-forge
-  - conda install xtensor==0.12.1 pytest numpy pybind11==2.2.1 -c conda-forge
+  - conda install xtensor==0.13.0 pytest numpy pybind11==2.2.1 -c conda-forge
   - "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

.travis.yml

@@ -95,7 +95,7 @@ install:
     - conda update -q conda
     # Useful for debugging any issues with conda
     - conda info -a
-    - conda install xtensor==0.12.1 pytest numpy pybind11==2.2.1 -c conda-forge
+    - conda install xtensor==0.13.0 pytest numpy pybind11==2.2.1 -c conda-forge
     - conda install cmake gtest -c conda-forge
     - cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda .
     - make -j2 test_xtensor_python

README.md

@@ -189,7 +189,7 @@ from the `docs` subdirectory.
 
 | `xtensor-python` | `xtensor` |  `pybind11`      |
 |------------------|-----------|------------------|
-| master           |  ^0.12.0  | ~2.1.0 or ~2.2.1 |
+| master           |  ^0.13.0  | ~2.1.0 or ~2.2.1 |
 | 0.14.x           |  ^0.12.0  | ~2.1.0 or ~2.2.1 |
 | 0.13.x           |  ^0.11.0  | ~2.1.0 or ~2.2.1 |
 | 0.12.x           |  ^0.10.2  | 2.1.\*           |

include/xtensor-python/pyarray.hpp

@@ -291,11 +291,11 @@ namespace xt
     template <class T>
     struct xcontainer_inner_types<pyarray<T>>
     {
-        using container_type = xbuffer_adaptor<T>;
+        using container_type = xbuffer_adaptor<T*>;
         using shape_type = std::vector<typename container_type::size_type>;
         using strides_type = shape_type;
         using backstrides_type = pyarray_backstrides<pyarray<T>>;
-        using inner_shape_type = xbuffer_adaptor<std::size_t>;
+        using inner_shape_type = xbuffer_adaptor<std::size_t*>;
         using inner_strides_type = pystrides_adaptor<sizeof(T)>;
         using inner_backstrides_type = backstrides_type;
         using temporary_type = pyarray<T>;

include/xtensor-python/pytensor.hpp

@@ -110,7 +110,7 @@ namespace xt
     template <class T, std::size_t N>
     struct xcontainer_inner_types<pytensor<T, N>>
     {
-        using container_type = xbuffer_adaptor<T>;
+        using container_type = xbuffer_adaptor<T*>;
         using shape_type = std::array<npy_intp, N>;
         using strides_type = shape_type;
         using backstrides_type = shape_type;