From d5f40ec0e6dc6badc710581b0069425da022f2c9 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Fri, 6 Aug 2021 12:10:49 -0700 Subject: [PATCH 01/14] ENH Allow arbitrary CMake configurations arguments to be used --- build.sh | 60 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/build.sh b/build.sh index 70b93427d5c..67c7e3a0b71 100755 --- a/build.sh +++ b/build.sh @@ -18,26 +18,27 @@ ARGS=$* REPODIR=$(cd $(dirname $0); pwd) VALIDARGS="clean libcudf cudf dask_cudf benchmarks tests libcudf_kafka cudf_kafka custreamz -v -g -n -l --allgpuarch --disable_nvtx --show_depr_warn --ptds -h" -HELP="$0 [clean] [libcudf] [cudf] [dask_cudf] [benchmarks] [tests] [libcudf_kafka] [cudf_kafka] [custreamz] [-v] [-g] [-n] [-h] [-l] - clean - remove all existing build artifacts and configuration (start - over) - libcudf - build the cudf C++ code only - cudf - build the cudf Python package - dask_cudf - build the dask_cudf Python package - benchmarks - build benchmarks - tests - build tests - libcudf_kafka - build the libcudf_kafka C++ code only - cudf_kafka - build the cudf_kafka Python package - custreamz - build the custreamz Python package - -v - verbose build mode - -g - build for debug - -n - no install step - -l - build legacy tests - --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 | --h[elp] - print this text +HELP="$0 [clean] [libcudf] [cudf] [dask_cudf] [benchmarks] [tests] [libcudf_kafka] [cudf_kafka] [custreamz] [-v] [-g] [-n] [-h] [-l] [--cmake-args=\"\"] + clean - remove all existing build artifacts and configuration (start + over) + libcudf - build the cudf C++ code only + cudf - build the cudf Python package + dask_cudf - build the dask_cudf Python package + benchmarks - build benchmarks + tests - build tests + libcudf_kafka - build the libcudf_kafka C++ code only + cudf_kafka - build the cudf_kafka Python package + custreamz - build the custreamz Python package + -v - verbose build mode + -g - build for debug + -n - no install step + -l - build legacy tests + --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 + --cmake-args=\"\" - pass arbitrary list of CMake configuration options + -h | --h[elp] - print this text default action (no args) is to build and install 'libcudf' then 'cudf' then 'dask_cudf' targets @@ -71,6 +72,18 @@ function hasArg { (( ${NUMARGS} != 0 )) && (echo " ${ARGS} " | grep -q " $1 ") } +function cmakeArgs { + # Check for correctly formatted cmake args option + CMAKE_ARGS=$(echo $ARGS | grep -Eo "\-\-cmake\-args=\".+\" ") + + if [[ -n ${CMAKE_ARGS} ]]; then + # Remove the full CMAKE_ARGS argument from list of args so that it passes validArgs function + ARGS=${ARGS//$CMAKE_ARGS/} + # Filter the full argument down to just the extra string that will be added to cmake call + CMAKE_ARGS=$(echo $CMAKE_ARGS | grep -Eo "\".+\"" | sed -e 's/^"//' -e 's/"$//') + fi +} + function buildAll { ((${NUMARGS} == 0 )) || !(echo " ${ARGS} " | grep -q " [^-]\+ ") } @@ -80,6 +93,9 @@ if hasArg -h || hasArg --h || hasArg --help; then exit 0 fi +# Check for additional arbitrary cmake options +cmakeArgs + # Check for valid usage if (( ${NUMARGS} != 0 )); then for a in ${ARGS}; do @@ -139,7 +155,6 @@ fi # Configure, build, and install libcudf if buildAll || hasArg libcudf; then - if (( ${BUILD_ALL_GPU_ARCH} == 0 )); then CUDF_CMAKE_CUDA_ARCHITECTURES="-DCMAKE_CUDA_ARCHITECTURES=" echo "Building for the architecture of the GPU in the system..." @@ -156,7 +171,8 @@ if buildAll || hasArg libcudf; then -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} + -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ + ${CMAKE_ARGS} cd ${LIB_BUILD_DIR} From 54da767404872d8e9bc194ff2c11fa1048d48c17 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Fri, 6 Aug 2021 13:02:19 -0700 Subject: [PATCH 02/14] FIX Clarify usage of --cmake-args option --- build.sh | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/build.sh b/build.sh index 67c7e3a0b71..2d96bec8a40 100755 --- a/build.sh +++ b/build.sh @@ -19,26 +19,26 @@ REPODIR=$(cd $(dirname $0); pwd) VALIDARGS="clean libcudf cudf dask_cudf benchmarks tests libcudf_kafka cudf_kafka custreamz -v -g -n -l --allgpuarch --disable_nvtx --show_depr_warn --ptds -h" HELP="$0 [clean] [libcudf] [cudf] [dask_cudf] [benchmarks] [tests] [libcudf_kafka] [cudf_kafka] [custreamz] [-v] [-g] [-n] [-h] [-l] [--cmake-args=\"\"] - clean - remove all existing build artifacts and configuration (start - over) - libcudf - build the cudf C++ code only - cudf - build the cudf Python package - dask_cudf - build the dask_cudf Python package - benchmarks - build benchmarks - tests - build tests - libcudf_kafka - build the libcudf_kafka C++ code only - cudf_kafka - build the cudf_kafka Python package - custreamz - build the custreamz Python package - -v - verbose build mode - -g - build for debug - -n - no install step - -l - build legacy tests - --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 - --cmake-args=\"\" - pass arbitrary list of CMake configuration options - -h | --h[elp] - print this text + clean - remove all existing build artifacts and configuration (start + over) + libcudf - build the cudf C++ code only + cudf - build the cudf Python package + dask_cudf - build the dask_cudf Python package + benchmarks - build benchmarks + tests - build tests + libcudf_kafka - build the libcudf_kafka C++ code only + cudf_kafka - build the cudf_kafka Python package + custreamz - build the custreamz Python package + -v - verbose build mode + -g - build for debug + -n - no install step + -l - build legacy tests + --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 + --cmake-args=\\\"\\\" - pass arbitrary list of CMake configuration options (escape all quotes in argument) + -h | --h[elp] - print this text default action (no args) is to build and install 'libcudf' then 'cudf' then 'dask_cudf' targets From 8f15bdf7e6a9033ba0ed0847a9f18ee304d139eb Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Mon, 9 Aug 2021 09:10:40 -0700 Subject: [PATCH 03/14] FIX Add cmake arg format testing and error msg --- build.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/build.sh b/build.sh index 2d96bec8a40..9e0e00ff6a8 100755 --- a/build.sh +++ b/build.sh @@ -74,13 +74,18 @@ function hasArg { function cmakeArgs { # Check for correctly formatted cmake args option - CMAKE_ARGS=$(echo $ARGS | grep -Eo "\-\-cmake\-args=\".+\" ") - - if [[ -n ${CMAKE_ARGS} ]]; then - # Remove the full CMAKE_ARGS argument from list of args so that it passes validArgs function - ARGS=${ARGS//$CMAKE_ARGS/} - # Filter the full argument down to just the extra string that will be added to cmake call - CMAKE_ARGS=$(echo $CMAKE_ARGS | grep -Eo "\".+\"" | sed -e 's/^"//' -e 's/"$//') + if [[ $(echo $ARGS | grep -E "\-\-cmake\-args=\"") ]]; then + CMAKE_ARGS="$(echo $ARGS | grep -Eo "\-\-cmake\-args=\".+\" ")" + if [[ -n ${CMAKE_ARGS} ]]; then + # Remove the full CMAKE_ARGS argument from list of args so that it passes validArgs function + ARGS=${ARGS//$CMAKE_ARGS/} + # Filter the full argument down to just the extra string that will be added to cmake call + CMAKE_ARGS=$(echo $CMAKE_ARGS | grep -Eo "\".+\"" | sed -e 's/^"//' -e 's/"$//') + fi + elif [[ $(echo $ARGS | grep -E "\-\-cmake\-args=") ]]; then + CMAKE_ARGS="$(echo $ARGS | grep -Eo "\-\-cmake\-args=.+ ")" + echo "Invalid formatting for --cmake-args, see --help: $CMAKE_ARGS" + exit 1 fi } From 76c3d5ddaa9c8ad09c8386beb0bbfd067986d8da Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Mon, 9 Aug 2021 09:28:39 -0700 Subject: [PATCH 04/14] FIX Add lookback to error logic --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 9e0e00ff6a8..08e5da1e107 100755 --- a/build.sh +++ b/build.sh @@ -83,7 +83,7 @@ function cmakeArgs { CMAKE_ARGS=$(echo $CMAKE_ARGS | grep -Eo "\".+\"" | sed -e 's/^"//' -e 's/"$//') fi elif [[ $(echo $ARGS | grep -E "\-\-cmake\-args=") ]]; then - CMAKE_ARGS="$(echo $ARGS | grep -Eo "\-\-cmake\-args=.+ ")" + CMAKE_ARGS="$(echo $ARGS | grep -Eo "\-\-cmake\-args=(.+)? ")" echo "Invalid formatting for --cmake-args, see --help: $CMAKE_ARGS" exit 1 fi From 369b9df7618ceb5e561e58fe0a7517e5a36e9bee Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Wed, 11 Aug 2021 10:51:08 -0700 Subject: [PATCH 05/14] FIX Catch any possible edge cases that may occur from second regex test --- build.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 08e5da1e107..ef16352978c 100755 --- a/build.sh +++ b/build.sh @@ -75,7 +75,10 @@ function hasArg { function cmakeArgs { # Check for correctly formatted cmake args option if [[ $(echo $ARGS | grep -E "\-\-cmake\-args=\"") ]]; then - CMAKE_ARGS="$(echo $ARGS | grep -Eo "\-\-cmake\-args=\".+\" ")" + # There are possible weird edge cases that may cause this regex filter to output nothing and fail silently + # the true pipe will catch any weird edge cases that may happen and will cause the program to fall back + # on the invalid option error + CMAKE_ARGS="$(echo $ARGS | grep -Eo "\-\-cmake\-args=\".+\" ")" | true if [[ -n ${CMAKE_ARGS} ]]; then # Remove the full CMAKE_ARGS argument from list of args so that it passes validArgs function ARGS=${ARGS//$CMAKE_ARGS/} @@ -105,7 +108,7 @@ cmakeArgs if (( ${NUMARGS} != 0 )); then for a in ${ARGS}; do if ! (echo " ${VALIDARGS} " | grep -q " ${a} "); then - echo "Invalid option: ${a}" + echo "Invalid option, check --help: ${a}" exit 1 fi done From fc6a0d26990898c1b1ebb7ff2e89bfb4d1daff76 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Wed, 11 Aug 2021 11:19:58 -0700 Subject: [PATCH 06/14] Reformat regex to look more readable --- build.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 08e5da1e107..bc2e8e5cfd5 100755 --- a/build.sh +++ b/build.sh @@ -75,7 +75,10 @@ function hasArg { function cmakeArgs { # Check for correctly formatted cmake args option if [[ $(echo $ARGS | grep -E "\-\-cmake\-args=\"") ]]; then - CMAKE_ARGS="$(echo $ARGS | grep -Eo "\-\-cmake\-args=\".+\" ")" + # There are possible weird edge cases that may cause this regex filter to output nothing and fail silently + # the true pipe will catch any weird edge cases that may happen and will cause the program to fall back + # on the invalid option error + CMAKE_ARGS=$(echo $ARGS | { grep -Eo "\-\-cmake\-args=\".+\" " || true; }) if [[ -n ${CMAKE_ARGS} ]]; then # Remove the full CMAKE_ARGS argument from list of args so that it passes validArgs function ARGS=${ARGS//$CMAKE_ARGS/} @@ -105,7 +108,7 @@ cmakeArgs if (( ${NUMARGS} != 0 )); then for a in ${ARGS}; do if ! (echo " ${VALIDARGS} " | grep -q " ${a} "); then - echo "Invalid option: ${a}" + echo "Invalid option, check --help: ${a}" exit 1 fi done From 6ad7ea5f069dba928b3dc5e6ea4c83403062722f Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Wed, 11 Aug 2021 11:37:11 -0700 Subject: [PATCH 07/14] FIX Fix formatting not being recognized when --cmake-args is the last argument given --- build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 36fde636a99..1e29ea2422d 100755 --- a/build.sh +++ b/build.sh @@ -74,18 +74,18 @@ function hasArg { function cmakeArgs { # Check for correctly formatted cmake args option - if [[ $(echo $ARGS | grep -E "\-\-cmake\-args=\"") ]]; then + if [[ -n $(echo $ARGS | grep -E "\-\-cmake\-args=\"") ]]; then # There are possible weird edge cases that may cause this regex filter to output nothing and fail silently # the true pipe will catch any weird edge cases that may happen and will cause the program to fall back # on the invalid option error - CMAKE_ARGS=$(echo $ARGS | { grep -Eo "\-\-cmake\-args=\".+\" " || true; }) + CMAKE_ARGS=$(echo $ARGS | { grep -Eo "\-\-cmake\-args=\".+\"" || true; }) if [[ -n ${CMAKE_ARGS} ]]; then # Remove the full CMAKE_ARGS argument from list of args so that it passes validArgs function ARGS=${ARGS//$CMAKE_ARGS/} # Filter the full argument down to just the extra string that will be added to cmake call CMAKE_ARGS=$(echo $CMAKE_ARGS | grep -Eo "\".+\"" | sed -e 's/^"//' -e 's/"$//') fi - elif [[ $(echo $ARGS | grep -E "\-\-cmake\-args=") ]]; then + elif [[ -z $(echo $ARGS | grep -E "\-\-cmake\-args=") ]]; then CMAKE_ARGS="$(echo $ARGS | grep -Eo "\-\-cmake\-args=(.+)? ")" echo "Invalid formatting for --cmake-args, see --help: $CMAKE_ARGS" exit 1 @@ -220,7 +220,8 @@ if hasArg libcudf_kafka; then cmake -S $REPODIR/cpp/libcudf_kafka -B ${KAFKA_LIB_BUILD_DIR} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \ -DBUILD_TESTS=${BUILD_TESTS} \ - -DCMAKE_BUILD_TYPE=${BUILD_TYPE} + -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ + ${CMAKE_ARGS} cd ${KAFKA_LIB_BUILD_DIR} From a3ed49d55c7aeffdfb604fc7e4a8b44ee192d4e8 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Wed, 11 Aug 2021 11:41:12 -0700 Subject: [PATCH 08/14] FIX Move cmakeArgs option into validArgs function --- build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 1e29ea2422d..e3e216aa003 100755 --- a/build.sh +++ b/build.sh @@ -101,11 +101,10 @@ if hasArg -h || hasArg --h || hasArg --help; then exit 0 fi -# Check for additional arbitrary cmake options -cmakeArgs - # Check for valid usage if (( ${NUMARGS} != 0 )); then + # Check for cmake args + cmakeArgs for a in ${ARGS}; do if ! (echo " ${VALIDARGS} " | grep -q " ${a} "); then echo "Invalid option, check --help: ${a}" From 443b9e91da07da3bf8c3325a13364b378feda2d8 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Wed, 11 Aug 2021 11:45:36 -0700 Subject: [PATCH 09/14] FIX Correct indentation/spacing --- build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index e3e216aa003..15013e4e64e 100755 --- a/build.sh +++ b/build.sh @@ -80,14 +80,14 @@ function cmakeArgs { # on the invalid option error CMAKE_ARGS=$(echo $ARGS | { grep -Eo "\-\-cmake\-args=\".+\"" || true; }) if [[ -n ${CMAKE_ARGS} ]]; then - # Remove the full CMAKE_ARGS argument from list of args so that it passes validArgs function - ARGS=${ARGS//$CMAKE_ARGS/} - # Filter the full argument down to just the extra string that will be added to cmake call + # Remove the full CMAKE_ARGS argument from list of args so that it passes validArgs function + ARGS=${ARGS//$CMAKE_ARGS/} + # Filter the full argument down to just the extra string that will be added to cmake call CMAKE_ARGS=$(echo $CMAKE_ARGS | grep -Eo "\".+\"" | sed -e 's/^"//' -e 's/"$//') fi elif [[ -z $(echo $ARGS | grep -E "\-\-cmake\-args=") ]]; then - CMAKE_ARGS="$(echo $ARGS | grep -Eo "\-\-cmake\-args=(.+)? ")" - echo "Invalid formatting for --cmake-args, see --help: $CMAKE_ARGS" + CMAKE_ARGS="$(echo $ARGS | grep -Eo "\-\-cmake\-args=(.+)? ")" + echo "Invalid formatting for --cmake-args, see --help: $CMAKE_ARGS" exit 1 fi } From 747c088df0ef1f26bfef58d6028958056122021e Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Wed, 11 Aug 2021 12:13:04 -0700 Subject: [PATCH 10/14] FIX Indentation fixes --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 15013e4e64e..0dae6b2e31f 100755 --- a/build.sh +++ b/build.sh @@ -220,7 +220,7 @@ if hasArg libcudf_kafka; then -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \ -DBUILD_TESTS=${BUILD_TESTS} \ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ - ${CMAKE_ARGS} + ${CMAKE_ARGS} cd ${KAFKA_LIB_BUILD_DIR} From 337c3289610fd52f82ed6303d931a046be68a55e Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Wed, 11 Aug 2021 12:44:44 -0700 Subject: [PATCH 11/14] FIX Handle multiple --cmake-args options --- build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 0dae6b2e31f..a531a47c1a1 100755 --- a/build.sh +++ b/build.sh @@ -74,7 +74,10 @@ function hasArg { function cmakeArgs { # Check for correctly formatted cmake args option - if [[ -n $(echo $ARGS | grep -E "\-\-cmake\-args=\"") ]]; then + if [[ $(echo $ARGS | grep -Eo "\-\-cmake\-args=" | wc -l ) -gt 1 ]]; then + echo "Multiple --cmake-args options were provided, please provide only one: ${ARGS}" + exit 1 + elif [[ -n $(echo $ARGS | grep -E "\-\-cmake\-args=\"") ]]; then # There are possible weird edge cases that may cause this regex filter to output nothing and fail silently # the true pipe will catch any weird edge cases that may happen and will cause the program to fall back # on the invalid option error From 74dc4cdcbd79412518fee2cab26dc77fd93894a0 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Wed, 11 Aug 2021 12:46:56 -0700 Subject: [PATCH 12/14] FIX Indentation... --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index a531a47c1a1..0feabf28114 100755 --- a/build.sh +++ b/build.sh @@ -75,7 +75,7 @@ function hasArg { function cmakeArgs { # Check for correctly formatted cmake args option if [[ $(echo $ARGS | grep -Eo "\-\-cmake\-args=" | wc -l ) -gt 1 ]]; then - echo "Multiple --cmake-args options were provided, please provide only one: ${ARGS}" + echo "Multiple --cmake-args options were provided, please provide only one: ${ARGS}" exit 1 elif [[ -n $(echo $ARGS | grep -E "\-\-cmake\-args=\"") ]]; then # There are possible weird edge cases that may cause this regex filter to output nothing and fail silently From 82e9e083922abe06953d99a56789cd1edbca422f Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Wed, 11 Aug 2021 13:45:23 -0700 Subject: [PATCH 13/14] FIX Generalize error message, simplify formatting check --- build.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index 0feabf28114..1bf1ca5a2e7 100755 --- a/build.sh +++ b/build.sh @@ -73,11 +73,14 @@ function hasArg { } function cmakeArgs { - # Check for correctly formatted cmake args option - if [[ $(echo $ARGS | grep -Eo "\-\-cmake\-args=" | wc -l ) -gt 1 ]]; then + # Check for multiple cmake args options + if [[ $(echo $ARGS | { grep -Eo "\-\-cmake\-args" || true; } | wc -l ) -gt 1 ]]; then echo "Multiple --cmake-args options were provided, please provide only one: ${ARGS}" exit 1 - elif [[ -n $(echo $ARGS | grep -E "\-\-cmake\-args=\"") ]]; then + fi + + # Check for cmake args option + if [[ -n $(echo $ARGS | { grep -E "\-\-cmake\-args" || true; } ) ]]; then # There are possible weird edge cases that may cause this regex filter to output nothing and fail silently # the true pipe will catch any weird edge cases that may happen and will cause the program to fall back # on the invalid option error @@ -88,10 +91,6 @@ function cmakeArgs { # Filter the full argument down to just the extra string that will be added to cmake call CMAKE_ARGS=$(echo $CMAKE_ARGS | grep -Eo "\".+\"" | sed -e 's/^"//' -e 's/"$//') fi - elif [[ -z $(echo $ARGS | grep -E "\-\-cmake\-args=") ]]; then - CMAKE_ARGS="$(echo $ARGS | grep -Eo "\-\-cmake\-args=(.+)? ")" - echo "Invalid formatting for --cmake-args, see --help: $CMAKE_ARGS" - exit 1 fi } @@ -110,7 +109,7 @@ if (( ${NUMARGS} != 0 )); then cmakeArgs for a in ${ARGS}; do if ! (echo " ${VALIDARGS} " | grep -q " ${a} "); then - echo "Invalid option, check --help: ${a}" + echo "Invalid option or formatting, check --help: ${a}" exit 1 fi done From 73d78113828502bcf014ca7d705a8d478e2d8258 Mon Sep 17 00:00:00 2001 From: dillon-cullinan Date: Thu, 12 Aug 2021 10:16:30 -0700 Subject: [PATCH 14/14] FIX Tabs to spaces in help text --- build.sh | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/build.sh b/build.sh index 1bf1ca5a2e7..200f7aad7e5 100755 --- a/build.sh +++ b/build.sh @@ -19,26 +19,26 @@ REPODIR=$(cd $(dirname $0); pwd) VALIDARGS="clean libcudf cudf dask_cudf benchmarks tests libcudf_kafka cudf_kafka custreamz -v -g -n -l --allgpuarch --disable_nvtx --show_depr_warn --ptds -h" HELP="$0 [clean] [libcudf] [cudf] [dask_cudf] [benchmarks] [tests] [libcudf_kafka] [cudf_kafka] [custreamz] [-v] [-g] [-n] [-h] [-l] [--cmake-args=\"\"] - clean - remove all existing build artifacts and configuration (start + clean - remove all existing build artifacts and configuration (start over) - libcudf - build the cudf C++ code only - cudf - build the cudf Python package - dask_cudf - build the dask_cudf Python package - benchmarks - build benchmarks - tests - build tests - libcudf_kafka - build the libcudf_kafka C++ code only - cudf_kafka - build the cudf_kafka Python package - custreamz - build the custreamz Python package - -v - verbose build mode - -g - build for debug - -n - no install step - -l - build legacy tests - --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 - --cmake-args=\\\"\\\" - pass arbitrary list of CMake configuration options (escape all quotes in argument) - -h | --h[elp] - print this text + libcudf - build the cudf C++ code only + cudf - build the cudf Python package + dask_cudf - build the dask_cudf Python package + benchmarks - build benchmarks + tests - build tests + libcudf_kafka - build the libcudf_kafka C++ code only + cudf_kafka - build the cudf_kafka Python package + custreamz - build the custreamz Python package + -v - verbose build mode + -g - build for debug + -n - no install step + -l - build legacy tests + --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 + --cmake-args=\\\"\\\" - pass arbitrary list of CMake configuration options (escape all quotes in argument) + -h | --h[elp] - print this text default action (no args) is to build and install 'libcudf' then 'cudf' then 'dask_cudf' targets