Skip to content

Commit 2d80d5e

Browse files
authored
Merge pull request #39 from fbourgin/update_xtensor
Update xtensor
2 parents 8aa21ae + 953d6e7 commit 2d80d5e

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

.github/actions/unix_impl/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runs:
1919
make install;
2020
cd ../..;
2121
else
22-
micromamba install xtensor-r==0.14.0 -c conda-forge;
22+
micromamba install xtensor-r==0.16.0 -c conda-forge;
2323
fi
2424
shell: bash -e -l {0}
2525

src/Makevars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
## -*- mode: makefile; -*-
22

3-
PKG_CXXFLAGS = -I../inst/include --std=c++14
3+
PKG_CXXFLAGS = -I../inst/include --std=c++17
44
# CXX_STD = CXX14

src/Makevars.win

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
## -*- mode: makefile; -*-
22

3-
PKG_CXXFLAGS = -I../inst/include --std=c++14
3+
PKG_CXXFLAGS = -I../inst/include --std=c++17
44
# CXX_STD = CXX14

src/xtensor_r_example.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
#include "xtensor-r/rarray.hpp"
33
#include "xtensor-r/rtensor.hpp"
44

5-
#include "xtensor/xio.hpp"
6-
#include "xtensor/xinfo.hpp"
7-
#include "xtensor/xarray.hpp"
5+
#include "xtensor/io/xio.hpp"
6+
#include "xtensor/io/xinfo.hpp"
7+
#include "xtensor/containers/xarray.hpp"
88

99
#include <Rcpp.h>
1010

11-
// [[Rcpp::plugins(cpp14)]]
11+
// [[Rcpp::plugins(cpp17)]]
1212

1313
// [[Rcpp::export]]
1414
xt::rtensor<double, 2> xtensor_r_example(xt::rtensor<int, 1> tens)

tools/vendor

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
XTL_VERSION=0.7.5
2-
XSIMD_VERSION=10.0.0
3-
XTENSOR_VERSION=0.24.5
4-
XTENSOR_R_VERSION=0.14.2
1+
XTL_VERSION=0.8.1
2+
XSIMD_VERSION=13.2.1
3+
XTENSOR_VERSION=0.26.0
4+
XTENSOR_R_VERSION=0.16.0
55

66
# xtl
77
if [ -d "./inst/include/xtl" ]

0 commit comments

Comments
 (0)