diff --git a/.github/actions/unix_impl/action.yml b/.github/actions/unix_impl/action.yml index e201382..7d6205f 100644 --- a/.github/actions/unix_impl/action.yml +++ b/.github/actions/unix_impl/action.yml @@ -19,7 +19,7 @@ runs: make install; cd ../..; else - micromamba install xtensor-r==0.14.0 -c conda-forge; + micromamba install xtensor-r==0.16.0 -c conda-forge; fi shell: bash -e -l {0} diff --git a/src/Makevars b/src/Makevars index 931b823..25aa53b 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,4 +1,4 @@ ## -*- mode: makefile; -*- -PKG_CXXFLAGS = -I../inst/include --std=c++14 +PKG_CXXFLAGS = -I../inst/include --std=c++17 # CXX_STD = CXX14 diff --git a/src/Makevars.win b/src/Makevars.win index 931b823..25aa53b 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,4 +1,4 @@ ## -*- mode: makefile; -*- -PKG_CXXFLAGS = -I../inst/include --std=c++14 +PKG_CXXFLAGS = -I../inst/include --std=c++17 # CXX_STD = CXX14 diff --git a/src/xtensor_r_example.cpp b/src/xtensor_r_example.cpp index 4206d9c..f78ca11 100644 --- a/src/xtensor_r_example.cpp +++ b/src/xtensor_r_example.cpp @@ -2,13 +2,13 @@ #include "xtensor-r/rarray.hpp" #include "xtensor-r/rtensor.hpp" -#include "xtensor/xio.hpp" -#include "xtensor/xinfo.hpp" -#include "xtensor/xarray.hpp" +#include "xtensor/io/xio.hpp" +#include "xtensor/io/xinfo.hpp" +#include "xtensor/containers/xarray.hpp" #include -// [[Rcpp::plugins(cpp14)]] +// [[Rcpp::plugins(cpp17)]] // [[Rcpp::export]] xt::rtensor xtensor_r_example(xt::rtensor tens) diff --git a/tools/vendor b/tools/vendor index bd69bb2..5255fde 100755 --- a/tools/vendor +++ b/tools/vendor @@ -1,7 +1,7 @@ -XTL_VERSION=0.7.5 -XSIMD_VERSION=10.0.0 -XTENSOR_VERSION=0.24.5 -XTENSOR_R_VERSION=0.14.2 +XTL_VERSION=0.8.1 +XSIMD_VERSION=13.2.1 +XTENSOR_VERSION=0.26.0 +XTENSOR_R_VERSION=0.16.0 # xtl if [ -d "./inst/include/xtl" ]