From e8a8271352f00c1283c9c6376beffe39e28ab71c Mon Sep 17 00:00:00 2001
From: Rong Ou <rong.ou@gmail.com>
Date: Fri, 10 Jul 2020 16:54:59 -0700
Subject: [PATCH 1/2] enable per-thread default stream in gpu ci

---
 build.sh        | 8 +++++++-
 ci/gpu/build.sh | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index e6b7d6f8447..d5d9ccb6d68 100755
--- a/build.sh
+++ b/build.sh
@@ -17,7 +17,7 @@ ARGS=$*
 # script, and that this script resides in the repo dir!
 REPODIR=$(cd $(dirname $0); pwd)
 
-VALIDARGS="clean libcudf cudf dask_cudf benchmarks tests libcudf_kafka -v -g -n -l --allgpuarch --disable_nvtx --show_depr_warn -h"
+VALIDARGS="clean libcudf cudf dask_cudf benchmarks tests libcudf_kafka -v -g -n -l --allgpuarch --disable_nvtx --show_depr_warn --ptds -h"
 HELP="$0 [clean] [libcudf] [cudf] [dask_cudf] [benchmarks] [tests] [libcudf_kafka] [-v] [-g] [-n] [-h] [-l]
    clean                - remove all existing build artifacts and configuration (start
                           over)
@@ -34,6 +34,7 @@ HELP="$0 [clean] [libcudf] [cudf] [dask_cudf] [benchmarks] [tests] [libcudf_kafk
    --allgpuarch         - build for all supported GPU architectures
    --disable_nvtx       - disable inserting NVTX profiling ranges
    --show_depr_warn     - show cmake deprecation warnings
+   --ptds               - enable per-thread default stream
    -h                   - print this text
 
    default action (no args) is to build and install 'libcudf' then 'cudf'
@@ -53,6 +54,7 @@ BUILD_ALL_GPU_ARCH=0
 BUILD_NVTX=ON
 BUILD_TESTS=OFF
 BUILD_DISABLE_DEPRECATION_WARNING=ON
+BUILD_PER_THREAD_DEFAULT_STREAM=OFF
 BUILD_LIBCUDF_KAFKA=OFF
 
 # Set defaults for vars that may not have been defined externally
@@ -110,6 +112,9 @@ fi
 if hasArg --show_depr_warn; then
     BUILD_DISABLE_DEPRECATION_WARNING=OFF
 fi
+if hasArg --ptds; then
+    BUILD_PER_THREAD_DEFAULT_STREAM=ON
+fi
 if hasArg libcudf_kafka; then
     BUILD_LIBCUDF_KAFKA=ON
 fi
@@ -148,6 +153,7 @@ if buildAll || hasArg libcudf || hasArg libcudf_kafka; then
           -DUSE_NVTX=${BUILD_NVTX} \
           -DBUILD_BENCHMARKS=${BUILD_BENCHMARKS} \
           -DDISABLE_DEPRECATION_WARNING=${BUILD_DISABLE_DEPRECATION_WARNING} \
+          -DPER_THREAD_DEFAULT_STREAM=${BUILD_PER_THREAD_DEFAULT_STREAM} \
           -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
           -DBUILD_CUDF_KAFKA=${BUILD_LIBCUDF_KAFKA} $REPODIR/cpp
 fi
diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh
index 461f35cc0bc..9a3c17c7b31 100755
--- a/ci/gpu/build.sh
+++ b/ci/gpu/build.sh
@@ -92,9 +92,9 @@ conda list
 
 logger "Build libcudf..."
 if [[ ${BUILD_MODE} == "pull-request" ]]; then
-    $WORKSPACE/build.sh clean libcudf cudf dask_cudf benchmarks tests
+    $WORKSPACE/build.sh clean libcudf cudf dask_cudf benchmarks tests --ptds
 else
-    $WORKSPACE/build.sh clean libcudf cudf dask_cudf benchmarks tests -l
+    $WORKSPACE/build.sh clean libcudf cudf dask_cudf benchmarks tests -l --ptds
 fi
 
 ################################################################################

From 9b8b4620a2766c78dc52893da146d47f4b9282ad Mon Sep 17 00:00:00 2001
From: Rong Ou <rong.ou@gmail.com>
Date: Fri, 10 Jul 2020 16:57:47 -0700
Subject: [PATCH 2/2] add to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b356298816..c758ced8ce8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
 - PR #5612 Add `is_hex` strings API
 - PR #5637 Parameterize Null comparator behaviour in Joins
 - PR #5623 Add `is_ipv4` strings API
+- PR #5673 Always build and test with per-thread default stream enabled in the GPU CI build
 
 ## Improvements