Update xtensor

CMakeLists.txt

@@ -16,8 +16,8 @@ set(XTENSOR_R_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 # Versionning
 # ===========
 
-set(XTENSOR_REQUIRED_VERSION 0.25.0)
-set(XTL_REQUIRED_VERSION 0.7.7)
+set(XTENSOR_REQUIRED_VERSION 0.26.0)
+set(XTL_REQUIRED_VERSION 0.8.0)
 
 set(XTENSOR_R_CONFIG_FILE
     "${XTENSOR_R_INCLUDE_DIR}/xtensor-r/xtensor_r_config.hpp")

environment-dev-win.yml

@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - cmake
-  - xtensor=0.25.0
+  - xtensor=0.26.0
   - r-base
   - r-rcpp
   - m2w64-gcc

environment-dev.yml

@@ -3,7 +3,7 @@ channels:
   - conda-forge
 dependencies:
   - cmake
-  - xtensor=0.25.0
+  - xtensor=0.26.0
   - r-base
   - r-rcpp
   # test dependencies

include/xtensor-r/rarray.hpp

@@ -15,11 +15,11 @@
 #include <utility>
 #include <vector>
 
-#include "xtensor/xbuffer_adaptor.hpp"
-#include "xtensor/xcontainer.hpp"
-#include "xtensor/xiterator.hpp"
-#include "xtensor/xsemantic.hpp"
-#include "xtensor/xutils.hpp"
+#include "xtensor/containers/xbuffer_adaptor.hpp"
+#include "xtensor/containers/xcontainer.hpp"
+#include "xtensor/core/xiterator.hpp"
+#include "xtensor/core/xsemantic.hpp"
+#include "xtensor/utils/xutils.hpp"
 
 #include "xtensor-r/rcontainer.hpp"
 

include/xtensor-r/rcontainer.hpp

@@ -14,8 +14,8 @@
 #include <functional>
 #include <numeric>
 
-#include "xtensor/xbuffer_adaptor.hpp"
-#include "xtensor/xcontainer.hpp"
+#include "xtensor/containers/xbuffer_adaptor.hpp"
+#include "xtensor/containers/xcontainer.hpp"
 
 #include "xtl/xsequence.hpp"
 
@@ -142,7 +142,7 @@ namespace xt
         using difference_type = typename storage_type::difference_type;
 
 #ifndef XTENSOR_R_ALLOW_REINTERPRETATION
-        static_assert(xtl::disjunction<std::is_same<r_type, int32_t>,
+        static_assert(std::disjunction<std::is_same<r_type, int32_t>,
                                        std::is_same<r_type, double>,
                                        std::is_same<r_type, Rbyte>,
                                        std::is_same<r_type, rlogical>,

include/xtensor-r/roptional.hpp

@@ -16,8 +16,8 @@
 
 #include <xtl/xoptional.hpp>
 
-#include <xtensor/xoptional_assembly.hpp>
-#include <xtensor/xfunctor_view.hpp>
+#include <xtensor/optional/xoptional_assembly.hpp>
+#include <xtensor/views/xfunctor_view.hpp>
 
 #include "rarray.hpp"
 #include "rtensor.hpp"

include/xtensor-r/rtensor.hpp

@@ -14,10 +14,10 @@
 #include <array>
 #include <cstddef>
 
-#include "xtensor/xbuffer_adaptor.hpp"
-#include "xtensor/xiterator.hpp"
-#include "xtensor/xsemantic.hpp"
-#include "xtensor/xutils.hpp"
+#include "xtensor/containers/xbuffer_adaptor.hpp"
+#include "xtensor/core/xiterator.hpp"
+#include "xtensor/core/xsemantic.hpp"
+#include "xtensor/utils/xutils.hpp"
 
 #include "rcontainer.hpp"
 

include/xtensor-r/rvectorize.hpp

@@ -13,7 +13,7 @@
 #include <type_traits>
 
 #include "rarray.hpp"
-#include "xtensor/xvectorize.hpp"
+#include "xtensor/core/xvectorize.hpp"
 
 namespace xt
 {

test/rcpp_tests.cpp

@@ -12,8 +12,8 @@
 
 #include "xtensor-r/rcontainer.hpp"
 #include "xtensor-r/rarray.hpp"
-#include "xtensor/xmath.hpp"
-#include "xtensor/xio.hpp"
+#include "xtensor/core/xmath.hpp"
+#include "xtensor/io/xio.hpp"
 
 // [[Rcpp::export]]
 int modify_cpp(xt::rarray<double>& x)

test/test_common.hpp

@@ -10,8 +10,8 @@
 #ifndef TEST_COMMON_HPP
 #define TEST_COMMON_HPP
 
-#include "xtensor/xlayout.hpp"
-#include "xtensor/xmanipulation.hpp"
+#include "xtensor/core/xlayout.hpp"
+#include "xtensor/misc/xmanipulation.hpp"
 
 #include "xtl/xsequence.hpp"
 

test/test_rarray.cpp

@@ -9,7 +9,7 @@
 
 #include "gtest/gtest.h"
 
-#include "xtensor/xarray.hpp"
+#include "xtensor/containers/xarray.hpp"
 
 #include "xtensor-r/rarray.hpp"
 

test/test_rreducer.cpp

@@ -9,9 +9,9 @@
 
 #include <gtest/gtest.h>
 
-#include <xtensor/xtensor.hpp>
-#include <xtensor/xarray.hpp>
-#include <xtensor/xmath.hpp>
+#include <xtensor/containers/xtensor.hpp>
+#include <xtensor/containers/xarray.hpp>
+#include <xtensor/core/xmath.hpp>
 
 #include "xtensor-r/rarray.hpp"
 #include "xtensor-r/rtensor.hpp"

test/test_rtensor.cpp

@@ -14,7 +14,7 @@
 #include <utility>
 #include <vector>
 
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 #include "xtensor-r/rtensor.hpp"
 

test/test_sfinae.cpp

@@ -12,8 +12,8 @@
 #include "gtest/gtest.h"
 #include "xtensor-r/rtensor.hpp"
 #include "xtensor-r/rarray.hpp"
-#include "xtensor/xarray.hpp"
-#include "xtensor/xtensor.hpp"
+#include "xtensor/containers/xarray.hpp"
+#include "xtensor/containers/xtensor.hpp"
 
 namespace xt
 {