Merge pull request #209 from yungyuc/fix-is-contiguous

JohanMabille · web-flow · commit 0d004f31b7f0 · 2019-12-09T11:51:51.000+01:00
Fix build error caused by upstream xtensor change (in xtensor master)
diff --git a/include/xtensor-python/pycontainer.hpp b/include/xtensor-python/pycontainer.hpp
@@ -95,6 +95,7 @@ namespace xt
         auto& reshape(S&& shape, layout_type layout = base_type::static_layout) &;
 
         layout_type layout() const;
+        bool is_contiguous() const noexcept;
 
         using base_type::operator();
         using base_type::operator[];
@@ -465,6 +466,27 @@ namespace xt
         }
     }
 
+    /**
+     * Return whether or not the container uses contiguous buffer
+     * @return Boolean for contiguous buffer
+     */
+    template <class D>
+    inline bool pycontainer<D>::is_contiguous() const noexcept
+    {
+        if (PyArray_CHKFLAGS(python_array(), NPY_ARRAY_C_CONTIGUOUS))
+        {
+            return 1 == this->strides().back();
+        }
+        else if (PyArray_CHKFLAGS(python_array(), NPY_ARRAY_F_CONTIGUOUS))
+        {
+            return 1 == this->strides().front();
+        }
+        else
+        {
+            return false;
+        }
+    }
+
     /**
      * Import the numpy Python module.
      */
