Seek also from XDG_DATA_HOME/intel-mkl-tool

Author: termoshtt

intel-mkl-tool/src/bin/intel-mkl-tool.rs

@@ -5,7 +5,16 @@ use structopt::StructOpt;
 /// CLI tool for intel-mkl crate
 #[derive(Debug, StructOpt)]
 enum Opt {
-    Download { path: Option<PathBuf> },
+    /// Download Intel-MKL library
+    Download {
+        /// Install destination. Default is `$XDG_DATA_HOME/intel-mkl-tool`
+        path: Option<PathBuf>,
+    },
+    /// Seek Intel-MKL library
+    ///
+    /// 1. pkg-config
+    /// 2. `$XDG_DATA_HOME/intel-mkl-tool`
+    /// will be sought.
     Seek {},
 }
 
@@ -20,14 +29,13 @@ fn main() -> Fallible<()> {
             let path = if let Some(path) = path {
                 path
             } else {
-                let data_dir = dirs::data_local_dir().unwrap();
-                data_dir.join("intel-mkl-tool")
+                intel_mkl_tool::home_library_path()
             };
             intel_mkl_tool::download(&path)?;
         }
         Opt::Seek {} => {
-            let paths = intel_mkl_tool::seek_pkg_config()?;
-            println!("{:?}", paths);
+            let paths = intel_mkl_tool::seek().ok_or(err_msg("MKL not found"))?;
+            println!("{}", paths.display());
         }
     }
     Ok(())

intel-mkl-tool/src/lib.rs

@@ -34,9 +34,25 @@ pub fn home_library_path() -> PathBuf {
     dirs::data_local_dir().unwrap().join("intel-mkl-tool")
 }
 
-/// Seek MKL library from pkg-config
-pub fn seek_pkg_config() -> Fallible<pkg_config::Library> {
-    Ok(pkg_config::probe_library("mkl-dynamic-lp64-iomp")?)
+/// Seek MKL library from
+///
+/// 1. pkg-config
+/// 2. `$XDG_DATA_HOME/intel-mkl-tool`
+///
+/// returns `None` if not found.
+///
+pub fn seek() -> Option<PathBuf> {
+    if let Ok(lib) = pkg_config::probe_library("mkl-dynamic-lp64-iomp") {
+        if lib.libs.len() > 1 {
+            warn!("Found {} MKL libraries. Use first found.", lib.libs.len())
+        }
+        return Some(PathBuf::from(lib.libs[0].clone()));
+    }
+    let home_lib = home_library_path();
+    if home_lib.is_dir() {
+        return Some(home_lib);
+    }
+    None
 }
 
 pub fn download(out_dir: &Path) -> Fallible<()> {
@@ -59,7 +75,7 @@ pub fn download(out_dir: &Path) -> Fallible<()> {
         easy.perform()?;
         assert!(archive.exists());
     } else {
-        info!("Use existing archive: {}", archive.display());
+        info!("Archive already exists: {}", archive.display());
     }
 
     let core = out_dir.join(format!("{}mkl_core.{}", mkl::PREFIX, mkl::EXT));