Merge pull request #48 from rust-math/default-path-for-windows

MKL2020.1 for Windows

Author: termoshtt

.github/workflows/intel-mkl-sys.yml

@@ -12,18 +12,20 @@ jobs:
       fail-fast: false
       matrix:
         feature:
+          - mkl-static-lp64-seq
+          - mkl-static-ilp64-seq
           - mkl-dynamic-lp64-seq
           - mkl-dynamic-ilp64-seq
     runs-on: windows-2019
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: >
-          --manifest-path=intel-mkl-sys/Cargo.toml
-          --no-default-features
-          --features=${{ matrix.feature }},download
+      - uses: actions/checkout@v1
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: >
+            --manifest-path=intel-mkl-sys/Cargo.toml
+            --no-default-features
+            --features=${{ matrix.feature }},download
 
   macos:
     strategy:
@@ -36,14 +38,14 @@ jobs:
           - mkl-dynamic-ilp64-seq
     runs-on: macos-10.15
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: >
-          --manifest-path=intel-mkl-sys/Cargo.toml
-          --no-default-features
-          --features=${{ matrix.feature }},download
+      - uses: actions/checkout@v1
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: >
+            --manifest-path=intel-mkl-sys/Cargo.toml
+            --no-default-features
+            --features=${{ matrix.feature }},download
 
   linux:
     strategy:
@@ -60,11 +62,11 @@ jobs:
           - mkl-dynamic-ilp64-seq
     runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: >
-          --manifest-path=intel-mkl-sys/Cargo.toml
-          --no-default-features
-          --features=${{ matrix.feature }},download
+      - uses: actions/checkout@v1
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: >
+            --manifest-path=intel-mkl-sys/Cargo.toml
+            --no-default-features
+            --features=${{ matrix.feature }},download

.gitignore

@@ -11,3 +11,6 @@ Cargo.lock
 **/*.rs.bk
 
 rusty-tags.*
+
+# Generated archives
+*.tar.zst

README.md

@@ -16,9 +16,9 @@ Redistribution of Intel MKL as a crate. Tested on Linux, macOS, and Windows (sin
 | feature name           | Linux              | macOS              | Windows            |
 |:-----------------------|:------------------:|:------------------:|:------------------:|
 | mkl-static-lp64-iomp   | :heavy_check_mark: | -                  | -                  |
-| mkl-static-lp64-seq    | :heavy_check_mark: | -                  | -                  |
+| mkl-static-lp64-seq    | :heavy_check_mark: | -                  | :heavy_check_mark: |
 | mkl-static-ilp64-iomp  | :heavy_check_mark: | -                  | -                  |
-| mkl-static-ilp64-seq   | :heavy_check_mark: | -                  | -                  |
+| mkl-static-ilp64-seq   | :heavy_check_mark: | -                  | :heavy_check_mark: |
 | mkl-dynamic-lp64-iomp  | :heavy_check_mark: | :heavy_check_mark: | -                  |
 | mkl-dynamic-lp64-seq   | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | mkl-dynamic-ilp64-iomp | :heavy_check_mark: | :heavy_check_mark: | -                  |
@@ -47,7 +47,9 @@ This crate seeks system MKL libraries, e.g. installed by [apt], [yum], or offici
     ```
 - (experimental) Seek `${XDG_DATA_HOME}/intel-mkl-tool`
 - Seek a directory set by `${MKLROOT}` environment variable
-- Seek `/opt/intel/mkl`
+- Seek default installation path
+  - `/opt/intel/mkl` for Linux
+  - `C:/Program Files (x86)/IntelSWTools/compilers_and_libraries/windows` for Windows
 
 If not found any MKL library, this crate will download archive from AWS S3 `rust-intel-mkl` bucket.
 

intel-mkl-tool/src/config.rs

@@ -235,17 +235,31 @@ mod tests {
         };
     }
 
-    mod dynamic {
+    #[cfg(target_os = "windows")]
+    mod macos {
+        use super::*;
+        impl_test_download!("mkl-dynamic-lp64-seq");
+        impl_test_download!("mkl-dynamic-ilp64-seq");
+        impl_test_download!("mkl-static-lp64-seq");
+        impl_test_download!("mkl-static-ilp64-seq");
+    }
+
+    #[cfg(target_os = "macos")]
+    mod macos {
         use super::*;
         impl_test_download!("mkl-dynamic-lp64-seq");
         impl_test_download!("mkl-dynamic-lp64-iomp");
         impl_test_download!("mkl-dynamic-ilp64-seq");
         impl_test_download!("mkl-dynamic-ilp64-iomp");
     }
 
-    #[cfg(all(target_os = "linux", target_arch = "x86_64"))]
-    mod static_ {
+    #[cfg(target_os = "linux")]
+    mod linux {
         use super::*;
+        impl_test_download!("mkl-dynamic-lp64-seq");
+        impl_test_download!("mkl-dynamic-lp64-iomp");
+        impl_test_download!("mkl-dynamic-ilp64-seq");
+        impl_test_download!("mkl-dynamic-ilp64-iomp");
         impl_test_download!("mkl-static-lp64-seq");
         impl_test_download!("mkl-static-lp64-iomp");
         impl_test_download!("mkl-static-ilp64-seq");

intel-mkl-tool/src/entry.rs

@@ -114,6 +114,14 @@ impl Entry {
             targets.seek(opt_mkl.join("lib/intel64"));
         }
 
+        // Default setting for Windows installer
+        let windows_mkl =
+            PathBuf::from("C:/Program Files (x86)/IntelSWTools/compilers_and_libraries/windows");
+        if windows_mkl.exists() {
+            targets.seek(windows_mkl.join("mkl/lib/intel64"));
+            targets.seek(windows_mkl.join("compiler/lib/intel64"));
+        }
+
         if targets.found_any() {
             return Ok(Self { config, targets });
         } else {

intel-mkl-tool/src/lib.rs

@@ -128,8 +128,8 @@ mod mkl {
     pub const EXTENSION_STATIC: &'static str = "lib";
     pub const EXTENSION_SHARED: &'static str = "lib";
     pub const PREFIX: &'static str = "";
-    pub const VERSION_YEAR: u32 = 2019;
-    pub const VERSION_UPDATE: u32 = 5;
+    pub const VERSION_YEAR: u32 = 2020;
+    pub const VERSION_UPDATE: u32 = 1;
 }
 
 fn s3_addr() -> String {