From e2a3bda009a3804120a65edd8c7967b08dde7dd1 Mon Sep 17 00:00:00 2001 From: Gemingyang Date: Wed, 29 Oct 2025 17:25:44 +0800 Subject: [PATCH] Revert "Updated features to match intel-mkl-src 8.1 (enabeling multithreading / ilp64)" --- lax/Cargo.toml | 11 +++-------- lax/src/lib.rs | 2 +- ndarray-linalg/Cargo.toml | 13 +++---------- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/lax/Cargo.toml b/lax/Cargo.toml index 9f959235..e6479c51 100644 --- a/lax/Cargo.toml +++ b/lax/Cargo.toml @@ -17,6 +17,7 @@ default = [] netlib = ["netlib-static"] openblas = ["openblas-static"] +intel-mkl = ["intel-mkl-static"] netlib-static = ["netlib-src/static"] netlib-system = ["netlib-src/system"] @@ -24,14 +25,8 @@ 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" diff --git a/lax/src/lib.rs b/lax/src/lib.rs index da98fe69..680ff0db 100644 --- a/lax/src/lib.rs +++ b/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"))] diff --git a/ndarray-linalg/Cargo.toml b/ndarray-linalg/Cargo.toml index 83f80371..86589baf 100644 --- a/ndarray-linalg/Cargo.toml +++ b/ndarray-linalg/Cargo.toml @@ -18,7 +18,7 @@ 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"] @@ -26,15 +26,8 @@ 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"