Skip to content

Commit

Permalink
Merge pull request #436 from rongou/test-ptds
Browse files Browse the repository at this point in the history
[REVIEW] enable per-thread default stream in gpu ci build
  • Loading branch information
kkraus14 authored Jul 13, 2020
2 parents 7be3299 + c4c2906 commit 74fdeb4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- PR #391 Add `get_default_resource_type`
- PR #396 Remove deprecated RMM APIs
- PR #425 Add CUDA per-thread default stream support and thread safety to `pool_memory_resource`
- PR #436 Always build and test with per-thread default stream enabled in the GPU CI build

## Improvements

Expand Down
10 changes: 8 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@ ARGS=$*
# script, and that this script resides in the repo dir!
REPODIR=$(cd $(dirname $0); pwd)

VALIDARGS="clean librmm rmm -v -g -n -s -h"
HELP="$0 [clean] [librmm] [rmm] [-v] [-g] [-n] [-s] [-h]
VALIDARGS="clean librmm rmm -v -g -n -s --ptds -h"
HELP="$0 [clean] [librmm] [rmm] [-v] [-g] [-n] [-s] [--ptds] [-h]
clean - remove all existing build artifacts and configuration (start over)
librmm - build and install the librmm C++ code
rmm - build and install the rmm Python package
-v - verbose build mode
-g - build for debug
-n - no install step
-s - statically link against cudart
--ptds - enable per-thread default stream
-h - print this text
default action (no args) is to build and install 'librmm' and 'rmm' targets
Expand All @@ -40,6 +41,7 @@ VERBOSE=""
BUILD_TYPE=Release
INSTALL_TARGET=install
CUDA_STATIC_RUNTIME=OFF
PER_THREAD_DEFAULT_STREAM=OFF
RAN_CMAKE=0

# Set defaults for vars that may not have been defined externally
Expand All @@ -61,6 +63,7 @@ function ensureCMakeRan {
echo "Executing cmake for librmm..."
cmake -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
-DCUDA_STATIC_RUNTIME="${CUDA_STATIC_RUNTIME}" \
-DPER_THREAD_DEFAULT_STREAM="${PER_THREAD_DEFAULT_STREAM}" \
-DCMAKE_CXX11_ABI=ON \
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..
RAN_CMAKE=1
Expand Down Expand Up @@ -96,6 +99,9 @@ fi
if hasArg -s; then
CUDA_STATIC_RUNTIME=ON
fi
if hasArg --ptds; then
PER_THREAD_DEFAULT_STREAM=ON
fi

# If clean given, run it prior to any other steps
if hasArg clean; then
Expand Down
2 changes: 1 addition & 1 deletion ci/gpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ conda list
################################################################################

logger "Build and install librmm and rmm..."
"$WORKSPACE/build.sh" -v clean librmm rmm
"$WORKSPACE/build.sh" -v --ptds clean librmm rmm

################################################################################
# Test - librmm
Expand Down

0 comments on commit 74fdeb4

Please sign in to comment.