From df7942ad84e76507969f6744e95242c4be0b8bfd Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 15 Jun 2019 14:19:10 +0900 Subject: [PATCH 1/3] Restore static feature --- Cargo.toml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 1cdf2391..b2390484 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,6 +19,9 @@ netlib = ["lapack-src/netlib", "blas-src/netlib"] openblas = ["lapack-src/openblas", "blas-src/openblas"] serde-1 = ["ndarray/serde-1", "num-complex/serde"] +netlib-static = ["netlib", "netlib-src"] +openblas-static = ["openblas", "openblas-src"] + [dependencies] lapacke = "0.2" num-traits = "0.2" @@ -38,3 +41,15 @@ default-features = false [dependencies.lapack-src] version = "0.3" default-features = false + +[dependencies.openblas-src] +version = "0.6" +default-features = false +features = ["static"] +optional = true + +[dependencies.netlib-src] +version = "0.7" +default-features = false +features = ["static"] +optional = true From 45e55053c21bc3ae584d40182b721b50644edce0 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 15 Jun 2019 14:37:02 +0900 Subject: [PATCH 2/3] Add test for static linking --- azure-pipelines.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b5f1de0c..48b41592 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,6 +16,23 @@ jobs: cargo test -v --features=openblas,serde-1 --no-default-features displayName: run test + - job: LinuxStaticOpenBLAS + 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=openblas-static --no-default-features + cargo test -v --features=openblas-static,serde-1 --no-default-features + displayName: run test + - job: LinuxNetlib pool: vmImage: 'ubuntu-16.04' @@ -33,6 +50,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 d53aa79c8ac7f74dfb89ec0a9c5ba9b721419c17 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Sat, 15 Jun 2019 14:59:02 +0900 Subject: [PATCH 3/3] Remove netlib-static --- Cargo.toml | 7 ------- azure-pipelines.yml | 17 ----------------- 2 files changed, 24 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b2390484..486f44f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,6 @@ netlib = ["lapack-src/netlib", "blas-src/netlib"] openblas = ["lapack-src/openblas", "blas-src/openblas"] serde-1 = ["ndarray/serde-1", "num-complex/serde"] -netlib-static = ["netlib", "netlib-src"] openblas-static = ["openblas", "openblas-src"] [dependencies] @@ -47,9 +46,3 @@ version = "0.6" default-features = false features = ["static"] optional = true - -[dependencies.netlib-src] -version = "0.7" -default-features = false -features = ["static"] -optional = true diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 48b41592..5d1e35fb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -50,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'