Skip to content

Commit 98bf829

Browse files
authored
Merge pull request #36 from JohanMabille/upgrade_xtensor
Upgraded to xtensor 0.24.4
2 parents 4995cae + 1252afc commit 98bf829

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.azure-pipelines/unix-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
if [[ $NOVENDOR == 1 ]]; then
1313
if [[ $USE_DEV_XTENSOR_R == 1 ]]; then
1414
source activate xtensor-dev
15-
conda install xtensor==0.24.0 xsimd=8.0.3 cmake -c conda-forge;
15+
conda install xtensor==0.24.4 xsimd=10.0.0 cmake -c conda-forge;
1616
git clone https://github.com/xtensor-stack/xtensor-r.git;
1717
cd xtensor-r; mkdir build; cd build;
1818
cmake -D CMAKE_INSTALL_PREFIX=$CONDA_PREFIX ..;

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ http://xtensor-r.readthedocs.io/
6565

6666
| `Xtensor.R` | `xtensor-r` | `xtensor` | `Rcpp` |
6767
|--------------|-------------|-----------|----------|
68-
| master | ^0.14.0 | ^0.24.0 | ^1.0 |
68+
| master | ^0.14.2 | ^0.24.4 | ^1.0 |
69+
| 0.14.1 | ^0.14.2 | ^0.24.4 | ^1.0 |
6970
| 0.14.0 | ^0.14.0 | ^0.24.0 | ^1.0 |
7071
| 0.13.2 | ^0.13.0 | ^0.23.0 | ^1.0 |
7172
| 0.13.1 | ^0.13.0 | ^0.23.0 | ^1.0 |

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.3
2-
XSIMD_VERSION=8.0.3
3-
XTENSOR_VERSION=0.24.0
4-
XTENSOR_R_VERSION=0.14.0
1+
XTL_VERSION=0.7.5
2+
XSIMD_VERSION=10.0.0
3+
XTENSOR_VERSION=0.24.4
4+
XTENSOR_R_VERSION=0.14.2
55

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

0 commit comments

Comments
 (0)