Remove default feature, use mkl-static-ilp64-iomp if no features

Author: termoshtt

intel-mkl-src/Cargo.toml

@@ -16,7 +16,7 @@ build = "build.rs"
 links = "mkl_core"
 
 [features]
-default = ["mkl-static-ilp64-seq"]
+default = []
 
 # MKL config
 # https://software.intel.com/content/www/us/en/develop/articles/intel-math-kernel-library-intel-mkl-and-pkg-config-tool.html

intel-mkl-src/build.rs

@@ -24,22 +24,34 @@ use anyhow::{bail, Result};
 use intel_mkl_tool::*;
 use std::str::FromStr;
 
-#[cfg(feature = "mkl-static-lp64-iomp")]
-const MKL_CONFIG: &str = "mkl-static-lp64-iomp";
-#[cfg(feature = "mkl-static-lp64-seq")]
-const MKL_CONFIG: &str = "mkl-static-lp64-seq";
-#[cfg(feature = "mkl-static-ilp64-iomp")]
+macro_rules! def_mkl_config {
+    ($cfg:literal) => {
+        #[cfg(feature = $cfg)]
+        const MKL_CONFIG: &str = $cfg;
+    };
+}
+
+def_mkl_config!("mkl-static-lp64-iomp");
+def_mkl_config!("mkl-static-lp64-seq");
+def_mkl_config!("mkl-static-ilp64-iomp");
+def_mkl_config!("mkl-static-ilp64-seq");
+def_mkl_config!("mkl-dynamic-lp64-iomp");
+def_mkl_config!("mkl-dynamic-lp64-seq");
+def_mkl_config!("mkl-dynamic-ilp64-iomp");
+def_mkl_config!("mkl-dynamic-ilp64-seq");
+
+// Default value
+#[cfg(all(
+    not(feature = "mkl-static-lp64-iomp"),
+    not(feature = "mkl-static-lp64-seq"),
+    not(feature = "mkl-static-ilp64-iomp"),
+    not(feature = "mkl-static-ilp64-seq"),
+    not(feature = "mkl-dynamic-lp64-iomp"),
+    not(feature = "mkl-dynamic-lp64-seq"),
+    not(feature = "mkl-dynamic-ilp64-iomp"),
+    not(feature = "mkl-dynamic-ilp64-seq"),
+))]
 const MKL_CONFIG: &str = "mkl-static-ilp64-iomp";
-#[cfg(feature = "mkl-static-ilp64-seq")]
-const MKL_CONFIG: &str = "mkl-static-ilp64-seq";
-#[cfg(feature = "mkl-dynamic-lp64-iomp")]
-const MKL_CONFIG: &str = "mkl-dynamic-lp64-iomp";
-#[cfg(feature = "mkl-dynamic-lp64-seq")]
-const MKL_CONFIG: &str = "mkl-dynamic-lp64-seq";
-#[cfg(feature = "mkl-dynamic-ilp64-iomp")]
-const MKL_CONFIG: &str = "mkl-dynamic-ilp64-iomp";
-#[cfg(feature = "mkl-dynamic-ilp64-seq")]
-const MKL_CONFIG: &str = "mkl-dynamic-ilp64-seq";
 
 fn main() -> Result<()> {
     let cfg = Config::from_str(MKL_CONFIG).unwrap();

intel-mkl-sys/Cargo.toml

@@ -12,7 +12,7 @@ keywords    = ["ffi"]
 license     = "MIT"
 
 [features]
-default = ["mkl-static-ilp64-seq"]
+default = []
 
 # MKL config
 # https://software.intel.com/content/www/us/en/develop/articles/intel-math-kernel-library-intel-mkl-and-pkg-config-tool.html