From 36aa876833c2c6d71c585593e9e93426daf671b4 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 21 Jun 2019 12:08:10 -0700 Subject: [PATCH] Avoid linking with CUDA directly --- ci/test-stable.sh | 5 +++-- core/build.rs | 9 --------- fetch-perf-libs.sh | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/ci/test-stable.sh b/ci/test-stable.sh index 035a26750..7e333961b 100755 --- a/ci/test-stable.sh +++ b/ci/test-stable.sh @@ -42,8 +42,9 @@ test-stable-perf) .rs$ \ Cargo.lock$ \ Cargo.toml$ \ - ci/test-stable-perf.sh \ - ci/test-stable.sh \ + ^ci/test-stable-perf.sh \ + ^ci/test-stable.sh \ + ^core/build.rs \ ^fetch-perf-libs.sh \ ^programs/ \ ^sdk/ \ diff --git a/core/build.rs b/core/build.rs index 433063dcd..aa3851044 100644 --- a/core/build.rs +++ b/core/build.rs @@ -41,14 +41,5 @@ fn main() { } else { println!("cargo:rerun-if-changed={}/libcuda-crypt.so", perf_libs_dir); } - - let cuda_home = match env::var("CUDA_HOME") { - Ok(cuda_home) => cuda_home, - Err(_) => String::from("/usr/local/cuda"), - }; - println!("cargo:rustc-link-search=native={}/lib64", cuda_home); - println!("cargo:rustc-link-lib=dylib=cudart"); - println!("cargo:rustc-link-lib=dylib=cuda"); - println!("cargo:rustc-link-lib=dylib=cudadevrt"); } } diff --git a/fetch-perf-libs.sh b/fetch-perf-libs.sh index 5a9f3793e..868f7acac 100755 --- a/fetch-perf-libs.sh +++ b/fetch-perf-libs.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PERF_LIBS_VERSION=v0.14.0 +PERF_LIBS_VERSION=v0.14.1 set -e cd "$(dirname "$0")"