Merge pull request #699 from rapidsai/branch-22.06

[gpuCI] Forward-merge branch-22.06 to branch-22.08 [skip gpuci]

build.sh

@@ -196,6 +196,11 @@ if [[ ${CMAKE_TARGET} == "" ]]; then
     CMAKE_TARGET="all"
 fi
 
+# Append `-DFIND_RAFT_CPP=ON` to CMAKE_ARGS unless a user specified the option.
+if [[ "${CMAKE_ARGS}" != *"DFIND_RAFT_CPP"* ]]; then
+    CMAKE_ARGS="${CMAKE_ARGS} -DFIND_RAFT_CPP=ON"
+fi
+
 # If clean given, run it prior to any other steps
 if (( ${CLEAN} == 1 )); then
     # If the dirs to clean are mounted dirs in a container, the

ci/gpu/build.sh

@@ -103,9 +103,9 @@ export LD_LIBRARY_PATH=$CONDA_PREFIX/lib:$LD_LIBRARY_PATH
 gpuci_logger "Build C++ and Python targets"
 # These should link against the existing shared libs
 if hasArg --skip-tests; then
-  "$WORKSPACE/build.sh" pyraft pylibraft libraft -v --cmake-args=\"-DFIND_RAFT_CPP=ON\"
+  "$WORKSPACE/build.sh" pyraft pylibraft libraft -v
 else
-  "$WORKSPACE/build.sh" pyraft pylibraft libraft tests bench -v --cmake-args=\"-DFIND_RAFT_CPP=ON\"
+  "$WORKSPACE/build.sh" pyraft pylibraft libraft tests bench -v
 fi
 
 gpuci_logger "sccache stats"

conda/recipes/pylibraft/build.sh

@@ -2,4 +2,4 @@
 #!/usr/bin/env bash
 
 # This assumes the script is executed from the root of the repo directory
-./build.sh pylibraft --install --no-nvtx --cmake-args=\"-DFIND_RAFT_CPP=ON\"
+./build.sh pylibraft --install --no-nvtx

conda/recipes/pyraft/build.sh

@@ -3,4 +3,4 @@
 # Copyright (c) 2022, NVIDIA CORPORATION.
 
 # This assumes the script is executed from the root of the repo directory
-./build.sh pyraft --install --no-nvtx --cmake-args=\"-DFIND_RAFT_CPP=ON\"
+./build.sh pyraft --install --no-nvtx