Merge pull request #123 from JohanMabille/container_reshape

reshape fixed

Author: JohanMabille

include/xtensor-python/pycontainer.hpp

@@ -225,7 +225,7 @@ namespace xt
     template <class S>
     inline void pycontainer<D>::reshape(const S& shape)
     {
-        if (shape.size() != this->dimension() || !std::equal(shape.begin(), shape.end(), this->shape().begin()))
+        if (shape.size() != this->dimension() || !std::equal(std::begin(shape), std::end(shape), std::begin(this->shape())))
         {
             reshape(shape, layout_type::row_major);
         }
@@ -254,7 +254,7 @@ namespace xt
     template <class S>
     inline void pycontainer<D>::reshape(const S& shape, const strides_type& strides)
     {
-        derived_type tmp(shape, strides);
+        derived_type tmp(xtl::forward_sequence<shape_type>(shape), strides);
         *static_cast<derived_type*>(this) = std::move(tmp);
     }
 

test/test_common.hpp

@@ -130,7 +130,7 @@ namespace xt
             m_data = {-1, 1, 2, 3, 8, 9, 10, 11, 16, 17, 18, 19};
             m_layout = layout_type::dynamic;
             m_assigner.resize(m_shape[0]);
-            for (std::size_t i = 0; i < m_shape[0]; ++i)
+            for (std::size_t i = 0; i < std::size_t(m_shape[0]); ++i)
             {
                 m_assigner[i].resize(m_shape[1]);
             }
@@ -184,10 +184,10 @@ namespace xt
             auto v_copy_b = vec;
             std::array<std::size_t, 3> ar = {3, 2, 4};
             std::vector<std::size_t> vr = {3, 2, 4};
-            // v_copy_a.reshape(ar, true);
-            // compare_shape(v_copy_a, rm);
-            // v_copy_b.reshape(vr, true);
-            // compare_shape(v_copy_b, rm);
+            v_copy_a.reshape(ar);
+            compare_shape(v_copy_a, rm);
+            v_copy_b.reshape(vr);
+            compare_shape(v_copy_b, rm);
         }
 
         {

test/test_pyarray.cpp

@@ -161,6 +161,10 @@ namespace xt
     {
         pyarray<int> a;
         test_reshape(a);
+
+        pyarray<int> b = { {1, 2}, {3, 4} };
+        a.reshape(b.shape());
+        EXPECT_EQ(a.shape(), b.shape());
     }
 
     TEST(pyarray, transpose)

test/test_pytensor.cpp

@@ -160,6 +160,10 @@ namespace xt
     {
         pytensor<int, 3> a;
         test_reshape<pytensor<int, 3>, container_type>(a);
+
+        pytensor<int, 3> b = { { { 1, 2 },{ 3, 4 } } };
+        a.reshape(b.shape());
+        EXPECT_EQ(a.shape(), b.shape());
     }
 
     TEST(pytensor, transpose)