From b3bf3c2d35b960ad522cd1d4da7655b6969c189b Mon Sep 17 00:00:00 2001 From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com> Date: Tue, 18 Jul 2023 09:50:11 -0700 Subject: [PATCH] Enable additional arguments in build_common.sh (#236) * Enable some extra argument parsing in build_common.sh * Fixup arg parsing and when bash modes are set --- ci/build_common.sh | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/ci/build_common.sh b/ci/build_common.sh index 0bb423bfff..8b2c0cb4c5 100755 --- a/ci/build_common.sh +++ b/ci/build_common.sh @@ -1,19 +1,52 @@ #!/bin/bash -set -euo pipefail +set -eo pipefail # Ensure the script is being executed in its containing directory cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"; +# Script defaults +CUDA_COMPILER=nvcc + # Check if the correct number of arguments has been provided -if [ "$#" -ne 3 ]; then - echo "Usage: $0 " +function usage { + echo "Usage: $0 [OPTIONS] " echo "The PARALLEL_LEVEL environment variable controls the amount of build parallelism. Default is the number of cores." echo "Example: PARALLEL_LEVEL=8 $0 g++-8 14 \"70\" " echo "Example: $0 clang++-8 17 \"70;75;80-virtual\" " + echo "Possible options: " + echo " -nvcc: path/to/nvcc" + echo " -v/--verbose: enable shell echo for debugging" exit 1 +} + +# Check for extra options +# While there are more than 3 arguments, parse switches/options +while [ "$#" -gt 3 ] +do + case "${1}" in + -h) usage ;; + -help) usage ;; + --help) usage ;; + --verbose) VERBOSE=1; shift ;; + -v) VERBOSE=1; shift ;; + -nvcc) CUDA_COMPILER="${2}"; shift 2;; + *) usage ;; + esac +done + +if [ $VERBOSE ]; then + set -x fi +if [ "$#" -ne 3 ]; then + echo "Invalid number of arguments" + usage +fi + +# Begin processing unsets after option parsing +set -u + # Assign command line arguments to variables readonly HOST_COMPILER=$(which $1) readonly CXX_STANDARD=$2 @@ -22,7 +55,7 @@ readonly CXX_STANDARD=$2 readonly GPU_ARCHS=$(echo $3 | tr ' ,' ';') readonly PARALLEL_LEVEL=${PARALLEL_LEVEL:=$(nproc)} -readonly NVCC_VERSION=$(nvcc --version | grep release | awk '{print $6}' | cut -c2-) +readonly NVCC_VERSION=$($CUDA_COMPILER --version | grep release | awk '{print $6}' | cut -c2-) if [ -z ${DEVCONTAINER_NAME+x} ]; then BUILD_DIR=../build/local @@ -40,6 +73,7 @@ COMMON_CMAKE_OPTIONS=" -DCMAKE_CXX_STANDARD=${CXX_STANDARD} \ -DCMAKE_CUDA_STANDARD=${CXX_STANDARD} \ -DCMAKE_CXX_COMPILER=${HOST_COMPILER} \ + -DCMAKE_CUDA_COMPILER=${CUDA_COMPILER} \ -DCMAKE_CUDA_HOST_COMPILER=${HOST_COMPILER} \ -DCMAKE_CUDA_ARCHITECTURES=${GPU_ARCHS} \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \