This is an automated email from the ASF dual-hosted git repository.
paleolimbot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sedona-db.git
The following commit(s) were added to refs/heads/main by this push:
new 4fcf9edf feat(c/sedona-libgpuspatial): Improve building robustness
(#719)
4fcf9edf is described below
commit 4fcf9edf81fe5010a3b51475c243f155942e5541
Author: Liang Geng <[email protected]>
AuthorDate: Wed Mar 18 12:16:17 2026 +0800
feat(c/sedona-libgpuspatial): Improve building robustness (#719)
---
c/sedona-libgpuspatial/build.rs | 55 ++++++++++++++++++++++++++++++++---------
1 file changed, 43 insertions(+), 12 deletions(-)
diff --git a/c/sedona-libgpuspatial/build.rs b/c/sedona-libgpuspatial/build.rs
index dacaacce..cd9d3a19 100644
--- a/c/sedona-libgpuspatial/build.rs
+++ b/c/sedona-libgpuspatial/build.rs
@@ -24,6 +24,7 @@ fn find_cuda_driver_path() -> Option<PathBuf> {
"/usr/lib/x86_64-linux-gnu",
"/usr/lib64/nvidia",
"/usr/local/cuda/lib64",
+ "/lib64",
];
for path_str in default_paths {
let path = Path::new(path_str);
@@ -133,24 +134,54 @@ fn main() {
.define("SPDLOG_FMT_EXTERNAL", "OFF") // Prevent spdlog from using
external fmt library
.build();
let include_path = dst.join("include");
- println!(
- "cargo:rustc-link-search=native={}",
- dst.join("lib").display()
- ); // Link to the cmake output lib directory
+ let lib_dir = dst.join("lib");
+ let lib64_dir = dst.join("lib64");
+
+ if lib_dir.exists() {
+ println!("cargo:rustc-link-search=native={}", lib_dir.display());
+ }
+ if lib64_dir.exists() {
+ println!("cargo:rustc-link-search=native={}", lib64_dir.display());
+ }
// Link to the static libraries and CUDA runtime
println!("cargo:rustc-link-search=native={}/build", dst.display()); //
gpuspatial_c defined in CMakeLists.txt
// Detect CUDA library path from CUDA_HOME or default locations
- let cuda_lib_path = if let Ok(cuda_home) = env::var("CUDA_HOME") {
- format!("{cuda_home}/lib64")
- } else if std::path::Path::new("/usr/local/cuda/lib64").exists() {
- "/usr/local/cuda/lib64".to_string()
- } else {
- panic!("CUDA lib is not found. Neither CUDA_HOME is set nor the
default path /usr/local/cuda/lib64 exists.");
- };
+ let mut cuda_lib_paths = Vec::new();
+
+ // 1. Check CUDA_HOME for both lib and lib64
+ if let Ok(cuda_home) = env::var("CUDA_HOME") {
+ let home_path = PathBuf::from(cuda_home);
+ let check_lib64 = home_path.join("lib64");
+ let check_lib = home_path.join("lib");
+
+ if check_lib64.exists() {
+ cuda_lib_paths.push(check_lib64);
+ }
+ if check_lib.exists() {
+ cuda_lib_paths.push(check_lib);
+ }
+ }
+
+ // 2. If nothing found in CUDA_HOME (or it wasn't set), check standard
fallback locations
+ if cuda_lib_paths.is_empty() {
+ if Path::new("/usr/local/cuda/lib64").exists() {
+ cuda_lib_paths.push(PathBuf::from("/usr/local/cuda/lib64"));
+ } else if Path::new("/usr/local/cuda/lib").exists() {
+ cuda_lib_paths.push(PathBuf::from("/usr/local/cuda/lib"));
+ } else {
+ panic!(
+ "CUDA lib is not found. Neither CUDA_HOME is set nor the
default paths exist."
+ );
+ }
+ }
- println!("cargo:rustc-link-search=native={cuda_lib_path}"); // CUDA
runtime
+ // 3. Apply all found paths for linking and runtime path (rpath)
+ for path in cuda_lib_paths {
+ println!("cargo:rustc-link-search=native={}", path.display());
+ println!("cargo:rustc-link-arg=-Wl,-rpath,{}", path.display());
+ }
if let Some(driver_lib_path) = find_cuda_driver_path() {
println!(
