Merge pull request #410 from rust-ndarray/revert-359-master

Revert "Updated features to match intel-mkl-src 8.1 (enabeling multithreading / ilp64)"

Author: Dirreke

lax/Cargo.toml

@@ -17,21 +17,16 @@ default = []
 
 netlib    = ["netlib-static"]
 openblas  = ["openblas-static"]
+intel-mkl = ["intel-mkl-static"]
 
 netlib-static = ["netlib-src/static"]
 netlib-system = ["netlib-src/system"]
 
 openblas-static = ["openblas-src/static"]
 openblas-system = ["openblas-src/system"]
 
-intel-mkl-dynamic-lp64-iomp = ["intel-mkl-src/mkl-dynamic-lp64-iomp"]
-intel-mkl-dynamic-lp64-seq = ["intel-mkl-src/mkl-dynamic-lp64-seq"]
-intel-mkl-static-ilp64-iomp = ["intel-mkl-src/mkl-static-ilp64-iomp"]
-intel-mkl-dynamic-ilp64-seq = ["intel-mkl-src/mkl-dynamic-ilp64-seq"]
-intel-mkl-static-lp64-iomp = ["intel-mkl-src/mkl-static-lp64-iomp"]
-intel-mkl-dynamic-ilp64-iomp = ["intel-mkl-src/mkl-dynamic-ilp64-iomp"]
-intel-mkl-static-ilp64-seq = ["intel-mkl-src/mkl-static-ilp64-seq"]
-intel-mkl-static-lp64-seq = ["intel-mkl-src/mkl-static-lp64-seq"]
+intel-mkl-static = ["intel-mkl-src/mkl-static-lp64-seq"]
+intel-mkl-system = ["intel-mkl-src/mkl-dynamic-lp64-seq"]
 
 [dependencies]
 thiserror = "2.0.0"

lax/src/lib.rs

@@ -76,7 +76,7 @@
 
 #![deny(rustdoc::broken_intra_doc_links, rustdoc::private_intra_doc_links)]
 
-#[cfg(any(feature = "intel-mkl-dynamic-lp64-iomp", feature = "intel-mkl-dynamic-lp64-seq", feature = "intel-mkl-static-ilp64-iomp", feature = "intel-mkl-static-lp64-iomp", feature = "intel-mkl-dynamic-ilp64-iomp", feature = "intel-mkl-static-ilp64-seq", feature = "intel-mkl-static-lp64-seq"))]
+#[cfg(any(feature = "intel-mkl-system", feature = "intel-mkl-static"))]
 extern crate intel_mkl_src as _src;
 
 #[cfg(any(feature = "openblas-system", feature = "openblas-static"))]

ndarray-linalg/Cargo.toml

@@ -18,23 +18,16 @@ blas      = ["ndarray/blas"]
 
 netlib    = ["lax/netlib"]
 openblas  = ["lax/openblas"]
-intel-mkl = ["lax/intel-mkl-static-lp64-seq"]
+intel-mkl = ["lax/intel-mkl"]
 
 netlib-static   = ["lax/netlib-static"]
 netlib-system   = ["lax/netlib-system"]
 
 openblas-static = ["lax/openblas-static"]
 openblas-system = ["lax/openblas-system"]
 
-intel-mkl-dynamic-lp64-iomp = ["lax/intel-mkl-dynamic-lp64-iomp"]
-intel-mkl-dynamic-lp64-seq = ["lax/intel-mkl-dynamic-lp64-seq"]
-intel-mkl-static-ilp64-iomp = ["lax/intel-mkl-static-ilp64-iomp"]
-intel-mkl-dynamic-ilp64-seq = ["lax/intel-mkl-dynamic-ilp64-seq"]
-intel-mkl-static-lp64-iomp = ["lax/intel-mkl-static-lp64-iomp"]
-intel-mkl-dynamic-ilp64-iomp = ["lax/intel-mkl-dynamic-ilp64-iomp"]
-intel-mkl-static-ilp64-seq = ["lax/intel-mkl-static-ilp64-seq"]
-intel-mkl-static-lp64-seq = ["lax/intel-mkl-static-lp64-seq"]
-
+intel-mkl-static = ["lax/intel-mkl-static"]
+intel-mkl-system = ["lax/intel-mkl-system"]
 
 [dependencies]
 cauchy = "0.4.0"