From 4733f07b13b7815c7837ff88c72918ab4a44e0f9 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Wed, 16 Feb 2022 18:49:47 -0500 Subject: [PATCH 1/2] Remove extraneous `build.sh` parameter The `-l` flag was introduced in #3504, but I don't see it being used anywhere. Seems safe to remove unless anyone else thinks otherwise. --- build.sh | 3 +-- ci/benchmark/build.sh | 6 +----- ci/gpu/build.sh | 12 ++---------- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/build.sh b/build.sh index 8b3add1dddd..765a1b5325f 100755 --- a/build.sh +++ b/build.sh @@ -18,7 +18,7 @@ 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 --build_metrics --incl_cache_stats" -HELP="$0 [clean] [libcudf] [cudf] [dask_cudf] [benchmarks] [tests] [libcudf_kafka] [cudf_kafka] [custreamz] [-v] [-g] [-n] [-h] [-l] [--cmake-args=\\\"\\\"] +HELP="$0 [clean] [libcudf] [cudf] [dask_cudf] [benchmarks] [tests] [libcudf_kafka] [cudf_kafka] [custreamz] [-v] [-g] [-n] [-h] [--cmake-args=\\\"\\\"] clean - remove all existing build artifacts and configuration (start over) libcudf - build the cudf C++ code only @@ -32,7 +32,6 @@ HELP="$0 [clean] [libcudf] [cudf] [dask_cudf] [benchmarks] [tests] [libcudf_kafk -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 diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index 178bdab0154..cc3810963c9 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -98,11 +98,7 @@ conda list --show-channel-urls ################################################################################ logger "Build libcudf..." -if [[ "${BUILD_MODE}" == "pull-request" ]]; then - "$WORKSPACE/build.sh" clean libcudf cudf dask_cudf benchmarks tests --ptds -else - "$WORKSPACE/build.sh" clean libcudf cudf dask_cudf benchmarks tests -l --ptds -fi +"$WORKSPACE/build.sh" clean libcudf cudf dask_cudf benchmarks tests --ptds ################################################################################ # BENCHMARK - Run and parse libcudf and cuDF benchmarks diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 4acdc372817..a79ffa0fc47 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -128,11 +128,7 @@ if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then ################################################################################ gpuci_logger "Build from source" - if [[ "${BUILD_MODE}" == "pull-request" ]]; then - "$WORKSPACE/build.sh" clean libcudf cudf dask_cudf libcudf_kafka cudf_kafka benchmarks tests --ptds - else - "$WORKSPACE/build.sh" clean libcudf cudf dask_cudf libcudf_kafka cudf_kafka benchmarks tests -l --ptds - fi + "$WORKSPACE/build.sh" clean libcudf cudf dask_cudf libcudf_kafka cudf_kafka benchmarks tests --ptds ################################################################################ # TEST - Run GoogleTest @@ -226,11 +222,7 @@ else install_dask gpuci_logger "Build python libs from source" - if [[ "${BUILD_MODE}" == "pull-request" ]]; then - "$WORKSPACE/build.sh" cudf dask_cudf cudf_kafka --ptds - else - "$WORKSPACE/build.sh" cudf dask_cudf cudf_kafka -l --ptds - fi + "$WORKSPACE/build.sh" cudf dask_cudf cudf_kafka --ptds fi From aaa9655786091d44f9ba99f323fcbaaece30046e Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Wed, 16 Feb 2022 19:08:05 -0500 Subject: [PATCH 2/2] update copyright header --- ci/benchmark/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/benchmark/build.sh b/ci/benchmark/build.sh index cc3810963c9..62eeb4d131b 100755 --- a/ci/benchmark/build.sh +++ b/ci/benchmark/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2020, NVIDIA CORPORATION. +# Copyright (c) 2020-2022, NVIDIA CORPORATION. ######################################### # cuDF GPU build and test script for CI # #########################################