Merge pull request #229 from SylvainCorlay/update-to-xtensor-0.20

Update to xtensor 0.20

Author: SylvainCorlay

.appveyor.yml

@@ -22,7 +22,7 @@ install:
   - conda update -q conda
   - conda info -a
   - conda install gtest cmake -c conda-forge
-  - conda install xtensor=0.19.3 -c conda-forge
+  - conda install xtensor=0.20.5 -c conda-forge
   - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DBUILD_TESTS=ON .
   - nmake test_xframe
   - cd test

.travis.yml

@@ -109,7 +109,7 @@ install:
     - conda config --set always_yes yes --set changeps1 no
     - conda update -q conda
     - conda install cmake -c conda-forge
-    - conda install xtensor=0.19.3 -c conda-forge
+    - conda install xtensor=0.20.5 -c conda-forge
     # Testing
     - mkdir build
     - cd build

include/xframe/xaxis_function.hpp

@@ -51,7 +51,7 @@ namespace xf
         using pointer = value_type*;
         using const_pointer = const value_type*;
         using name_type = detail::common_name_type_t<std::decay_t<xaxis_expression_closure_t<CT>>...>;
-        using size_type = xt::detail::common_size_type_t<std::decay_t<xaxis_expression_closure_t<CT>>...>;
+        using size_type = xt::common_size_type_t<std::decay_t<xaxis_expression_closure_t<CT>>...>;
 
         template <std::size_t N = dynamic()>
         using selector_sequence_type = detail::xselector_sequence_t<std::pair<name_type, size_type>, N>;

include/xframe/xselecting.hpp

@@ -11,11 +11,10 @@
 
 #include <limits>
 
+#include "xtl/xmasked_value.hpp"
 #include "xtl/xsequence.hpp"
 #include "xtl/xoptional.hpp"
 
-#include "xtensor/xmasked_value.hpp"
-
 #include "xframe_utils.hpp"
 #include "xcoordinate.hpp"
 #include "xdimension.hpp"
@@ -42,9 +41,9 @@ namespace xf
         };
 
         template <class T, class B>
-        struct static_missing_impl<xt::xmasked_value<T, B>>
+        struct static_missing_impl<xtl::xmasked_value<T, B>>
         {
-            using return_type = xt::xmasked_value<T, B>;
+            using return_type = xtl::xmasked_value<T, B>;
             static inline return_type get()
             {
                 static T val = static_missing_impl<T>::get();

include/xframe/xvariable_function.hpp

@@ -52,8 +52,8 @@ namespace xf
         using const_reference = value_type;
         using pointer = value_type*;
         using const_pointer = const value_type*;
-        using size_type = xt::detail::common_size_type_t<std::decay_t<CT>...>;
-        using difference_type = xt::detail::common_difference_type_t<std::decay_t<CT>...>;
+        using size_type = xt::common_size_type_t<std::decay_t<CT>...>;
+        using difference_type = xt::common_difference_type_t<std::decay_t<CT>...>;
 
         using shape_type = typename data_type::shape_type;
 

test/test_fixture_view.hpp

@@ -12,8 +12,7 @@
 #include <cstddef>
 
 #include "xtl/xbasic_fixed_string.hpp"
-
-#include "xtensor/xmasked_value.hpp"
+#include "xtl/xmasked_value.hpp"
 
 #include "xframe/xvariable_view.hpp"
 
@@ -28,7 +27,7 @@ namespace xf
     using coordinate_view_type = xcoordinate_view<fstring>;
     using dimension_type = xdimension<fstring, std::size_t>;
     using data_type = xt::xoptional_assembly<xt::xarray<double>, xt::xarray<bool>>;
-    using masked_data_type = xt::xarray<xt::xmasked_value<xtl::xoptional<double, bool>>>;
+    using masked_data_type = xt::xarray<xtl::xmasked_value<xtl::xoptional<double, bool>>>;
     using variable_type = xvariable_container<coordinate_type, data_type>;
     using variable_view_type = xvariable_view<variable_type&>;
     using slice_vector = variable_view_type::slice_vector;
@@ -103,7 +102,7 @@ namespace xf
         {
             for (std::size_t o = 4; o < val.shape()[1]; ++o)
             {
-                val(a, o) = xt::masked<xtl::xoptional<double, bool>>();
+                val(a, o) = xtl::masked<xtl::xoptional<double, bool>>();
             }
         }
         return val;
@@ -128,11 +127,11 @@ namespace xf
 
         for (std::size_t o = 0; o < val.shape()[1]; ++o)
         {
-            val(6, o) = xt::masked<xtl::xoptional<double, bool>>();
+            val(6, o) = xtl::masked<xtl::xoptional<double, bool>>();
         }
         for (std::size_t a = 0; a < val.shape()[0]; ++a)
         {
-            val(a, 0) = xt::masked<xtl::xoptional<double, bool>>();
+            val(a, 0) = xtl::masked<xtl::xoptional<double, bool>>();
         }
         return val;
     }
@@ -157,11 +156,11 @@ namespace xf
         val.fill(5.2);
         for (std::size_t o = 0; o < val.shape()[1]; ++o)
         {
-            val(6, o) = xt::masked<xtl::xoptional<double, bool>>();
+            val(6, o) = xtl::masked<xtl::xoptional<double, bool>>();
         }
         for (std::size_t a = 0; a < val.shape()[0]; ++a)
         {
-            val(a, 0) = xt::masked<xtl::xoptional<double, bool>>();
+            val(a, 0) = xtl::masked<xtl::xoptional<double, bool>>();
         }
         return val;
     }

