Merge pull request #104 from rust-math/windows-ocipkg

ocipkg for Windows

Author: termoshtt

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

@@ -47,10 +47,6 @@ jobs:
       image: rust:1.62.1
     steps:
       - uses: actions/checkout@v1
-      - uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: ocipkg-cli
       - uses: actions-rs/cargo@v1
         with:
           command: test
@@ -87,7 +83,25 @@ jobs:
           command: test
           args: >
             --manifest-path=intel-mkl-sys/Cargo.toml
-            --no-default-features
             --features=${{ matrix.feature }}
         env:
           MKLROOT: ${{ github.workspace }}
+
+  windows-ocipkg:
+    strategy:
+      fail-fast: false
+      matrix:
+        feature:
+          - mkl-static-lp64-iomp
+          - mkl-static-lp64-seq
+          - mkl-static-ilp64-iomp
+          - mkl-static-ilp64-seq
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: >
+            --manifest-path=intel-mkl-sys/Cargo.toml
+            --features=${{ matrix.feature }}

intel-mkl-src/Cargo.toml

@@ -31,5 +31,9 @@ mkl-dynamic-ilp64-seq  = []
 
 [build-dependencies]
 anyhow = "1.0.58"
-ocipkg = "0.2.6"
-intel-mkl-tool = { version = "0.8.0-rc.0", path = "../intel-mkl-tool", default-features = false }
+ocipkg = "0.2.8"
+
+[build-dependencies.intel-mkl-tool]
+path = "../intel-mkl-tool"
+version = "0.8.0"
+default-features = false

intel-mkl-src/build.rs

@@ -66,10 +66,18 @@ fn main() -> Result<()> {
     // where ocipkg download archive is not searched by ld
     // unless user set `LD_LIBRARY_PATH` explictly.
     if cfg.link == LinkType::Static {
-        let _ = ocipkg::link_package(&format!(
-            "ghcr.io/rust-math/rust-mkl/{}:2020.1-2851133947",
-            MKL_CONFIG
-        ));
+        if cfg!(target_os = "linux") {
+            let _ = ocipkg::link_package(&format!(
+                "ghcr.io/rust-math/rust-mkl/linux/{}:2020.1-3038006115",
+                MKL_CONFIG
+            ));
+        }
+        if cfg!(target_os = "windows") {
+            let _ = ocipkg::link_package(&format!(
+                "ghcr.io/rust-math/rust-mkl/windows/{}:2022.0-3038006115",
+                MKL_CONFIG
+            ));
+        }
     }
 
     Ok(())