Merge remote-tracking branch 'origin/master'

This commit is contained in:
Niko 2025-07-29 17:22:13 -07:00
commit 2cdb117101
No known key found for this signature in database
4 changed files with 33 additions and 7 deletions

View file

@ -35,6 +35,7 @@ metal = []
vulkan = []
force-debug = []
openmp = []
intel-sycl = []
[build-dependencies]
cmake = "0.1"

View file

@ -267,20 +267,39 @@ fn main() {
config.define("GGML_OPENMP", "OFF");
}
if cfg!(feature = "intel-sycl") {
config.define("BUILD_SHARED_LIBS", "ON");
config.define("GGML_SYCL", "ON");
config.define("GGML_SYCL_TARGET", "INTEL");
config.define("CMAKE_C_COMPILER", "icx");
config.define("CMAKE_CXX_COMPILER", "icpx");
}
let destination = config.build();
add_link_search_path(&out.join("build")).unwrap();
println!("cargo:rustc-link-search=native={}", destination.display());
println!("cargo:rustc-link-lib=static=whisper");
println!("cargo:rustc-link-lib=static=ggml");
println!("cargo:rustc-link-lib=static=ggml-base");
println!("cargo:rustc-link-lib=static=ggml-cpu");
if cfg!(feature = "intel-sycl") {
println!("cargo:rustc-link-lib=whisper");
println!("cargo:rustc-link-lib=ggml");
println!("cargo:rustc-link-lib=ggml-base");
println!("cargo:rustc-link-lib=ggml-cpu");
} else {
println!("cargo:rustc-link-lib=static=whisper");
println!("cargo:rustc-link-lib=static=ggml");
println!("cargo:rustc-link-lib=static=ggml-base");
println!("cargo:rustc-link-lib=static=ggml-cpu");
}
if cfg!(target_os = "macos") || cfg!(feature = "openblas") {
println!("cargo:rustc-link-lib=static=ggml-blas");
}
if cfg!(feature = "vulkan") {
println!("cargo:rustc-link-lib=static=ggml-vulkan");
if cfg!(feature = "intel-sycl") {
println!("cargo:rustc-link-lib=ggml-vulkan");
} else {
println!("cargo:rustc-link-lib=static=ggml-vulkan");
}
}
if cfg!(feature = "hipblas") {
@ -299,6 +318,10 @@ fn main() {
println!("cargo:rustc-link-lib=static=ggml-blas");
}
if cfg!(feature = "intel-sycl") {
println!("cargo:rustc-link-lib=ggml-sycl");
}
println!(
"cargo:WHISPER_CPP_VERSION={}",
get_whisper_cpp_version(&whisper_root)