Update to use xtensor 0.11

Author: SylvainCorlay

.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.10.9 pytest numpy pybind11==2.1.1 -c conda-forge
+  - conda install xtensor==0.11.0 pytest numpy pybind11==2.1.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.10.9 pytest numpy pybind11==2.1.1 -c conda-forge
+    - conda install xtensor==0.11.0 pytest numpy pybind11==2.1.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.10.9   | ^2.1.0      |
+| master            |  ^0.11.0   | ^2.1.0      |
 | 0.12.x            |  ^0.10.2   | 2.1.\*      |
 | 0.11.x            |  ^0.10.0   | 2.1.\*      |
 | 0.10.x            |  ^0.9.0    | 2.1.\*      |

include/xtensor-python/pyarray.hpp

@@ -427,13 +427,13 @@ namespace xt
     template <class A>
     inline auto pyarray_backstrides<A>::cbegin() const -> const_iterator
     {
-        const_iterator(this, 0);
+        return const_iterator(this, 0);
     }
 
     template <class A>
     inline auto pyarray_backstrides<A>::cend() const -> const_iterator
     {
-        const_iterator(this, size());
+        return const_iterator(this, size());
     }
 
     /**************************

include/xtensor-python/pystrides_adaptor.hpp

@@ -34,6 +34,7 @@ namespace xt
         using difference_type = std::ptrdiff_t;
 
         using const_iterator = pystrides_iterator<N>;
+        using const_reverse_iterator = std::reverse_iterator<const_iterator>;
 
         pystrides_adaptor() = default;
         pystrides_adaptor(const_pointer data, size_type size);
@@ -51,6 +52,11 @@ namespace xt
         const_iterator cbegin() const;
         const_iterator cend() const;
 
+        const_reverse_iterator rbegin() const;
+        const_reverse_iterator rend() const;
+        const_reverse_iterator crbegin() const;
+        const_reverse_iterator crend() const;
+
     private:
 
         const_pointer p_data;
@@ -114,6 +120,7 @@ namespace xt
             ++p_current;
             return tmp;
         }
+
         inline self_type operator--(int)
         {
             self_type tmp(*this);
@@ -143,11 +150,10 @@ namespace xt
             return self_type(p_current - n);
         }
 
-        inline self_type operator-(const self_type& rhs) const
+        inline difference_type operator-(const self_type& rhs) const
         {
             self_type tmp(*this);
-            tmp -= (p_current - rhs.p_current);
-            return tmp;
+            return p_current - rhs.p_current;
         }
 
         pointer get_pointer() const { return p_current; }
@@ -262,6 +268,30 @@ namespace xt
     {
         return const_iterator(p_data + m_size);
     }
+
+    template <std::size_t N>
+    inline auto pystrides_adaptor<N>::rbegin() const -> const_reverse_iterator
+    {
+        return crbegin();
+    }
+
+    template <std::size_t N>
+    inline auto pystrides_adaptor<N>::rend() const -> const_reverse_iterator
+    {
+        return crend();
+    }
+
+    template <std::size_t N>
+    inline auto pystrides_adaptor<N>::crbegin() const -> const_reverse_iterator
+    {
+        return const_reverse_iterator(cend());
+    }
+
+    template <std::size_t N>
+    inline auto pystrides_adaptor<N>::crend() const -> const_reverse_iterator
+    {
+        return const_reverse_iterator(cbegin());
+    }
 }
 
 #endif