From ceb31f2a4c260e6a52e019b86f6cbcdbea9f0b16 Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Thu, 6 Oct 2022 09:01:35 -0400 Subject: [PATCH 1/2] Some build.sh updates. --- build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.sh b/build.sh index 2b53ad2b69..dda474be44 100755 --- a/build.sh +++ b/build.sh @@ -330,6 +330,10 @@ fi # Build and (optionally) install the raft-dask Python package if (( ${NUMARGS} == 0 )) || hasArg raft-dask || hasArg docs; then + # Append `-DFIND_RAFT_CPP=ON` to EXTRA_CMAKE_ARGS unless a user specified the option. + if [[ "${EXTRA_CMAKE_ARGS}" != *"DFIND_RAFT_CPP"* ]]; then + EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -DFIND_RAFT_CPP=ON" + fi cd ${REPODIR}/python/raft-dask python setup.py build_ext --inplace -- -DCMAKE_PREFIX_PATH="${LIBRAFT_BUILD_DIR};${INSTALL_PREFIX}" -DCMAKE_LIBRARY_PATH=${LIBRAFT_BUILD_DIR} ${EXTRA_CMAKE_ARGS} -- -j${PARALLEL_LEVEL:-1} @@ -340,6 +344,10 @@ fi # Build and (optionally) install the pylibraft Python package if (( ${NUMARGS} == 0 )) || hasArg pylibraft; then + # Append `-DFIND_RAFT_CPP=ON` to EXTRA_CMAKE_ARGS unless a user specified the option. + if [[ "${EXTRA_CMAKE_ARGS}" != *"DFIND_RAFT_CPP"* ]]; then + EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -DFIND_RAFT_CPP=ON" + fi cd ${REPODIR}/python/pylibraft python setup.py build_ext --inplace -- -DCMAKE_PREFIX_PATH="${LIBRAFT_BUILD_DIR};${INSTALL_PREFIX}" -DCMAKE_LIBRARY_PATH=${LIBRAFT_BUILD_DIR} ${EXTRA_CMAKE_ARGS} -- -j${PARALLEL_LEVEL:-1} From 1c0fa9782b67a21b78915e6c5c4277ba246968fe Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Thu, 6 Oct 2022 09:02:25 -0400 Subject: [PATCH 2/2] Fixing build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index dda474be44..a31d97c22c 100755 --- a/build.sh +++ b/build.sh @@ -329,7 +329,7 @@ if (( ${NUMARGS} == 0 )) || hasArg libraft || hasArg docs || hasArg tests || has fi # Build and (optionally) install the raft-dask Python package -if (( ${NUMARGS} == 0 )) || hasArg raft-dask || hasArg docs; then +if (( ${NUMARGS} == 0 )) || hasArg raft-dask; then # Append `-DFIND_RAFT_CPP=ON` to EXTRA_CMAKE_ARGS unless a user specified the option. if [[ "${EXTRA_CMAKE_ARGS}" != *"DFIND_RAFT_CPP"* ]]; then EXTRA_CMAKE_ARGS="${EXTRA_CMAKE_ARGS} -DFIND_RAFT_CPP=ON"