Skip to content

Commit

Permalink
Remove deprecated PER_THREAD_DEFAULT_STREAM (#11134)
Browse files Browse the repository at this point in the history
Closes #10862.

The `PER_THREAD_DEFAULT_STREAM` build option was deprecated in branch-22.06 via #10877, and replaced with the new build option `CUDF_USE_PER_THREAD_DEFAULT_STREAM`.

This PR removes `PER_THREAD_DEFAULT_STREAM`.

I am putting this up as a draft because I am not certain if we want to do this in 22.08 or wait for a later release?

Authors:
  - Jim Brennan (https://github.com/jbrennan333)

Approvers:
  - Jason Lowe (https://github.com/jlowe)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #11134
  • Loading branch information
jbrennan333 authored Jun 23, 2022
1 parent 0e08022 commit 4014a65
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 28 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ function buildLibCudfJniInDocker {
-DCMAKE_CXX_LINKER_LAUNCHER=ccache' \
-DCUDF_CPP_BUILD_DIR=$workspaceRepoDir/java/target/libcudf-cmake-build \
-DCUDA_STATIC_RUNTIME=ON \
-DPER_THREAD_DEFAULT_STREAM=ON \
-DCUDF_USE_PER_THREAD_DEFAULT_STREAM=ON \
-DUSE_GDS=ON \
-DGPU_ARCHS=${CUDF_CMAKE_CUDA_ARCHITECTURES} \
-DCUDF_JNI_LIBCUDF_STATIC=ON \
Expand Down
14 changes: 1 addition & 13 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ option(
stream to external libraries."
OFF
)
option(PER_THREAD_DEFAULT_STREAM "[DEPRECATED] Build with per-thread default stream" OFF)
mark_as_advanced(FORCE, PER_THREAD_DEFAULT_STREAM)
option(DISABLE_DEPRECATION_WARNING "Disable warnings generated from deprecated declarations." OFF)
# Option to enable line info in CUDA device compilation to allow introspection when profiling /
# memchecking
Expand All @@ -65,24 +63,14 @@ option(CUDA_ENABLE_LINEINFO
# cudart can be statically linked or dynamically linked. The python ecosystem wants dynamic linking
option(CUDA_STATIC_RUNTIME "Statically link the CUDA runtime" OFF)

# PER_THREAD_DEFAULT_STREAM will be replaced with CUDF_USE_PER_THREAD_DEFAULT_STREAM
if(PER_THREAD_DEFAULT_STREAM)
set(CUDF_USE_PER_THREAD_DEFAULT_STREAM ON)
message(
DEPRECATION
"CUDF: PER_THREAD_DEFAULT_STREAM is deprecated, and will be removed in a future release,
please use CUDF_USE_PER_THREAD_DEFAULT_STREAM instead."
)
endif()

message(VERBOSE "CUDF: Build with NVTX support: ${USE_NVTX}")
message(VERBOSE "CUDF: Configure CMake to build tests: ${BUILD_TESTS}")
message(VERBOSE "CUDF: Configure CMake to build (google & nvbench) benchmarks: ${BUILD_BENCHMARKS}")
message(VERBOSE "CUDF: Build cuDF shared libraries: ${BUILD_SHARED_LIBS}")
message(VERBOSE "CUDF: Use a file cache for JIT compiled kernels: ${JITIFY_USE_CACHE}")
message(VERBOSE "CUDF: Build and statically link Arrow libraries: ${CUDF_USE_ARROW_STATIC}")
message(VERBOSE "CUDF: Build and enable S3 filesystem support for Arrow: ${CUDF_ENABLE_ARROW_S3}")
message(VERBOSE "CUDF: Build with per-thread default stream: ${CUDF_PER_THREAD_DEFAULT_STREAM}")
message(VERBOSE "CUDF: Build with per-thread default stream: ${CUDF_USE_PER_THREAD_DEFAULT_STREAM}")
message(
VERBOSE
"CUDF: Disable warnings generated from deprecated declarations: ${DISABLE_DEPRECATION_WARNING}"
Expand Down
3 changes: 1 addition & 2 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,7 @@
<cxx.flags/>
<CMAKE_EXPORT_COMPILE_COMMANDS>OFF</CMAKE_EXPORT_COMPILE_COMMANDS>
<CUDA_STATIC_RUNTIME>OFF</CUDA_STATIC_RUNTIME>
<PER_THREAD_DEFAULT_STREAM>OFF</PER_THREAD_DEFAULT_STREAM>
<CUDF_USE_PER_THREAD_DEFAULT_STREAM>${PER_THREAD_DEFAULT_STREAM}</CUDF_USE_PER_THREAD_DEFAULT_STREAM>
<CUDF_USE_PER_THREAD_DEFAULT_STREAM>OFF</CUDF_USE_PER_THREAD_DEFAULT_STREAM>
<USE_GDS>OFF</USE_GDS>
<GPU_ARCHS>ALL</GPU_ARCHS>
<CUDF_JNI_LIBCUDF_STATIC>OFF</CUDF_JNI_LIBCUDF_STATIC>
Expand Down
12 changes: 0 additions & 12 deletions java/src/main/native/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,11 @@ project(
option(USE_NVTX "Build with NVTX support" ON)
option(BUILD_SHARED_LIBS "Build cuDF JNI shared libraries" ON)
option(BUILD_TESTS "Configure CMake to build tests" ON)
option(PER_THREAD_DEFAULT_STREAM "[DEPRECATED] Build with per-thread default stream" OFF)
mark_as_advanced(FORCE, PER_THREAD_DEFAULT_STREAM)
option(CUDF_USE_PER_THREAD_DEFAULT_STREAM "Build with per-thread default stream" OFF)
option(CUDA_STATIC_RUNTIME "Statically link the CUDA runtime" OFF)
option(USE_GDS "Build with GPUDirect Storage (GDS)/cuFile support" OFF)
option(CUDF_JNI_LIBCUDF_STATIC "Link with libcudf.a" OFF)

# PER_THREAD_DEFAULT_STREAM will be replaced with CUDF_USE_PER_THREAD_DEFAULT_STREAM
if(PER_THREAD_DEFAULT_STREAM)
set(CUDF_USE_PER_THREAD_DEFAULT_STREAM ON)
message(
DEPRECATION
"CUDF: PER_THREAD_DEFAULT_STREAM is deprecated, and will be removed in a future release,
please use CUDF_USE_PER_THREAD_DEFAULT_STREAM instead."
)
endif()

message(VERBOSE "CUDF_JNI: Build with NVTX support: ${USE_NVTX}")
message(VERBOSE "CUDF_JNI: Build cuDF JNI shared libraries: ${BUILD_SHARED_LIBS}")
message(VERBOSE "CUDF_JNI: Configure CMake to build tests: ${BUILD_TESTS}")
Expand Down

0 comments on commit 4014a65

Please sign in to comment.