Merge pull request xtensor-stack#250 from adriendelsalle/fix-pyarray

JohanMabille · web-flow · commit 062c8c2e4fd1 · 2021-01-29T21:38:39.000+01:00
fix pyarray column_major from xexpression
diff --git a/include/xtensor-python/pyarray.hpp b/include/xtensor-python/pyarray.hpp
@@ -443,7 +443,7 @@ namespace xt
         // TODO: prevent intermediary shape allocation
         shape_type shape = xtl::forward_sequence<shape_type, decltype(e.derived_cast().shape())>(e.derived_cast().shape());
         strides_type strides = xtl::make_sequence<strides_type>(shape.size(), size_type(0));
-        compute_strides(shape, layout_type::row_major, strides);
+        compute_strides(shape, L, strides);
         init_array(shape, strides);
         semantic_base::assign(e);
     }
diff --git a/test/test_pyarray.cpp b/test/test_pyarray.cpp
@@ -181,6 +181,18 @@ namespace xt
         EXPECT_EQ(c(0, 1), a1(0, 1) + a2(0, 1));
         EXPECT_EQ(c(1, 0), a1(1, 0) + a2(1, 0));
         EXPECT_EQ(c(1, 1), a1(1, 1) + a2(1, 1));
+
+        pyarray<int, xt::layout_type::row_major> d = a1 + a2;
+        EXPECT_EQ(d(0, 0), a1(0, 0) + a2(0, 0));
+        EXPECT_EQ(d(0, 1), a1(0, 1) + a2(0, 1));
+        EXPECT_EQ(d(1, 0), a1(1, 0) + a2(1, 0));
+        EXPECT_EQ(d(1, 1), a1(1, 1) + a2(1, 1));
+
+        pyarray<int, xt::layout_type::column_major> e = a1 + a2;
+        EXPECT_EQ(e(0, 0), a1(0, 0) + a2(0, 0));
+        EXPECT_EQ(e(0, 1), a1(0, 1) + a2(0, 1));
+        EXPECT_EQ(e(1, 0), a1(1, 0) + a2(1, 0));
+        EXPECT_EQ(e(1, 1), a1(1, 1) + a2(1, 1));
     }
 
     TEST(pyarray, resize)

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ namespace xt`
`443`	`443`	`// TODO: prevent intermediary shape allocation`
`444`	`444`	`shape_type shape = xtl::forward_sequence<shape_type, decltype(e.derived_cast().shape())>(e.derived_cast().shape());`
`445`	`445`	`strides_type strides = xtl::make_sequence<strides_type>(shape.size(), size_type(0));`
`446`		`- compute_strides(shape, layout_type::row_major, strides);`
	`446`	`+ compute_strides(shape, L, strides);`
`447`	`447`	`init_array(shape, strides);`
`448`	`448`	`semantic_base::assign(e);`
`449`	`449`	`}`