Merge pull request #81 from rust-math/rewrite-tool-entry

Re-implement intel-mkl-tool

Author: termoshtt

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

@@ -22,7 +22,7 @@ jobs:
           - mkl-dynamic-ilp64-seq
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/rust-math/intel-mkl-src/mkl-rust:1.56.0
+      image: ghcr.io/rust-math/intel-mkl-src/mkl-rust:1.56.0-1
     steps:
       - uses: actions/checkout@v1
       - uses: actions-rs/cargo@v1

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

@@ -12,8 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - windows-2019
-          - macos-10.15
+          - windows-2022
+          - macos-11
           - ubuntu-22.04
     runs-on: ${{ matrix.os }}
     steps:
@@ -37,23 +37,25 @@ jobs:
           --manifest-path=intel-mkl-tool/Cargo.toml
           --no-default-features
 
-  seek:
+  test_pkg_config:
     strategy:
       fail-fast: false
       matrix:
         image:
           - mkl-rust
           - mkl-ubuntu
-          - mkl-centos
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/rust-math/intel-mkl-src/${{ matrix.image }}:1.56.0
+      image: ghcr.io/rust-math/intel-mkl-src/${{ matrix.image }}:1.56.0-1
     steps:
     - uses: actions/checkout@v1
-    - name: cargo run -- seek
-      uses: actions-rs/cargo@v1
+    - uses: actions-rs/cargo@v1
+      name: Seek /opt/intel
       with:
-        command: run
+        command: test
         args: >
           --manifest-path=intel-mkl-tool/Cargo.toml
-          -- seek
+          pkg_config
+          --
+          --ignored
+          --show-output

.github/workflows/rust.yml

@@ -10,7 +10,7 @@ jobs:
   check-format:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/rust-math/intel-mkl-src/mkl-rust:1.56.0
+      image: ghcr.io/rust-math/intel-mkl-src/mkl-rust:1.56.0-1
     steps:
     - uses: actions/checkout@v1
     - uses: actions-rs/cargo@v1
@@ -21,7 +21,7 @@ jobs:
   clippy:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/rust-math/intel-mkl-src/mkl-rust:1.56.0
+      image: ghcr.io/rust-math/intel-mkl-src/mkl-rust:1.56.0-1
     steps:
     - uses: actions/checkout@v1
     - uses: actions-rs/cargo@v1

intel-mkl-src/build.rs

@@ -24,7 +24,7 @@
 
 use anyhow::{bail, Result};
 use intel_mkl_tool::*;
-use std::{env, path::PathBuf, str::FromStr};
+use std::str::FromStr;
 
 #[cfg(feature = "mkl-static-lp64-iomp")]
 const MKL_CONFIG: &str = "mkl-static-lp64-iomp";
@@ -45,26 +45,9 @@ const MKL_CONFIG: &str = "mkl-dynamic-ilp64-seq";
 
 fn main() -> Result<()> {
     let cfg = Config::from_str(MKL_CONFIG).unwrap();
-
-    // already exists on system
-    if let Ok(entry) = Entry::from_config(cfg) {
-        entry.print_cargo_metadata();
+    if let Ok(lib) = Library::new(cfg) {
+        lib.print_cargo_metadata()?;
         return Ok(());
     }
-
-    // download if not found
-    #[cfg(feature = "download")]
-    {
-        let path = PathBuf::from(env::var("OUT_DIR").unwrap());
-        println!(
-            r#"cargo:warning="Download Intel MKL archive into {}""#,
-            path.display()
-        );
-        cfg.download(path)?;
-        let entry = Entry::from_config(cfg).unwrap(); // must found
-        entry.print_cargo_metadata();
-        return Ok(());
-    }
-
-    bail!("No MKL found, and download flag is off.");
+    bail!("No MKL found");
 }

intel-mkl-tool/Cargo.toml

@@ -7,27 +7,12 @@ rust-version = "1.56.0" # MSRV is introduced
 
 description = "CLI utility for redistributiing Intel(R) MKL"
 repository  = "https://github.com/rust-math/intel-mkl-src"
-keywords    = ["cli"]
+keywords    = []
 license     = "MIT"
 
-[features]
-default = ["cli"]
-cli     = ["structopt"]
-
 [dependencies]
 anyhow = "1.0.58"
-derive_more = "0.99.17"
-dirs = "4.0.0"
-glob = "0.3.0"
-pkg-config = "0.3.25"
-
-# CLI
-structopt = { version = "0.3.26", optional = true }
+walkdir = "2.3.2"
 
 [dev-dependencies]
 paste = "1.0.7"
-
-[[bin]]
-name = "intel-mkl-tool"
-path = "src/cli.rs"
-required-features = ["cli"]