diff --git a/lax/Cargo.toml b/lax/Cargo.toml index 2f095ea8..0e089d30 100644 --- a/lax/Cargo.toml +++ b/lax/Cargo.toml @@ -17,7 +17,6 @@ default = [] netlib = ["netlib-static"] openblas = ["openblas-static"] -intel-mkl = ["intel-mkl-static"] netlib-static = ["netlib-src/static"] netlib-system = ["netlib-src/system"] @@ -25,8 +24,14 @@ netlib-system = ["netlib-src/system"] openblas-static = ["openblas-src/static"] openblas-system = ["openblas-src/system"] -intel-mkl-static = ["intel-mkl-src/mkl-static-lp64-seq"] -intel-mkl-system = ["intel-mkl-src/mkl-dynamic-lp64-seq"] +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"] [dependencies] thiserror = "1.0.24" diff --git a/lax/src/lib.rs b/lax/src/lib.rs index af48f257..bb46b61a 100644 --- a/lax/src/lib.rs +++ b/lax/src/lib.rs @@ -75,7 +75,7 @@ #![deny(rustdoc::broken_intra_doc_links, rustdoc::private_intra_doc_links)] -#[cfg(any(feature = "intel-mkl-system", feature = "intel-mkl-static"))] +#[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"))] 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 e06fa675..04d5d3c1 100644 --- a/ndarray-linalg/Cargo.toml +++ b/ndarray-linalg/Cargo.toml @@ -17,7 +17,7 @@ default = [] netlib = ["lax/netlib"] openblas = ["lax/openblas"] -intel-mkl = ["lax/intel-mkl"] +intel-mkl = ["lax/intel-mkl-static-lp64-seq"] netlib-static = ["lax/netlib-static"] netlib-system = ["lax/netlib-system"] @@ -25,8 +25,15 @@ netlib-system = ["lax/netlib-system"] openblas-static = ["lax/openblas-static"] openblas-system = ["lax/openblas-system"] -intel-mkl-static = ["lax/intel-mkl-static"] -intel-mkl-system = ["lax/intel-mkl-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"] + [dependencies] cauchy = "0.4.0"