Skip to content

Commit cd58bea

Browse files
authored
Merge branch 'release/26.08' into fix-orc-non-utc-correctness
2 parents ea81bea + 4e48daf commit cd58bea

4 files changed

Lines changed: 30 additions & 8 deletions

File tree

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/java/src/main/java/ai/rapids/cudf/NativeDepsLoader.java b/java/src/main/java/ai/rapids/cudf/NativeDepsLoader.java
2+
index 0ab9ec79d1..3d42449128 100755
3+
--- a/java/src/main/java/ai/rapids/cudf/NativeDepsLoader.java
4+
+++ b/java/src/main/java/ai/rapids/cudf/NativeDepsLoader.java
5+
@@ -69,9 +69,6 @@ public class NativeDepsLoader {
6+
* subsequent stages are loaded.
7+
*/
8+
private static final String[][] loadOrder = new String[][]{
9+
- new String[]{
10+
- "nvcomp"
11+
- },
12+
new String[]{
13+
"cudf"
14+
},

patches/noop.patch

Whitespace-only changes.

pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -570,14 +570,6 @@
570570
<include>libprofilerjni.so</include>
571571
</includes>
572572
</resource>
573-
<resource>
574-
<directory>${libcudfjni.build.path}</directory>
575-
<includes>
576-
<include>libnvcomp.so</include>
577-
<include>libnvcomp_gdeflate.so</include>
578-
<include>libnvcomp_bitcomp.so</include>
579-
</includes>
580-
</resource>
581573
</resources>
582574
</configuration>
583575
</execution>

src/main/cpp/CMakeLists.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ option(BUILD_TESTS "Configure CMake to build tests" OFF)
6262
option(BUILD_BENCHMARKS "Configure CMake to build (google) benchmarks" OFF)
6363
option(BUILD_FAULTINJ "Configure CMake to build fault injection" ON)
6464
option(BUILD_PROFILER "Configure CMake to build profiler" ON)
65+
option(HIDE_PRIVATE_CUDA_SYMBOLS "Hide private symbols from static CUDA compiler libraries" ON)
6566

6667
message(
6768
VERBOSE "SPARK_RAPIDS_JNI: Build with per-thread default stream:
@@ -70,6 +71,9 @@ message(
7071
message(VERBOSE "SPARK_RAPIDS_JNI: Configure CMake to build tests: ${BUILD_TESTS}")
7172
message(VERBOSE "SPARK_RAPIDS_JNI: Configure CMake to build (nvbench) benchmarks: ${BUILD_BENCHMARKS}")
7273
message(VERBOSE "SPARK_RAPIDS_JNI: Configure CMake to build fault injection: ${BUILD_FAULTINJ}")
74+
message(VERBOSE
75+
"SPARK_RAPIDS_JNI: Hide private static CUDA compiler symbols: ${HIDE_PRIVATE_CUDA_SYMBOLS}"
76+
)
7377

7478
set(SPARK_RAPIDS_JNI_BUILD_TESTS ${BUILD_TESTS})
7579
set(SPARK_RAPIDS_JNI_BUILD_BENCHMARKS ${BUILD_BENCHMARKS})
@@ -349,6 +353,18 @@ target_link_libraries(
349353
${PARQUET_LIB}
350354
${THRIFT_LIB}
351355
)
356+
if(HIDE_PRIVATE_CUDA_SYMBOLS)
357+
# These toolkit implementation symbols are not part of the cuDF or JNI ABI. Localizing them keeps
358+
# the regular ELF symbol table for diagnostics while removing them from the dynamic export table.
359+
target_link_options(
360+
spark_rapids_jni
361+
PRIVATE "LINKER:--exclude-libs,libnvrtc_static.a"
362+
"LINKER:--exclude-libs,libnvrtc-builtins_static.a"
363+
"LINKER:--exclude-libs,libnvptxcompiler_static.a"
364+
"LINKER:--exclude-libs,libnvJitLink_static.a"
365+
"LINKER:--exclude-libs,libnvcomp_static.a"
366+
)
367+
endif()
352368
rapids_cuda_set_runtime(spark_rapids_jni USE_STATIC ON)
353369
set_target_properties(spark_rapids_jni PROPERTIES LINK_LANGUAGE "CXX")
354370
# For backwards-compatibility with the cudf Java bindings and RAPIDS accelerated UDFs,

0 commit comments

Comments
 (0)