Merge pull request #187 from JohanMabille/zerod

fixed 0d array initialization

Author: JohanMabille

include/xtensor-python/pyarray.hpp

@@ -761,7 +761,7 @@ namespace xt
 
         m_backstrides = backstrides_type(*this);
         m_storage = storage_type(reinterpret_cast<pointer>(PyArray_DATA(this->python_array())),
-                                 this->get_min_stride() * static_cast<size_type>(PyArray_SIZE(this->python_array())));
+                                 this->get_buffer_size());
     }
 
     template <class T, layout_type L>

include/xtensor-python/pycontainer.hpp

@@ -122,7 +122,7 @@ namespace xt
         const derived_type& derived_cast() const;
 
         PyArrayObject* python_array() const;
-        size_type get_min_stride() const;
+        size_type get_buffer_size() const;
     };
 
     namespace detail
@@ -297,10 +297,15 @@ namespace xt
     }
 
     template <class D>
-    inline auto pycontainer<D>::get_min_stride() const -> size_type
+    inline auto pycontainer<D>::get_buffer_size() 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));
+        size_type min_stride = this->strides().empty() ? size_type(1) : 
+            std::max(size_type(1), std::accumulate(this->strides().cbegin(),
+                                                   this->strides().cend(), 
+                                                   std::numeric_limits<size_type>::max(),
+                                                   min));
+        return min_stride * static_cast<size_type>(PyArray_SIZE(this->python_array()));
     }
 
     template <class D>

include/xtensor-python/pytensor.hpp

@@ -463,7 +463,7 @@ namespace xt
         }
 
         m_storage = storage_type(reinterpret_cast<pointer>(PyArray_DATA(this->python_array())),
-                                 this->get_min_stride() * static_cast<size_type>(PyArray_SIZE(this->python_array())));
+                                 this->get_buffer_size());
     }
 
     template <class T, std::size_t N, layout_type L>

test/test_pyarray.cpp

@@ -249,4 +249,11 @@ namespace xt
         auto v = xt::view(arr, xt::all());
         EXPECT_EQ(v(0), 0.);
     }
+
+    TEST(pyarray, zerod_copy)
+    {
+        xt::pyarray<int> arr = 2;
+        xt::pyarray<int> arr2(arr);
+        EXPECT_EQ(arr(), arr2());
+    }
 }