From fe9d5ce1adc2b6ea4e1f369d83e8c929c895d16b Mon Sep 17 00:00:00 2001 From: fbourgin Date: Wed, 5 Nov 2025 20:07:49 +0100 Subject: [PATCH 1/4] upgraded to C++17 --- src/Makevars | 2 +- src/Makevars.win | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From 28b1d4acb2192b5b6c5970d52c53921a9ba2e225 Mon Sep 17 00:00:00 2001 From: fbourgin Date: Wed, 5 Nov 2025 20:55:50 +0100 Subject: [PATCH 2/4] update xtensor includes --- src/xtensor_r_example.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xtensor_r_example.cpp b/src/xtensor_r_example.cpp index 4206d9c..9ffff3d 100644 --- a/src/xtensor_r_example.cpp +++ b/src/xtensor_r_example.cpp @@ -2,9 +2,9 @@ #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 From 4c4ae0370346a767ee8e88cfcdaed15156ac2240 Mon Sep 17 00:00:00 2001 From: fbourgin Date: Wed, 5 Nov 2025 20:56:12 +0100 Subject: [PATCH 3/4] upgraded to C++17 --- src/xtensor_r_example.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xtensor_r_example.cpp b/src/xtensor_r_example.cpp index 9ffff3d..f78ca11 100644 --- a/src/xtensor_r_example.cpp +++ b/src/xtensor_r_example.cpp @@ -8,7 +8,7 @@ #include -// [[Rcpp::plugins(cpp14)]] +// [[Rcpp::plugins(cpp17)]] // [[Rcpp::export]] xt::rtensor xtensor_r_example(xt::rtensor tens) From 953d6e703618f587dd00e77f9a78711741124049 Mon Sep 17 00:00:00 2001 From: fbourgin Date: Tue, 25 Nov 2025 16:05:57 +0100 Subject: [PATCH 4/4] update xtensor-r, xtl, xsimd and xtensor --- .github/actions/unix_impl/action.yml | 2 +- tools/vendor | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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/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" ]