From ba27c83ddf3f8c044bc518c6a46620645469061d Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 27 Apr 2019 22:58:10 +0900 Subject: [PATCH 1/6] Setting for Azure Pipeline --- azure-pipelines.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 00000000..2f7260f1 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,34 @@ +jobs: + - job: Linux + pool: + vmImage: 'ubuntu-16.04' + strategy: + matrix: + openblas: + feature: openblas + netlib: + feature: netlib + intel-mkl: + feature: intel-mkl + steps: + - script: | + curl -sSf https://sh.rustup.rs | sh -s -- -y + echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin" + displayName: install rustup + - script: cargo test -v --features=$FEATURE --no-default-features + displayName: run test + + - job: macOS + pool: + vmImage: 'macOS-10.14' + strategy: + matrix: + intel-mkl: + feature: intel-mkl + steps: + - script: | + curl -sSf https://sh.rustup.rs | sh -s -- -y + echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin" + displayName: install rustup + - script: cargo test -v --features=$FEATURE --no-default-features + displayName: run test From d9370bd9b6dd3e9e4b29ac0f0ffb50ed717399eb Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 27 Apr 2019 23:11:01 +0900 Subject: [PATCH 2/6] Install gfortran/cmake --- azure-pipelines.yml | 56 +++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2f7260f1..0486be2e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,34 +1,60 @@ jobs: - - job: Linux + - job: LinuxOpenBLAS pool: vmImage: 'ubuntu-16.04' - strategy: - matrix: - openblas: - feature: openblas - netlib: - feature: netlib - intel-mkl: - feature: intel-mkl steps: - script: | curl -sSf https://sh.rustup.rs | sh -s -- -y echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin" displayName: install rustup - - script: cargo test -v --features=$FEATURE --no-default-features + - script: | + sudo apt-get update + sudo apt-get install -y gfortran + displayName: apt install + - script: | + cargo test -v --features=openblas --no-default-features + cargo test -v --features=openblas,serde-1 --no-default-features + displayName: run test + + - job: LinuxNetlib + pool: + vmImage: 'ubuntu-16.04' + steps: + - script: | + curl -sSf https://sh.rustup.rs | sh -s -- -y + echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin" + displayName: install rustup + - script: | + sudo apt-get update + sudo apt-get install -y cmake gfortran + displayName: apt install + - script: | + cargo test -v --features=netlib --no-default-features + cargo test -v --features=netlib,serde-1 --no-default-features + displayName: run test + + - job: LinuxIntelMKL + pool: + vmImage: 'ubuntu-16.04' + steps: + - script: | + curl -sSf https://sh.rustup.rs | sh -s -- -y + echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin" + displayName: install rustup + - script: | + cargo test -v --features=intel-mkl --no-default-features + cargo test -v --features=intel-mkl,serde-1 --no-default-features displayName: run test - job: macOS pool: vmImage: 'macOS-10.14' - strategy: - matrix: - intel-mkl: - feature: intel-mkl steps: - script: | curl -sSf https://sh.rustup.rs | sh -s -- -y echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin" displayName: install rustup - - script: cargo test -v --features=$FEATURE --no-default-features + - script: | + cargo test -v --features=intel-mkl --no-default-features + cargo test -v --features=intel-mkl,serde-1 --no-default-features displayName: run test From df1a82bcafefb4d32494f1635fdbf2c087b1836b Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 27 Apr 2019 23:11:37 +0900 Subject: [PATCH 3/6] Remove Circle CI setting --- .circleci/config.yml | 47 -------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 8de18043..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,47 +0,0 @@ -version: 2.0 - -references: - rust_cfg: &rust_cfg - docker: - - image: rust:1.26.2 - -jobs: - test-openblas: - <<: *rust_cfg - steps: - - checkout - - run: - name: test OpenBLAS backend - command: | - apt update && apt install -y gfortran - cargo test --no-default-features --features=openblas - cargo test --no-default-features --features=openblas,serde-1 - - test-netlib: - <<: *rust_cfg - steps: - - checkout - - run: - name: test NetLib backend - command: | - apt update && apt install -y cmake gfortran - cargo test --no-default-features --features=netlib - cargo test --no-default-features --features=netlib,serde-1 - - test-intel-mkl: - <<: *rust_cfg - steps: - - checkout - - run: - name: test Intel MKL backend - command: | - cargo test --no-default-features --features=intel-mkl - cargo test --no-default-features --features=intel-mkl,serde-1 - -workflows: - version: 2 - tests: - jobs: - - test-openblas - - test-netlib - - test-intel-mkl From 0b810944085b393f0f9ce51f24fca108dacaf075 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 27 Apr 2019 23:11:55 +0900 Subject: [PATCH 4/6] Remove rust-toolchain file --- rust-toolchain | 1 - 1 file changed, 1 deletion(-) delete mode 100644 rust-toolchain diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 2bf5ad04..00000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -stable From 35378806f6c018472fa9da1f4ef9c081a3ca0daf Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 27 Apr 2019 23:41:28 +0900 Subject: [PATCH 5/6] Add accelerate target --- azure-pipelines.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0486be2e..163f6e3f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -46,7 +46,7 @@ jobs: cargo test -v --features=intel-mkl,serde-1 --no-default-features displayName: run test - - job: macOS + - job: macOSIntelMKL pool: vmImage: 'macOS-10.14' steps: @@ -58,3 +58,16 @@ jobs: cargo test -v --features=intel-mkl --no-default-features cargo test -v --features=intel-mkl,serde-1 --no-default-features displayName: run test + + - job: macOSAccelerate + pool: + vmImage: 'macOS-10.14' + steps: + - script: | + curl -sSf https://sh.rustup.rs | sh -s -- -y + echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin" + displayName: install rustup + - script: | + cargo test -v --features=accelerate --no-default-features + cargo test -v --features=accelerate,serde-1 --no-default-features + displayName: run test From e9a9a36ef8c6e253504fd442d5a55881dee8cc78 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 27 Apr 2019 23:46:41 +0900 Subject: [PATCH 6/6] Remove accelerate feature --- Cargo.toml | 1 - azure-pipelines.yml | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b2eed749..5abfac58 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,6 @@ categories = ["algorithms", "science"] [features] default = [] -accelerate = ["lapack-src/accelerate", "blas-src/accelerate"] intel-mkl = ["lapack-src/intel-mkl", "blas-src/intel-mkl"] netlib = ["lapack-src/netlib", "blas-src/netlib"] openblas = ["lapack-src/openblas", "blas-src/openblas"] diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 163f6e3f..a6b1f035 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -58,16 +58,3 @@ jobs: cargo test -v --features=intel-mkl --no-default-features cargo test -v --features=intel-mkl,serde-1 --no-default-features displayName: run test - - - job: macOSAccelerate - pool: - vmImage: 'macOS-10.14' - steps: - - script: | - curl -sSf https://sh.rustup.rs | sh -s -- -y - echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin" - displayName: install rustup - - script: | - cargo test -v --features=accelerate --no-default-features - cargo test -v --features=accelerate,serde-1 --no-default-features - displayName: run test