Remove feature flags for openblas backend

* remove features tests-openblas-* * use system openblas installation per default
rust-ml · Nov 27, 2020 · b7387ea · b7387ea
1 parent 0244747
commit b7387ea
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 34 deletions.
diff --git a/linfa-clustering/Cargo.toml b/linfa-clustering/Cargo.toml
@@ -12,11 +12,6 @@ readme = "README.md"
 keywords = ["clustering", "machine-learning", "linfa", "k-means", "unsupervised"]
 categories = ["algorithms", "mathematics", "science"]
 
-[features]
-default = ["tests-openblas-system"]
-tests-openblas-system = ["openblas-src/system"]
-tests-openblas-build = ["openblas-src/cblas", "openblas-src/lapacke"]
-
 [dependencies.serde_crate]
 package = "serde"
 optional = true
@@ -36,7 +31,7 @@ rand_isaac = "0.2.0"
 linfa = { path = ".." }
 
 [dev-dependencies]
-openblas-src = { version = "0.9", default-features = false }
+openblas-src = { version = "0.9", default-features = false, features = ["system"] }
 ndarray-npy = { version = "0.5", default-features = false }
 criterion = "0.3"
 serde_json = "1"

diff --git a/linfa-ica/Cargo.toml b/linfa-ica/Cargo.toml
@@ -12,11 +12,6 @@ readme = "README.md"
 keywords = ["factorization", "machine-learning", "linfa", "unsupervised"]
 categories = ["algorithms", "mathematics", "science"]
 
-[features]
-default = ["tests-openblas-system"]
-tests-openblas-system = ["openblas-src/system"]
-tests-openblas-build = ["openblas-src/cblas", "openblas-src/lapacke"]
-
 [dependencies]
 ndarray = { version = "0.13", default-features = false }
 ndarray-rand = "0.11"
@@ -28,6 +23,6 @@ rand_isaac = "0.2.0"
 linfa = { path = ".." }
 
 [dev-dependencies]
-openblas-src = { version = "0.9", default-features = false }
+openblas-src = { version = "0.9", default-features = false, features = ["system"] }
 ndarray-npy = { version = "0.5", default-features = false }
 paste = "1.0"
diff --git a/linfa-linear/Cargo.toml b/linfa-linear/Cargo.toml
@@ -5,11 +5,6 @@ authors = ["Paul Körbitz / Google <[email protected]>"]
 edition = "2018"
 workspace = ".."
 
-[features]
-default = ["tests-openblas-system"]
-tests-openblas-system = ["openblas-src/system"]
-tests-openblas-build = ["openblas-src/cblas", "openblas-src/lapacke"]
-
 [dependencies]
 ndarray = {version = "0.13", features = ["blas", "approx"]}
 ndarray-linalg = "0.12"
@@ -19,7 +14,7 @@ argmin = {version="0.3.1", features=["ndarrayl"]}
 serde = "1.0"
 
 [dev-dependencies]
-openblas-src = { version = "0.9", default-features = false }
+openblas-src = { version = "0.9", default-features = false, features = ["system"] }
 csv = "1.1"
 ndarray-csv = "0.4"
 approx = "0.3.2"

diff --git a/linfa-logistic/Cargo.toml b/linfa-logistic/Cargo.toml
@@ -5,11 +5,6 @@ authors = ["Paul Körbitz / Google <[email protected]>"]
 edition = "2018"
 workspace = ".."
 
-[features]
-default = ["tests-openblas-system"]
-tests-openblas-system = ["openblas-src/system"]
-tests-openblas-build = ["openblas-src/cblas", "openblas-src/lapacke"]
-
 [dependencies]
 ndarray = {version = "0.13", features = ["blas", "approx"]}
 ndarray-linalg = "0.12"
@@ -18,5 +13,5 @@ argmin = {version="0.3.1", features=["ndarrayl"]}
 serde = "1.0"
 
 [dev-dependencies]
-openblas-src = { version = "0.9", default-features = false }
+openblas-src = { version = "0.9", default-features = false, features = ["system"] }
 approx = "0.3.2"
diff --git a/linfa-reduction/Cargo.toml b/linfa-reduction/Cargo.toml
@@ -13,7 +13,7 @@ keywords = ["dimensionality reduction", "machine-learning", "linfa", "spectral",
 categories = ["algorithms", "mathematics", "science"]
 
 [features]
-default = ["tests-openblas-system"]
+default = []
 tests-openblas-system = ["openblas-src/system"]
 tests-openblas-build = ["openblas-src/cblas", "openblas-src/lapacke"]
 
@@ -28,7 +28,7 @@ linfa = { path = ".." }
 linfa-kernel = { path = "../linfa-kernel" }
 
 [dev-dependencies]
-openblas-src = { version = "0.9", default-features = false }
+openblas-src = { version = "0.9", default-features=false }
 rand_isaac = "0.2.0"
 ndarray-npy = { version = "0.5", default-features = false }
 criterion = "0.3"

diff --git a/linfa-svm/Cargo.toml b/linfa-svm/Cargo.toml
@@ -12,12 +12,6 @@ readme = "README.md"
 keywords = ["svm", "support vector machine", "machine-learning", "linfa", "supervised"]
 categories = ["algorithms", "mathematics", "science"]
 
-[features]
-default = ["tests-openblas-system"]
-
-tests-openblas-system = ["openblas-src/system"]
-tests-openblas-build = ["openblas-src/cblas", "openblas-src/lapacke"]
-
 [dependencies]
 ndarray = { version = "0.13", default-features=false, features=["blas"] }
 ndarray-rand = "0.11"
@@ -27,7 +21,7 @@ linfa = { path = ".." }
 linfa-kernel = { path = "../linfa-kernel" }
 
 [dev-dependencies]
-openblas-src = { version = "0.9", default-features = false }
+openblas-src = { version = "0.9", default-features = false, features = ["system"] }
 csv = "1.1"
 ndarray-csv = "0.4"
 flate2 = "1.0"
diff --git a/linfa-svm/src/classification.rs b/linfa-svm/src/classification.rs
@@ -305,7 +305,7 @@ impl<'a, F: Float, T: Targets, D: Data<Elem = F>>
 
 #[cfg(test)]
 mod tests {
-    extern crate openblas_src; // or another backend of your choice
+    extern crate openblas_src;
 
     use super::Svm;
     use linfa::dataset::Dataset;