Merge pull request #91 from JohanMabille/xtensor_010

Switched to xtensor 0.10.0

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.9.0 pytest numpy pybind11==2.1.1 -c conda-forge
+  - conda install xtensor==0.10.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

@@ -94,7 +94,7 @@ install:
     - conda update -q conda
     # Useful for debugging any issues with conda
     - conda info -a
-    - conda install xtensor==0.9.0 pytest numpy pybind11==2.1.1 -c conda-forge
+    - conda install xtensor==0.10.0 pytest numpy pybind11==2.1.1 -c conda-forge
     - cd test
     - conda env create -f ./test-environment.yml
     - source activate test-xtensor-python

CMakeLists.txt

@@ -50,7 +50,7 @@ endif()
 if(BUILD_TESTS)
     include_directories(${XTENSOR_PYTHON_INCLUDE_DIR})
     find_package(xtensor REQUIRED)
-    include_directories(${xtensor_INCLUDE_DIR})
+    include_directories(${xtensor_INCLUDE_DIRS})
     find_package(NumPy REQUIRED)
     include_directories(${NUMPY_INCLUDE_DIRS})
 

include/xtensor-python/pyarray.hpp

@@ -495,7 +495,7 @@ namespace xt
                                        static_cast<size_type>(PyArray_NDIM(this->python_array())));
         m_backstrides = backstrides_type(*this);
         m_data = container_type(reinterpret_cast<pointer>(PyArray_DATA(this->python_array())),
-                                static_cast<size_type>(PyArray_SIZE(this->python_array())));
+                                this->get_min_stride() * static_cast<size_type>(PyArray_SIZE(this->python_array())));
     }
 
     template <class T>

include/xtensor-python/pycontainer.hpp

@@ -77,9 +77,6 @@ namespace xt
         using stepper = typename iterable_base::stepper;
         using const_stepper = typename iterable_base::const_stepper;
 
-        using broadcast_iterator = typename iterable_base::broadcast_iterator;
-        using const_broadcast_iterator = typename iterable_base::broadcast_iterator;
-
         static constexpr layout_type static_layout = layout_type::dynamic;
         static constexpr bool contiguous_layout = false;
 
@@ -114,6 +111,7 @@ namespace xt
         static PyObject* raw_array_t(PyObject* ptr);
 
         PyArrayObject* python_array() const;
+        size_type get_min_stride() const;
     };
 
     namespace detail
@@ -209,6 +207,13 @@ namespace xt
         return reinterpret_cast<PyArrayObject*>(this->m_ptr);
     }
 
+    template <class D>
+    inline auto pycontainer<D>::get_min_stride() const -> size_type
+    {
+        const size_type & (*min) (const size_type&, const size_type&) = std::min<size_type>;
+        return std::max(size_type(1), std::accumulate(this->strides().cbegin(), this->strides().cend(), std::numeric_limits<size_type>::max(), min));
+    }
+
     /**
      * Reshapes the container.
      * @param shape the new shape

include/xtensor-python/pytensor.hpp

@@ -407,7 +407,7 @@ namespace xt
                 [](auto v) { return v / sizeof(T); });
         adapt_strides(m_shape, m_strides, m_backstrides);
         m_data = container_type(reinterpret_cast<pointer>(PyArray_DATA(this->python_array())),
-                                static_cast<size_type>(PyArray_SIZE(this->python_array())));
+                                this->get_min_stride() * static_cast<size_type>(PyArray_SIZE(this->python_array())));
     }
 
     template <class T, std::size_t N>

test/CMakeLists.txt

@@ -15,10 +15,10 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     set(PYBIND11_INCLUDE_DIR ${pybind11_INCLUDE_DIRS})
 
     find_package(xtensor REQUIRED CONFIG)
-    set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIR})
+    set(XTENSOR_INCLUDE_DIR ${xtensor_INCLUDE_DIRS})
 
     find_package(xtensor-python REQUIRED CONFIG)
-    set(XTENSOR_PYTHON_INCLUDE_DIR ${xtensor-python_INCLUDE_DIR})
+    set(XTENSOR_PYTHON_INCLUDE_DIR ${xtensor-python_INCLUDE_DIRS})
 endif ()
 
 message(STATUS "Forcing tests build type to Release")

xtensor-pythonConfig.cmake.in

@@ -6,16 +6,16 @@
 # The full license is in the file LICENSE, distributed with this software. #
 ############################################################################
 
-# xtensor cmake module
+# xtensor-python cmake module
 # This module sets the following variables in your project::
 #
-#   xtensor_FOUND - true if xtensor found on the system
-#   xtensor_INCLUDE_DIR - the directory containing xtensor headers
-#   xtensor_LIBRARY - empty
+#   xtensor-python_FOUND - true if xtensor-python found on the system
+#   xtensor-python_INCLUDE_DIRS - the directory containing xtensor-python headers
+#   xtensor-python_LIBRARY - empty
 
 @PACKAGE_INIT@
 
 set(PN xtensor-python)
-set_and_check(${PN}_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
+set_and_check(${PN}_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
 set(${PN}_LIBRARY "")
 check_required_components(${PN})