test/test_xvariable_masked_view.cpp

@@ -62,7 +62,7 @@ namespace xf
             not_equal(var.axis<int>("ordinate"), 1)
         );
 
-        auto masked_value = xt::masked<xtl::xoptional<double, bool>>();
+        auto masked_value = xtl::masked<xtl::xoptional<double, bool>>();
 
         auto expected = masked_var.select<join::inner, 2>({{{"abscissa", "a"}, {"ordinate", 12}}});
         EXPECT_EQ(expected, 6);
@@ -88,7 +88,7 @@ namespace xf
             not_equal(var.axis<int>("ordinate"), 1)
         );
 
-        auto masked_value = xt::masked<xtl::xoptional<double, bool>>();
+        auto masked_value = xtl::masked<xtl::xoptional<double, bool>>();
 
         auto expected = masked_var.select<join::outer, 2>({{{"abscissa", "a"}, {"ordinate", 12}}});
         EXPECT_EQ(expected, 6);
@@ -122,7 +122,7 @@ namespace xf
             not_equal(var.axis<int>("ordinate"), 1)
         );
 
-        auto masked_value = xt::masked<xtl::xoptional<double, bool>>();
+        auto masked_value = xtl::masked<xtl::xoptional<double, bool>>();
 
         EXPECT_EQ(masked_var(0, 6), 6);
         masked_var(0, 6) = 7;
@@ -148,7 +148,7 @@ namespace xf
             not_equal(var.axis<int>("ordinate"), 1)
         );
 
-        auto masked_value = xt::masked<xtl::xoptional<double, bool>>();
+        auto masked_value = xtl::masked<xtl::xoptional<double, bool>>();
         EXPECT_EQ(masked_var.element<2>({0, 6}), 6);
         EXPECT_EQ(const_masked_var.element({4, 3}), 35);
         EXPECT_EQ(masked_var.element({6, 3}), masked_value);
@@ -169,7 +169,7 @@ namespace xf
             not_equal(var.axis<int>("ordinate"), 1)
         );
 
-        auto masked_value = xt::masked<xtl::xoptional<double, bool>>();
+        auto masked_value = xtl::masked<xtl::xoptional<double, bool>>();
         EXPECT_EQ(masked_var.locate("a", 12), 6);
         EXPECT_EQ(const_masked_var.locate("g", 5), 35);
         EXPECT_EQ(masked_var.locate("m", 5), masked_value);
@@ -191,7 +191,7 @@ namespace xf
             not_equal(var.axis<int>("ordinate"), 1)
         );
 
-        auto masked_value = xt::masked<xtl::xoptional<double, bool>>();
+        auto masked_value = xtl::masked<xtl::xoptional<double, bool>>();
         EXPECT_EQ(masked_var.locate_element({"a", 12}), 6);
         EXPECT_EQ(const_masked_var.locate_element({"g", 5}), 35);
         EXPECT_EQ(masked_var.locate_element({"m", 5}), masked_value);