From 4ea9e722ac5fa6c4de8750c5382b50e02fbfa1f4 Mon Sep 17 00:00:00 2001 From: Dirreke Date: Wed, 29 Oct 2025 17:35:33 +0800 Subject: [PATCH] Update features to match intel-mkl-src 8.1 --- .github/workflows/intel-mkl.yml | 2 +- lax/Cargo.toml | 15 ++++++++++++--- lax/src/lib.rs | 12 +++++++++++- ndarray-linalg/Cargo.toml | 15 ++++++++++++--- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/.github/workflows/intel-mkl.yml b/.github/workflows/intel-mkl.yml index 14a0b443..5e348e48 100644 --- a/.github/workflows/intel-mkl.yml +++ b/.github/workflows/intel-mkl.yml @@ -17,4 +17,4 @@ jobs: steps: - uses: actions/checkout@v4 - name: cargo test - run: cargo test --manifest-path=ndarray-linalg/Cargo.toml --no-default-features --features=intel-mkl-static --verbose + run: cargo test --manifest-path=ndarray-linalg/Cargo.toml --no-default-features --features=intel-mkl-static-lp64-seq --verbose diff --git a/lax/Cargo.toml b/lax/Cargo.toml index 076d5cf2..ca8fead4 100644 --- a/lax/Cargo.toml +++ b/lax/Cargo.toml @@ -17,7 +17,7 @@ default = [] netlib = ["netlib-static"] openblas = ["openblas-static"] -intel-mkl = ["intel-mkl-static"] +intel-mkl = ["intel-mkl-static-lp64-seq"] netlib-static = ["netlib-src/static"] netlib-system = ["netlib-src/system"] @@ -25,8 +25,17 @@ 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-static = ["intel-mkl-src/mkl-static-lp64-seq"] # deprecated, use intel-mkl-static-lp64-seq instead +intel-mkl-system = ["intel-mkl-src/mkl-dynamic-lp64-seq"] # deprecated, use intel-mkl-dynamic-lp64-seq instead + +intel-mkl-dynamic-ilp64-iomp = ["intel-mkl-src/mkl-dynamic-ilp64-iomp"] +intel-mkl-dynamic-ilp64-seq = ["intel-mkl-src/mkl-dynamic-ilp64-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-static-ilp64-seq = ["intel-mkl-src/mkl-static-ilp64-seq"] +intel-mkl-static-lp64-iomp = ["intel-mkl-src/mkl-static-lp64-iomp"] +intel-mkl-static-lp64-seq = ["intel-mkl-src/mkl-static-lp64-seq"] [dependencies] thiserror = "2.0.0" diff --git a/lax/src/lib.rs b/lax/src/lib.rs index 680ff0db..b3d8cca1 100644 --- a/lax/src/lib.rs +++ b/lax/src/lib.rs @@ -76,7 +76,17 @@ #![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-static", //decprecated + feature = "intel-mkl-dynamic", //decprecated + 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 8c5c83a8..f53ca9c1 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"] +intel-mkl = ["lax/intel-mkl-static-lp64-seq"] netlib-static = ["lax/netlib-static"] netlib-system = ["lax/netlib-system"] @@ -26,8 +26,17 @@ 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-static = ["lax/intel-mkl-static"] # deprecated, use intel-mkl-static-lp64-seq instead +intel-mkl-system = ["lax/intel-mkl-system"] # deprecated, use intel-mkl-dynamic-lp64-seq instead + +intel-mkl-dynamic-ilp64-iomp = ["lax/intel-mkl-dynamic-ilp64-iomp"] +intel-mkl-dynamic-ilp64-seq = ["lax/intel-mkl-dynamic-ilp64-seq"] +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-static-ilp64-seq = ["lax/intel-mkl-static-ilp64-seq"] +intel-mkl-static-lp64-iomp = ["lax/intel-mkl-static-lp64-iomp"] +intel-mkl-static-lp64-seq = ["lax/intel-mkl-static-lp64-seq"] [dependencies] cauchy = "0.4.0"