Skip to content

Commit 2cb7be3

Browse files
authored
Set flag to always use unsafe atomic storage (#18590)
Closes #18587 This PR sets `_LIBCUDACXX_ATOMIC_UNSAFE_AUTOMATIC_STORAGE` as a workaround for NVIDIA/cccl#4586. This will unblock Spark-RAPIDS CI. Authors: - Yunsong Wang (https://github.com/PointKernel) Approvers: - Bradley Dice (https://github.com/bdice) - Jihoon Son (https://github.com/jihoonson) - Nghia Truong (https://github.com/ttnghia) URL: #18590
1 parent 33444ba commit 2cb7be3

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

cpp/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,11 @@ target_compile_definitions(cudf PRIVATE $<$<BOOL:${CUDF_KVIKIO_REMOTE_IO}>:CUDF_
939939

940940
# Remove this after upgrading to a CCCL that has a proper CMake option. See
941941
# https://github.com/NVIDIA/cccl/pull/2844
942-
target_compile_definitions(cudf PRIVATE THRUST_FORCE_32_BIT_OFFSET_TYPE=1 CCCL_AVOID_SORT_UNROLL=1)
942+
target_compile_definitions(
943+
cudf
944+
PUBLIC _LIBCUDACXX_ATOMIC_UNSAFE_AUTOMATIC_STORAGE=1
945+
PRIVATE THRUST_FORCE_32_BIT_OFFSET_TYPE=1 CCCL_AVOID_SORT_UNROLL=1
946+
)
943947

944948
# Compile stringified JIT sources first
945949
add_dependencies(cudf jitify_preprocess_run)

cpp/benchmarks/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ function(ConfigureBench CMAKE_BENCH_NAME)
9898
CUDA_STANDARD_REQUIRED ON
9999
)
100100
target_compile_definitions(
101-
${CMAKE_BENCH_NAME} PRIVATE THRUST_FORCE_32_BIT_OFFSET_TYPE=1 CCCL_AVOID_SORT_UNROLL=1
101+
${CMAKE_BENCH_NAME}
102+
PUBLIC _LIBCUDACXX_ATOMIC_UNSAFE_AUTOMATIC_STORAGE=1
103+
PRIVATE THRUST_FORCE_32_BIT_OFFSET_TYPE=1 CCCL_AVOID_SORT_UNROLL=1
102104
)
103105
target_link_libraries(
104106
${CMAKE_BENCH_NAME} PRIVATE cudf_benchmark_common cudf_datagen benchmark::benchmark_main

cpp/tests/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ function(ConfigureTest CMAKE_TEST_NAME)
5959
)
6060

6161
target_compile_definitions(
62-
${CMAKE_TEST_NAME} PRIVATE THRUST_FORCE_32_BIT_OFFSET_TYPE=1 CCCL_AVOID_SORT_UNROLL=1
62+
${CMAKE_TEST_NAME}
63+
PUBLIC _LIBCUDACXX_ATOMIC_UNSAFE_AUTOMATIC_STORAGE=1
64+
PRIVATE THRUST_FORCE_32_BIT_OFFSET_TYPE=1 CCCL_AVOID_SORT_UNROLL=1
6365
)
6466

6567
target_link_libraries(

0 commit comments

Comments
 (0)