From 098fc96a7f1b995a1d33f0f58affda2f3a559ad9 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 28 Sep 2019 18:01:50 +0900 Subject: [PATCH 1/5] Restore static feature --- Cargo.toml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index acc74117..1412360d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,6 +19,8 @@ netlib = ["lapack-src/netlib", "blas-src/netlib"] openblas = ["lapack-src/openblas", "blas-src/openblas"] serde-1 = ["ndarray/serde-1", "num-complex/serde"] +static = ["openblas-static"] +netlib-static = ["netlib", "netlib-src"] openblas-static = ["openblas", "openblas-src"] [dependencies] @@ -47,6 +49,12 @@ default-features = false features = ["static"] optional = true +[dependencies.netlib-src] +version = "0.6" +default-features = false +features = ["static"] +optional = true + [dev-dependencies] paste = "0.1" criterion = "*" From 8ecbe1c1938e910138a065bc7c3ea927a3797c00 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 28 Sep 2019 18:08:33 +0900 Subject: [PATCH 2/5] Add pipelines settings --- azure-pipelines.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5d1e35fb..d3ffb3a6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,4 +1,21 @@ jobs: + - job: LinuxStatic + 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 gfortran + displayName: apt install + - script: | + cargo test -v --features=static --no-default-features + cargo test -v --features=static,serde-1 --no-default-features + displayName: run test + - job: LinuxOpenBLAS pool: vmImage: 'ubuntu-16.04' @@ -50,6 +67,23 @@ jobs: cargo test -v --features=netlib,serde-1 --no-default-features displayName: run test + - job: LinuxStaticNetlib + 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-static --no-default-features + cargo test -v --features=netlib-static,serde-1 --no-default-features + displayName: run test + - job: LinuxIntelMKL pool: vmImage: 'ubuntu-16.04' From 4858d9e3a7aa38926b22a51f2a4a737a1cb442c3 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 28 Sep 2019 19:57:51 +0900 Subject: [PATCH 3/5] Fix netlib version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1412360d..8992bcf6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,7 +50,7 @@ features = ["static"] optional = true [dependencies.netlib-src] -version = "0.6" +version = "0.7" default-features = false features = ["static"] optional = true From 12eb607a5878b94f7925afa1f7ee6285bc798d56 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sun, 29 Sep 2019 14:04:57 +0900 Subject: [PATCH 4/5] Drop netlib-static --- Cargo.toml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8992bcf6..6686b0ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,6 @@ openblas = ["lapack-src/openblas", "blas-src/openblas"] serde-1 = ["ndarray/serde-1", "num-complex/serde"] static = ["openblas-static"] -netlib-static = ["netlib", "netlib-src"] openblas-static = ["openblas", "openblas-src"] [dependencies] @@ -49,12 +48,6 @@ default-features = false features = ["static"] optional = true -[dependencies.netlib-src] -version = "0.7" -default-features = false -features = ["static"] -optional = true - [dev-dependencies] paste = "0.1" criterion = "*" From c444883b0e09bf49fb9cdd16d55083ff09cba354 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sun, 29 Sep 2019 14:06:40 +0900 Subject: [PATCH 5/5] Drop CIs --- azure-pipelines.yml | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d3ffb3a6..5d1e35fb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,21 +1,4 @@ jobs: - - job: LinuxStatic - 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 gfortran - displayName: apt install - - script: | - cargo test -v --features=static --no-default-features - cargo test -v --features=static,serde-1 --no-default-features - displayName: run test - - job: LinuxOpenBLAS pool: vmImage: 'ubuntu-16.04' @@ -67,23 +50,6 @@ jobs: cargo test -v --features=netlib,serde-1 --no-default-features displayName: run test - - job: LinuxStaticNetlib - 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-static --no-default-features - cargo test -v --features=netlib-static,serde-1 --no-default-features - displayName: run test - - job: LinuxIntelMKL pool: vmImage: 'ubuntu-16.04'