Skip to content

Upgraded to xtensor 0.21.4 #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 9, 2020
Merged

Upgraded to xtensor 0.21.4 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51f4fb9
Upgraded to xtensor 0.21.4
JohanMabille Mar 6, 2020
b7df638
Forcing version 0.3.7 of openblas
JohanMabille Mar 9, 2020
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 .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 2 additions & 21 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -145,9 +126,9 @@ 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;
conda install openblas==0.3.7 "blas * openblas" -c conda-forge;
elif [[ "$BLAS" == "mkl" ]]; then
conda install mkl;
fi
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down