Skip to content

Commit 7799c43

Browse files
authored
Merge pull request #154 from JohanMabille/upgrade
Upgraded to xtensor 0.21.4
2 parents 613c1ec + b7df638 commit 7799c43

File tree

3 files changed

+4
-23
lines changed

3 files changed

+4
-23
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ install:
2121
- conda update -q conda
2222
- conda info -a
2323
- conda install gtest cmake -c conda-forge
24-
- conda install xtensor=0.21.2 -c conda-forge
24+
- conda install xtensor=0.21.4 -c conda-forge
2525
- conda install m2w64-openblas -c msys2
2626
# Patch OpenBLASConfig.cmake
2727
- 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

.travis.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,6 @@ matrix:
5858
packages:
5959
- g++-6
6060
env: COMPILER=gcc GCC=6 BLAS=mkl
61-
- os: linux
62-
addons:
63-
apt:
64-
sources:
65-
- ubuntu-toolchain-r-test
66-
packages:
67-
- g++-4.9
68-
- clang-3.6
69-
env: COMPILER=clang CLANG=3.6 BLAS=OpenBLAS
70-
- os: linux
71-
addons:
72-
apt:
73-
sources:
74-
- ubuntu-toolchain-r-test
75-
- llvm-toolchain-xenial-3.9
76-
packages:
77-
- g++-4.9
78-
- clang-3.9
79-
env: COMPILER=clang CLANG=3.9 BLAS=OpenBLAS
8061
- os: linux
8162
addons:
8263
apt:
@@ -145,9 +126,9 @@ install:
145126
- conda info -a
146127
- conda install cmake -c conda-forge
147128
# Install xtensor and BLAS
148-
- conda install xtensor=0.21.2 -c conda-forge
129+
- conda install xtensor=0.21.4 -c conda-forge
149130
- if [[ "$BLAS" == "OpenBLAS" ]]; then
150-
conda install openblas "blas * openblas" -c conda-forge;
131+
conda install openblas==0.3.7 "blas * openblas" -c conda-forge;
151132
elif [[ "$BLAS" == "mkl" ]]; then
152133
conda install mkl;
153134
fi

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
gtest ^
4343
mkl-devel ^
4444
ninja ^
45-
xtensor=0.21.2 ^
45+
xtensor=0.21.4 ^
4646
python=3.6
4747
conda list
4848
displayName: "Install conda packages"

0 commit comments

Comments
 (0)