Skip to content

resolve osx build error with opencl and fix f77 issue #32

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
Sep 17, 2015
Merged

resolve osx build error with opencl and fix f77 issue #32

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
6 changes: 4 additions & 2 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ fn run_cmake_command(conf: &Config, build_dir: &std::path::PathBuf) {
_ => fail("Invalid FFT upstream option set"),
};
match conf.cpu_blas_type.as_ref() {
"LAPACKE" => { blas_options.push(format!("-DUSE_CPU_F77_BLAS:BOOL={}", "ON")); },
"LAPACKE" => { blas_options.push(format!("-DUSE_CPU_F77_BLAS:BOOL={}", "OFF")); },
"MKL" => { blas_options.push(format!("-DUSE_CPU_MKL:BOOL={}", "ON")); },
_ => fail("Invalid BLAS upstream option set"),
};
Expand Down Expand Up @@ -356,7 +356,9 @@ fn blob_backends(conf: &Config, build_dir: &std::path::PathBuf) -> (Vec<String>,
}
} else if conf.use_backend == "opencl" {
backends.push(("afopencl".to_string()));
backends.push("OpenCL".to_string());
if ! cfg!(target_os = "macos"){
backends.push("OpenCL".to_string());
}
if cfg!(windows) {
backend_dirs.push(format!("{}\\lib\\x64", conf.opencl_sdk));
} else {
Expand Down