Skip to content

Commit c87ee64

Browse files
authored
Merge pull request #188 from rust-ndarray/fix_windows_ci
Fix CI, Update OpenBLAS
2 parents cdc6db1 + 537e9f1 commit c87ee64

File tree

2 files changed

+19
-45
lines changed

2 files changed

+19
-45
lines changed

Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,34 @@ static = ["openblas-static"]
2323
openblas-static = ["openblas", "openblas-src"]
2424

2525
[dependencies]
26-
lapacke = "0.2"
27-
num-traits = "0.2"
28-
cauchy = "0.2.1"
29-
num-complex = "0.2.1"
26+
lapacke = "0.2.0"
27+
num-traits = "0.2.11"
28+
cauchy = "0.2.2"
29+
num-complex = "0.2.4"
3030
rand = "0.5"
3131

3232
[dependencies.ndarray]
33-
version = "0.13"
33+
version = "0.13.0"
3434
features = ["blas"]
3535
default-features = false
3636

3737
[dependencies.blas-src]
38-
version = "0.4"
38+
version = "0.6.1"
3939
default-features = false
4040

4141
[dependencies.lapack-src]
42-
version = "0.4"
42+
version = "0.6.0"
4343
default-features = false
4444

4545
[dependencies.openblas-src]
46-
version = "0.7"
46+
version = "0.9.0"
4747
default-features = false
4848
features = ["static"]
4949
optional = true
5050

5151
[dev-dependencies]
52-
paste = "0.1"
53-
criterion = "0.3"
52+
paste = "0.1.9"
53+
criterion = "0.3.1"
5454

5555
[[bench]]
5656
name = "eigh"

azure-pipelines.yml

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,56 @@
11
jobs:
22
- job: LinuxOpenBLAS
33
pool:
4-
vmImage: 'ubuntu-16.04'
4+
vmImage: 'ubuntu-18.04'
55
steps:
6-
- script: |
7-
curl -sSf https://sh.rustup.rs | sh -s -- -y
8-
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
9-
displayName: install rustup
106
- script: |
117
sudo apt-get update
128
sudo apt-get install -y gfortran
13-
displayName: apt install
9+
displayName: apt install gfortran
1410
- script: |
1511
cargo test -v --features=openblas --no-default-features
1612
cargo test -v --features=openblas,serde-1 --no-default-features
1713
displayName: run test
1814
1915
- job: LinuxStaticOpenBLAS
2016
pool:
21-
vmImage: 'ubuntu-16.04'
17+
vmImage: 'ubuntu-18.04'
2218
steps:
23-
- script: |
24-
curl -sSf https://sh.rustup.rs | sh -s -- -y
25-
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
26-
displayName: install rustup
2719
- script: |
2820
sudo apt-get update
2921
sudo apt-get install -y gfortran
30-
displayName: apt install
22+
displayName: apt install gfortran
3123
- script: |
3224
cargo test -v --features=openblas-static --no-default-features
3325
cargo test -v --features=openblas-static,serde-1 --no-default-features
3426
displayName: run test
3527
3628
- job: LinuxNetlib
3729
pool:
38-
vmImage: 'ubuntu-16.04'
30+
vmImage: 'ubuntu-18.04'
3931
steps:
40-
- script: |
41-
curl -sSf https://sh.rustup.rs | sh -s -- -y
42-
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
43-
displayName: install rustup
4432
- script: |
4533
sudo apt-get update
46-
sudo apt-get install -y cmake gfortran
47-
displayName: apt install
34+
sudo apt-get install -y gfortran
35+
displayName: apt install gfortran
4836
- script: |
4937
cargo test -v --features=netlib --no-default-features
5038
cargo test -v --features=netlib,serde-1 --no-default-features
5139
displayName: run test
5240
5341
- job: LinuxIntelMKL
5442
pool:
55-
vmImage: 'ubuntu-16.04'
43+
vmImage: 'ubuntu-18.04'
5644
steps:
57-
- script: |
58-
curl -sSf https://sh.rustup.rs | sh -s -- -y
59-
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
60-
displayName: install rustup
6145
- script: |
6246
cargo test -v --features=intel-mkl --no-default-features
6347
cargo test -v --features=intel-mkl,serde-1 --no-default-features
6448
displayName: run test
6549
6650
- job: macOSIntelMKL
6751
pool:
68-
vmImage: 'macOS-10.14'
52+
vmImage: 'macOS-10.15'
6953
steps:
70-
- script: |
71-
curl -sSf https://sh.rustup.rs | sh -s -- -y
72-
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
73-
displayName: install rustup
7454
- script: |
7555
cargo test -v --features=intel-mkl --no-default-features
7656
cargo test -v --features=intel-mkl,serde-1 --no-default-features
@@ -80,11 +60,5 @@ jobs:
8060
pool:
8161
vmImage: 'windows-2019'
8262
steps:
83-
- script: |
84-
curl -sSf -o rustup-init.exe https://win.rustup.rs
85-
rustup-init.exe -y 2>&1
86-
set PATH=%PATH%;%USERPROFILE%\.cargo\bin
87-
echo '##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin'
88-
displayName: install rustup on Windows
8963
- script: cargo test -v --features=intel-mkl --no-default-features 2>&1
9064
displayName: run test

0 commit comments

Comments
 (0)