From 51f4fb97ef04b4fecd8051cbddbc5526fbef5551 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Fri, 6 Mar 2020 17:10:00 +0100 Subject: [PATCH 1/2] Upgraded to xtensor 0.21.4 --- .appveyor.yml | 2 +- .travis.yml | 21 +-------------------- azure-pipelines.yml | 2 +- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7c870f0..dc53d80 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,7 +21,7 @@ install: - conda update -q conda - conda info -a - conda install gtest cmake -c conda-forge - - conda install xtensor=0.21.2 -c conda-forge + - conda install xtensor=0.21.4 -c conda-forge - conda install m2w64-openblas -c msys2 # Patch OpenBLASConfig.cmake - ps: (Get-Content $Env:MINICONDA\Library\mingw-w64\lib\cmake\openblas\OpenBLASConfig.cmake).replace('mingw64', 'mingw-w64') | Set-Content $Env:MINICONDA\Library\mingw-w64\lib\cmake\openblas\OpenBLASConfig.cmake diff --git a/.travis.yml b/.travis.yml index 13974f8..fe84468 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,25 +58,6 @@ matrix: packages: - g++-6 env: COMPILER=gcc GCC=6 BLAS=mkl - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.9 - - clang-3.6 - env: COMPILER=clang CLANG=3.6 BLAS=OpenBLAS - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-3.9 - packages: - - g++-4.9 - - clang-3.9 - env: COMPILER=clang CLANG=3.9 BLAS=OpenBLAS - os: linux addons: apt: @@ -145,7 +126,7 @@ install: - conda info -a - conda install cmake -c conda-forge # Install xtensor and BLAS - - conda install xtensor=0.21.2 -c conda-forge + - conda install xtensor=0.21.4 -c conda-forge - if [[ "$BLAS" == "OpenBLAS" ]]; then conda install openblas "blas * openblas" -c conda-forge; elif [[ "$BLAS" == "mkl" ]]; then diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b061932..7c44866 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,7 +42,7 @@ jobs: gtest ^ mkl-devel ^ ninja ^ - xtensor=0.21.2 ^ + xtensor=0.21.4 ^ python=3.6 conda list displayName: "Install conda packages" From b7df638fc2d7ba94a568be49da9cb7a39f9594db Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Mon, 9 Mar 2020 11:26:07 +0100 Subject: [PATCH 2/2] Forcing version 0.3.7 of openblas --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fe84468..1804fe9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,7 +128,7 @@ install: # Install xtensor and BLAS - conda install xtensor=0.21.4 -c conda-forge - if [[ "$BLAS" == "OpenBLAS" ]]; then - conda install openblas "blas * openblas" -c conda-forge; + conda install openblas==0.3.7 "blas * openblas" -c conda-forge; elif [[ "$BLAS" == "mkl" ]]; then conda install mkl; fi