From 1cb06acfdd58c072de5e11b7fec3170b72dd85ee Mon Sep 17 00:00:00 2001
From: Loic Gouarin <loic.gouarin@gmail.com>
Date: Mon, 28 Mar 2022 15:05:31 +0200
Subject: [PATCH 1/3] fix xmasked_view with xfunction

---
 include/xtensor/xmasked_view.hpp |  9 ++++++---
 test/test_xmasked_view.cpp       | 24 +++++++++++++++++++-----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/include/xtensor/xmasked_view.hpp b/include/xtensor/xmasked_view.hpp
index de0ac9df3..f5c251f0c 100644
--- a/include/xtensor/xmasked_view.hpp
+++ b/include/xtensor/xmasked_view.hpp
@@ -119,14 +119,17 @@ namespace xt
         using bool_load_type = xtl::xmasked_value<typename data_type::bool_load_type, mask_type>;
 
         using shape_type = typename data_type::shape_type;
-        using strides_type = typename data_type::strides_type;
 
         static constexpr layout_type static_layout = data_type::static_layout;
         static constexpr bool contiguous_layout = false;
 
         using inner_shape_type = typename data_type::inner_shape_type;
-        using inner_strides_type = typename data_type::inner_strides_type;
-        using inner_backstrides_type = typename data_type::inner_backstrides_type;
+        using inner_strides_type = xtl::mpl::eval_if_t<has_strides<data_type>,
+                                                                   detail::expr_inner_strides_type<data_type>,
+                                                                   get_strides_type<shape_type>>;
+        using inner_backstrides_type = xtl::mpl::eval_if_t<has_strides<data_type>,
+                                                                       detail::expr_inner_backstrides_type<data_type>,
+                                                                       get_strides_type<shape_type>>;
 
         using expression_tag = xtensor_expression_tag;
 
diff --git a/test/test_xmasked_view.cpp b/test/test_xmasked_view.cpp
index f11111682..c022bcac4 100644
--- a/test/test_xmasked_view.cpp
+++ b/test/test_xmasked_view.cpp
@@ -245,12 +245,12 @@ namespace xt
 
     TEST(xmasked_view, view)
     {
-	xt::xarray<size_t> data = {{0,1}, {2,3}, {4,5}};
-	xt::xarray<size_t> data_new = xt::zeros<size_t>(data.shape());
-	xt::xarray<bool> col_mask = {false, true};
+        xarray<size_t> data = {{0,1}, {2,3}, {4,5}};
+        xarray<size_t> data_new = zeros<size_t>(data.shape());
+        xarray<bool> col_mask = {false, true};
 
-	auto row_masked = xt::masked_view(xt::view(data, 0, xt::all()), col_mask);
-        auto new_row_masked = xt::masked_view(xt::view(data_new, 0, xt::all()), col_mask);
+        auto row_masked = masked_view(view(data, 0, all()), col_mask);
+        auto new_row_masked = masked_view(view(data_new, 0, all()), col_mask);
 
         row_masked += 10;
         new_row_masked = row_masked;
@@ -258,4 +258,18 @@ namespace xt
         EXPECT_EQ(data_new(0, 0), size_t(0));
         EXPECT_EQ(data_new(0, 1), size_t(11));
     }
+
+    TEST(xmasked_view, xfunction)
+    {
+        xt::xarray<size_t> data = {{0,1}, {2,3}, {4,5}};
+        xt::xarray<size_t> data_new = xt::zeros<size_t>(data.shape());
+        xt::xarray<bool> mask = {{true, false},
+                                 {false, true},
+                                 {true, false}};
+
+        xarray<size_t> expected = {{0, 0},
+                                   {0, 7},
+                                   {9, 0}};
+        EXPECT_EQ(data_new, expected);
+    }
 }

From 9418abe5ed049c1eb4a7bf150c9ca8f141c5796b Mon Sep 17 00:00:00 2001
From: Loic Gouarin <loic.gouarin@gmail.com>
Date: Mon, 28 Mar 2022 17:01:43 +0200
Subject: [PATCH 2/3] fix test

---
 test/test_xmasked_view.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test_xmasked_view.cpp b/test/test_xmasked_view.cpp
index c022bcac4..57330d052 100644
--- a/test/test_xmasked_view.cpp
+++ b/test/test_xmasked_view.cpp
@@ -267,6 +267,8 @@ namespace xt
                                  {false, true},
                                  {true, false}};
 
+        masked_view(data_new, mask) = masked_view(2UL*data + 1UL, mask);
+
         xarray<size_t> expected = {{0, 0},
                                    {0, 7},
                                    {9, 0}};

From 6e8b117d97fdd11b63fb93cc59a400fd9eacad8b Mon Sep 17 00:00:00 2001
From: Loic Gouarin <loic.gouarin@gmail.com>
Date: Mon, 28 Mar 2022 17:14:31 +0200
Subject: [PATCH 3/3] fix test

---
 test/test_xmasked_view.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_xmasked_view.cpp b/test/test_xmasked_view.cpp
index 57330d052..cacaf7c7a 100644
--- a/test/test_xmasked_view.cpp
+++ b/test/test_xmasked_view.cpp
@@ -269,7 +269,7 @@ namespace xt
 
         masked_view(data_new, mask) = masked_view(2UL*data + 1UL, mask);
 
-        xarray<size_t> expected = {{0, 0},
+        xarray<size_t> expected = {{1, 0},
                                    {0, 7},
                                    {9, 0}};
         EXPECT_EQ(data_new, expected);