Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/unix_impl/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion src/Makevars
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/Makevars.win
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions src/xtensor_r_example.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.h>

// [[Rcpp::plugins(cpp14)]]
// [[Rcpp::plugins(cpp17)]]

// [[Rcpp::export]]
xt::rtensor<double, 2> xtensor_r_example(xt::rtensor<int, 1> tens)
Expand Down
8 changes: 4 additions & 4 deletions tools/vendor
Original file line number Diff line number Diff line change
@@ -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" ]
Expand Down
Loading