Use CMAKE_ARGS in build script and other minor improvements

Author: sleeepyjack

ci/build.sh

@@ -37,6 +37,9 @@ resolve_path() {
 # Ensure the script is being executed in its containing directory
 cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
 
+# Determine repo root as the parent of the `ci` directory
+REPO_ROOT="$(cd .. && pwd)"
+
 # Script defaults
 BUILD_TESTS=${BUILD_TESTS:-OFF}
 BUILD_EXAMPLES=${BUILD_EXAMPLES:-OFF}
@@ -51,6 +54,13 @@ HOST_COMPILER=${CXX:-g++} # $CXX if set, otherwise `g++`
 CUDA_ARCHS=native # detect system's GPU architectures
 CXX_STANDARD=17
 
+# Initialize CMAKE_ARGS from environment variable if available
+if [ -n "${CMAKE_ARGS:-}" ]; then
+    read -ra CMAKE_ARGS <<< "$CMAKE_ARGS"
+else
+    CMAKE_ARGS=()
+fi
+
 function usage {
     echo "cuCollections build script"
     echo "Usage: $0 [OPTIONS]"
@@ -62,9 +72,9 @@ function usage {
     echo "  --prefix: Build directory prefix (Defaults to <repo_root>/build)"
     echo "  -i/--infix: Build directory infix (Defaults to local)"
     echo "  -d/--debug: Debug build"
-    echo "  -p/--parallel: Build parallelism (Defaults to \$PARALLEL_LEVEL if set, otherwise the system's number of CPU cores)"
-    echo "  --cuda: CUDA compiler (Defaults to \$CUDACXX if set, otherwise nvcc)"
-    echo "  --cxx: Host compiler (Defaults to \$CXX if set, otherwise g++)"
+    echo "  -p/--parallel: Build parallelism (Defaults to $PARALLEL_LEVEL if set, otherwise the system's number of CPU cores)"
+    echo "  --cuda: CUDA compiler (Defaults to $CUDACXX if set, otherwise nvcc)"
+    echo "  --cxx: Host compiler (Defaults to $CXX if set, otherwise g++)"
     echo "  --arch: Target CUDA arches, e.g. \"60-real;70;80-virtual\" (Defaults to the system's native GPU archs)"
     echo "  --std: CUDA/C++ standard (Defaults to 17)"
     echo "  -v/-verbose/--verbose: Enable shell echo for debugging"
@@ -103,6 +113,16 @@ function usage {
     echo "    Enables verbose mode for detailed output and builds with C++17 standard."
     echo "    Build files will be written to <repo_root>/build/local and symlinked to <repo_root>/build/latest."
     echo
+    echo "  Using CMAKE_ARGS Environment Variable:"
+    echo "    $ CMAKE_ARGS=\"-DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_FEATURE=ON\" $0 -t"
+    echo "    $ export CMAKE_ARGS=\"-DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_FEATURE=ON\""
+    echo "    $ $0 -t"
+    echo "    Uses CMAKE_ARGS environment variable to pass additional CMake options."
+    echo "    Can be overridden by using -- followed by specific arguments."
+    echo
+    echo "  Pass-through to CMake:"
+    echo "    -- [CMake args...]  Anything after -- is forwarded to CMake (overrides CMAKE_ARGS env var)"
+    echo
     exit 1
 }
 
@@ -126,6 +146,7 @@ while [ "${#args[@]}" -ne 0 ]; do
     --arch) CUDA_ARCHS="${args[1]}";    args=("${args[@]:2}");;
     --std)  CXX_STANDARD="${args[1]}";  args=("${args[@]:2}");;
     -v | -verbose | --verbose) VERBOSE=1; args=("${args[@]:1}");;
+    --) CMAKE_ARGS=("${args[@]:1}"); break;;
     -h | -help | --help) usage ;;
     *) echo "Unrecognized option: ${args[0]}"; usage ;;
     esac
@@ -156,14 +177,12 @@ if [ "$BUILD_TESTS" == "OFF" ] && [ "$BUILD_EXAMPLES" == "OFF" ] && [ "$BUILD_BE
     BUILD_BENCHMARKS=ON
 fi
 
+BUILD_DIR="$BUILD_PREFIX/$BUILD_INFIX"
 # Trigger clean (re-)build
 if [ "$CLEAN_BUILD" -eq 1 ]; then
     rm -rf BUILD_DIR
 fi
-
-BUILD_DIR="$BUILD_PREFIX/$BUILD_INFIX"
 mkdir -p $BUILD_DIR
-export BUILD_DIR # TODO remove
 
 # The most recent build will be symlinked to cuCollections/build/latest
 rm -f $BUILD_PREFIX/latest
@@ -188,10 +207,10 @@ CMAKE_OPTIONS="
     -DBUILD_BENCHMARKS=${BUILD_BENCHMARKS} \
 "
 
-echo "========================================"
-echo "-- START: $(date)"
+echo "[INFO]=============================================="
+echo "-- TIMESTAMP: $(date -u +"%Y-%m-%d %H:%M:%S UTC")"
 echo "-- GIT_SHA: $(git rev-parse HEAD 2>/dev/null || echo 'Not a repository')"
-echo "-- PWD: $(pwd)"
+echo "-- SRC_DIR: ${REPO_ROOT}"
 echo "-- BUILD_DIR: ${BUILD_DIR}"
 echo "-- BUILD_TYPE: ${BUILD_TYPE}"
 echo "-- PARALLEL_LEVEL: ${PARALLEL_LEVEL}"
@@ -200,21 +219,30 @@ echo "-- BUILD_TESTS: ${BUILD_TESTS}"
 echo "-- BUILD_EXAMPLES: ${BUILD_EXAMPLES}"
 echo "-- BUILD_BENCHMARKS: ${BUILD_BENCHMARKS}"
 
+if [ ${#CMAKE_ARGS[@]} -gt 0 ]; then
+    echo "-- CMAKE_ARGS: ${CMAKE_ARGS[*]}"
+else
+    echo "-- CMAKE_ARGS: (none)"
+fi
+
+
 # configure
-cmake -S .. -B $BUILD_DIR $CMAKE_OPTIONS
-echo "========================================"
+echo "[CONFIGURE]========================================"
+cmake -S .. -B $BUILD_DIR $CMAKE_OPTIONS "${CMAKE_ARGS[@]}"
 
 if command -v sccache >/dev/null; then
     source "./sccache_stats.sh" start
+else
+    echo "sccache stats: N/A"
 fi
 
 #build
+echo "[BUILD]============================================"
 cmake --build $BUILD_DIR --parallel $PARALLEL_LEVEL
-echo "========================================"
 echo "Build complete"
 
 if command -v sccache >/dev/null; then
     source "./sccache_stats.sh" end
 else
     echo "sccache stats: N/A"
-fi
+fi