Skip to content

Drop failure from intel-mkl-src #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2019
Merged

Drop failure from intel-mkl-src #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions intel-mkl-src/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ exclude = ["mkl_lib/mkl.tar.xz"]
default = []
use-shared = []

[build-dependencies]
failure = "0.1"

[build-dependencies.intel-mkl-tool]
version = "0.1.0"
path = "../intel-mkl-tool"
Expand Down
8 changes: 3 additions & 5 deletions intel-mkl-src/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,23 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.

use failure::*;
use std::{env, path::*};

fn main() -> Fallible<()> {
fn main() {
let out_dir = if let Some(path) = intel_mkl_tool::seek_pkg_config() {
path
} else {
let out_dir = if cfg!(feature = "use-shared") {
intel_mkl_tool::home_library_path()
} else {
PathBuf::from(env::var("OUT_DIR").unwrap())
PathBuf::from(env::var("OUT_DIR").expect("Failed to get OUT_DIR"))
};

intel_mkl_tool::download(&out_dir)?;
intel_mkl_tool::download(&out_dir).expect("Failed to downalod Intel-MKL archive");
out_dir
};
println!("cargo:rustc-link-search={}", out_dir.display());
println!("cargo:rustc-link-lib=mkl_intel_lp64");
println!("cargo:rustc-link-lib=mkl_sequential");
println!("cargo:rustc-link-lib=mkl_core");
Ok(())
}