From 4f292205df0a3a88d37a850bc0b15e110f77de49 Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Thu, 21 Oct 2021 21:56:52 +0200 Subject: [PATCH] Xtensor 0.24 --- .azure-pipelines/azure-pipelines-linux-clang.yml | 6 +----- .azure-pipelines/azure-pipelines-linux-gcc.yml | 4 +--- .azure-pipelines/unix-build.yml | 2 +- README.md | 2 +- tools/vendor | 6 +++--- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux-clang.yml b/.azure-pipelines/azure-pipelines-linux-clang.yml index f754f4d..bc33f44 100644 --- a/.azure-pipelines/azure-pipelines-linux-clang.yml +++ b/.azure-pipelines/azure-pipelines-linux-clang.yml @@ -2,10 +2,6 @@ jobs: - job: 'Linux_0' strategy: matrix: - clang_4: - llvm_version: '4.0' - clang_5: - llvm_version: '5.0' clang_6: llvm_version: '6.0' clang_7: @@ -17,7 +13,7 @@ jobs: clang_10: llvm_version: '10' pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-18.04 variables: CC: clang-$(llvm_version) CXX: clang++-$(llvm_version) diff --git a/.azure-pipelines/azure-pipelines-linux-gcc.yml b/.azure-pipelines/azure-pipelines-linux-gcc.yml index b435677..bb511ed 100644 --- a/.azure-pipelines/azure-pipelines-linux-gcc.yml +++ b/.azure-pipelines/azure-pipelines-linux-gcc.yml @@ -2,8 +2,6 @@ jobs: - job: 'Linux_1' strategy: matrix: - gcc_5: - gcc_version: '5' gcc_6: gcc_version: '6' gcc_6_novendor: @@ -37,7 +35,7 @@ jobs: novendor: '1' dev_xtensor: '1' pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-18.04 variables: CC: gcc-$(gcc_version) CXX: g++-$(gcc_version) diff --git a/.azure-pipelines/unix-build.yml b/.azure-pipelines/unix-build.yml index c4bfcdd..27c4186 100644 --- a/.azure-pipelines/unix-build.yml +++ b/.azure-pipelines/unix-build.yml @@ -12,7 +12,7 @@ steps: if [[ $NOVENDOR == 1 ]]; then if [[ $USE_DEV_XTENSOR_R == 1 ]]; then source activate xtensor-dev - conda install xtensor==0.23.1 xsimd=7.4.9 cmake -c conda-forge; + conda install xtensor==0.24.0 xsimd=8.0.3 cmake -c conda-forge; git clone https://github.com/xtensor-stack/xtensor-r.git; cd xtensor-r; mkdir build; cd build; cmake -D CMAKE_INSTALL_PREFIX=$CONDA_PREFIX ..; diff --git a/README.md b/README.md index f42a456..3002bd4 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ http://xtensor-r.readthedocs.io/ | `Xtensor.R` | `xtensor-r` | `xtensor` | `Rcpp` | |--------------|-------------|-----------|----------| -| master | ^0.13.0 | ^0.23.0 | ^1.0 | +| master | ^0.14.0 | ^0.24.0 | ^1.0 | | 0.13.2 | ^0.13.0 | ^0.23.0 | ^1.0 | | 0.13.1 | ^0.13.0 | ^0.23.0 | ^1.0 | | 0.13.0 | ^0.13.0 | ^0.23.0 | ^1.0 | diff --git a/tools/vendor b/tools/vendor index 9ad69ca..5e69c66 100755 --- a/tools/vendor +++ b/tools/vendor @@ -1,7 +1,7 @@ XTL_VERSION=0.7.2 -XSIMD_VERSION=7.4.9 -XTENSOR_VERSION=0.23.1 -XTENSOR_R_VERSION=0.13.0 +XSIMD_VERSION=8.0.3 +XTENSOR_VERSION=0.24.0 +XTENSOR_R_VERSION=0.14.0 # xtl if [ -d "./inst/include/xtl" ]