Merge pull request #147 from fbourgin/update_xtensor

Update xtensor

Author: JohanMabille

.github/workflows/linux.yml

@@ -22,7 +22,7 @@ jobs:
         - {compiler: gcc, version: '12'}
         - {compiler: gcc, version: '13'}
         - {compiler: gcc, version: '14'}
-        #- {compiler: clang, version: '19'}
+        - {compiler: clang, version: '19'}
         - {compiler: clang, version: '20'}
 
     steps:
@@ -78,7 +78,7 @@ jobs:
         echo "which tar"
         which tar
         export TAR="/usr/bin/tar"
-        R -e "library(devtools); install_github('xtensor-stack/Xtensor.R', configure.args = '--novendor')"
+        R -e "library(devtools); install_github('fbourgin/Xtensor.R', ref = 'update_xtensor', configure.args = '--novendor')"
 
     - name: print R HOME
       run: |
@@ -96,7 +96,7 @@ jobs:
         if [[ "${{matrix.sys.compiler}}" = "gcc" ]]; then export CC=gcc-${{matrix.sys.version}}; export CXX=g++-${{matrix.sys.version}}; else export CC=clang; export CXX=clang++; fi
         mkdir ~/.R
         touch ~/.R/Makevars
-        echo "CXX14=$CXX" >> ~/.R/Makevars
-        echo "CXX14FLAGS=-fPIC -O2" >> ~/.R/Makevars
+        echo "CXX17=$CXX" >> ~/.R/Makevars
+        echo "CXX17FLAGS=-fPIC -O2" >> ~/.R/Makevars
         Rscript ./unittest.R
       

.github/workflows/osx.yml

@@ -51,7 +51,7 @@ jobs:
         echo "which tar"
         which tar
         export TAR="/usr/bin/tar"
-        R -e "library(devtools); install_github('xtensor-stack/Xtensor.R', configure.args = '--novendor')"
+        R -e "library(devtools); install_github('fbourgin/Xtensor.R', ref = 'update_xtensor', configure.args = '--novendor')"
 
     - name: print R HOME
       run: |

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")
@@ -57,6 +57,8 @@ add_library(xtensor-r INTERFACE)
 target_include_directories(xtensor-r INTERFACE $<BUILD_INTERFACE:${XTENSOR_R_INCLUDE_DIR}>
                                                $<INSTALL_INTERFACE:include>)
 
+target_compile_features(xtensor-r INTERFACE cxx_std_17)
+
 target_link_libraries(xtensor-r INTERFACE xtensor)
 get_target_property(inc_dir xtensor-r INTERFACE_INCLUDE_DIRECTORIES)
 message(STATUS "${inc_dir}")

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/CMakeLists.txt

@@ -33,12 +33,12 @@ string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wunused-parameter -Wextra -Wreorder -Wconversion")
-    CHECK_CXX_COMPILER_FLAG("-std=c++14" HAS_CPP14_FLAG)
+    CHECK_CXX_COMPILER_FLAG("-std=c++17" HAS_CPP17_FLAG)
 
-    if (HAS_CPP14_FLAG)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+    if (HAS_CPP17_FLAG)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
     else()
-        message(FATAL_ERROR "Unsupported compiler -- xtensor requires C++14 support!")
+        message(FATAL_ERROR "Unsupported compiler -- xtensor requires C++17 support!")
     endif()
 endif()