diff --git a/build.sh b/build.sh
index 8d49d2df1fe..eee3ee512fa 100755
--- a/build.sh
+++ b/build.sh
@@ -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 \
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index fc21c2def4d..c6976410630 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -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
@@ -65,16 +63,6 @@ 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}")
@@ -82,7 +70,7 @@ 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}"
diff --git a/java/pom.xml b/java/pom.xml
index 9402b292cfa..210a0ee9e2d 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -164,8 +164,7 @@
OFF
OFF
- OFF
- ${PER_THREAD_DEFAULT_STREAM}
+ OFF
OFF
ALL
OFF
diff --git a/java/src/main/native/CMakeLists.txt b/java/src/main/native/CMakeLists.txt
index e9cb92a2c43..80be987c3b9 100755
--- a/java/src/main/native/CMakeLists.txt
+++ b/java/src/main/native/CMakeLists.txt
@@ -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}")