intel-mkl-{static,system} features

Author: termoshtt

.github/workflows/intel-mkl.yml

@@ -12,8 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         feature:
-          - mkl-static-lp64-seq
-          - mkl-dynamic-lp64-seq
+          - intel-mkl-static
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v1
@@ -25,54 +24,20 @@ jobs:
             --no-default-features
             --features=${{ matrix.feature }}
 
-  macos:
-    strategy:
-      fail-fast: false
-      matrix:
-        feature:
-          - mkl-dynamic-lp64-iomp
-          - mkl-dynamic-lp64-seq
-    runs-on: macos-10.15
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/cargo@v1
-        name: cargo test --all-targets
-        with:
-          command: test
-          args: >
-            --manifest-path=ndarray-linalg/Cargo.toml
-            --no-default-features
-            --features=${{ matrix.feature }}
-            --all-targets
-
   linux:
     strategy:
       fail-fast: false
       matrix:
         feature:
-          - mkl-static-lp64-iomp
-          - mkl-static-lp64-seq
-          - mkl-dynamic-lp64-iomp
-          - mkl-dynamic-lp64-seq
+          - intel-mkl-static
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
       - uses: actions-rs/cargo@v1
-        name: cargo test --all-targets
-        with:
-          command: test
-          args: >
-            --manifest-path=ndarray-linalg/Cargo.toml
-            --no-default-features
-            --features=${{ matrix.feature }}
-            --all-targets
-      - uses: actions-rs/cargo@v1
-        name: cargo test --doc
+        name: cargo test
         with:
           command: test
           args: >
             --manifest-path=ndarray-linalg/Cargo.toml
             --no-default-features
             --features=${{ matrix.feature }}
-            --doc
-        if: ${{ startsWith(matrix.feature, 'mkl-static') }}

lax/Cargo.toml

@@ -9,17 +9,16 @@ default = []
 
 netlib    = ["netlib-static"]
 openblas  = ["openblas-static"]
-intel-mkl = ["mkl-static-lp64-seq"]
+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"]
 
-mkl-static-lp64-iomp   = ["intel-mkl-src/mkl-static-lp64-iomp"]
-mkl-static-lp64-seq    = ["intel-mkl-src/mkl-static-lp64-seq"]
-mkl-dynamic-lp64-iomp  = ["intel-mkl-src/mkl-dynamic-lp64-iomp"]
-mkl-dynamic-lp64-seq   = ["intel-mkl-src/mkl-dynamic-lp64-seq"]
+intel-mkl-static = ["intel-mkl-src/mkl-static-lp64-seq", "intel-mkl-src/download"]
+intel-mkl-system = ["intel-mkl-src/mkl-dynamic-lp64-seq"]
 
 [dependencies]
 thiserror = "1.0"
@@ -30,7 +29,6 @@ lapack = "0.16.0"
 [dependencies.intel-mkl-src]
 version = "0.6.0"
 default-features = false
-features = ["download"]
 optional = true
 
 [dependencies.netlib-src]

lax/src/lib.rs

@@ -59,12 +59,7 @@
 //! [svddc]: svddck/trait.SVDDC_.html#tymethod.svddc
 //! [least_squares]: least_squares/trait.LeastSquaresSvdDivideConquer_.html#tymethod.least_squares
 
-#[cfg(any(
-    feature = "mkl-static-lp64-iomp",
-    feature = "mkl-static-lp64-seq",
-    feature = "mkl-dynamic-lp64-iomp",
-    feature = "mkl-dynamic-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

@@ -21,13 +21,12 @@ 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"]
 
-mkl-static-lp64-iomp  = ["lax/mkl-static-lp64-iomp"]
-mkl-static-lp64-seq   = ["lax/mkl-static-lp64-seq"]
-mkl-dynamic-lp64-iomp = ["lax/mkl-dynamic-lp64-iomp"]
-mkl-dynamic-lp64-seq  = ["lax/mkl-dynamic-lp64-seq"]
+intel-mkl-static = ["lax/intel-mkl-static"]
+intel-mkl-system = ["lax/intel-mkl-system"]
 
 [dependencies]
 cauchy = "0.2.2"