MKL 2020.1 for Windows

Author: termoshtt

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 {