[auto-merge] bot-auto-merge-branch-25.02 to branch-25.04 [skip ci] [b…

…ot] (#2980)

auto-merge triggered by github actions on `bot-auto-merge-branch-25.02`
to create a PR keeping `branch-25.04` up-to-date. If this PR is unable
to be merged due to conflicts, it will remain open until manually fix.

build/buildcpp.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2024-2025, NVIDIA CORPORATION. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -63,7 +63,8 @@ LIBCUDF_INSTALL_PATH=${LIBCUDF_INSTALL_PATH:-$PROJECT_BUILD_DIR/libcudf-install}
 LIBCUDFJNI_BUILD_PATH=${LIBCUDFJNI_BUILD_PATH:-$PROJECT_BUILD_DIR/libcudfjni}
 SPARK_JNI_BUILD_PATH=${SPARK_JNI_BUILD_PATH:-$PROJECT_BUILD_DIR/jni/cmake-build}
 RMM_LOGGING_LEVEL=${RMM_LOGGING_LEVEL:-OFF}
-USE_GDS=${USE_GDS:-OFF}" > "$PROJECT_BUILD_DIR/buildcpp-env.sh"
+USE_GDS=${USE_GDS:-OFF}
+LIBCUDF_CONFIGURE_ONLY=${LIBCUDF_CONFIGURE_ONLY:-OFF}" > "$PROJECT_BUILD_DIR/buildcpp-env.sh"
 fi
 
 source "$PROJECT_BUILD_DIR/buildcpp-env.sh"
@@ -94,6 +95,10 @@ if [[ $LIBCUDF_BUILD_CONFIGURE == true || ! -f $LIBCUDF_BUILD_PATH/CMakeCache.tx
     -DRMM_LOGGING_LEVEL="$RMM_LOGGING_LEVEL" \
     -C="$CUDF_PIN_PATH/setup.cmake"
 fi
+if [[ $LIBCUDF_CONFIGURE_ONLY == ON ]]; then # submodule-sync.sh phase 1 call this script with LIBCUDF_CONFIGURE_ONLY=ON
+  echo "Skip build..."
+  exit 0
+fi
 echo "Building cudf native libs"
 cmake --build "$LIBCUDF_BUILD_PATH" --target install "-j$CPP_PARALLEL_LEVEL"
 

ci/submodule-sync.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2022-2025, NVIDIA CORPORATION. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -69,19 +69,20 @@ else
   git commit -s -m "Update submodule cudf to ${cudf_sha}"
 fi
 
-echo "Build libcudf only to update pinned versions..."
+echo "Configure libcudf only to update pinned versions..."
 MVN="mvn -Dmaven.wagon.http.retryHandler.count=3 -B"
 set +e
-# Don't do a full build. Just try to update/build CUDF with no patches on top of it.
-# calling the antrun directly skips applying patches and also only builds
-# libcudf
+# phase 1:
+# Just try to update CUDF and pinned versions with no patches on top of it.
+# calling the antrun directly skips applying patches
 ${MVN} antrun:run@buildcpp ${MVN_MIRROR} \
   -DCPP_PARALLEL_LEVEL=${PARALLEL_LEVEL} \
   -Dlibcudf.build.configure=true \
   -Dlibcudf.dependency.mode=latest \
   -DUSE_GDS=ON \
   -DBUILD_TESTS=ON \
-  -DUSE_SANITIZER=ON
+  -DUSE_SANITIZER=ON \
+  -DLIBCUDF_CONFIGURE_ONLY=ON
 validate_status=$?
 set -e
 
@@ -91,12 +92,9 @@ rapids_cmake_sha=$(git -C ${LIBCUDF_BUILD_PATH}/_deps/rapids-cmake-src/ rev-pars
 echo "Update rapids-cmake pinned SHA1 to ${rapids_cmake_sha}"
 echo "${rapids_cmake_sha}" > thirdparty/cudf-pins/rapids-cmake.sha
 
-echo "Workaround for https://github.com/NVIDIA/spark-rapids-jni/issues/2582"
-cudf_patch_path="cudf/cpp/cmake/thirdparty/patches"
-sed -i "s|\${current_json_dir}|\${current_json_dir}/../${cudf_patch_path}|g" thirdparty/cudf-pins/versions.json
-
-# Do the git add after the build so that we get
-# the updated versions.json generated by the build
+# phase 2:
+# Do the git add after the configure so that we get
+# the updated versions.json generated by the phase 1
 echo "Update cudf submodule to ${cudf_sha} with updated pinned versions"
 git add .
 if ! git diff-index --quiet HEAD; then
@@ -111,6 +109,7 @@ sha=$(git rev-parse HEAD)
 
 echo "Test against ${cudf_sha}..."
 set +e
+# phase 3:
 # now build and test everything with the patches in place
 ${MVN} clean verify ${MVN_MIRROR} \
   -DCPP_PARALLEL_LEVEL=${PARALLEL_LEVEL} \

pom.xml

@@ -81,6 +81,7 @@
     <RMM_LOGGING_LEVEL>OFF</RMM_LOGGING_LEVEL>
     <SPARK_RAPIDS_JNI_CXX_FLAGS/>
     <USE_GDS>OFF</USE_GDS>
+    <LIBCUDF_CONFIGURE_ONLY>OFF</LIBCUDF_CONFIGURE_ONLY>
     <CUDF_BUILD_TYPE>Release</CUDF_BUILD_TYPE>
     <BUILD_TESTS>OFF</BUILD_TESTS>
     <BUILD_BENCHMARKS>OFF</BUILD_BENCHMARKS>
@@ -460,6 +461,7 @@
                   <env key="SPARK_JNI_BUILD_PATH" value="${native.build.path}"/>
                   <env key="RMM_LOGGING_LEVEL" value="${RMM_LOGGING_LEVEL}"/>
                   <env key="USE_GDS" value="${USE_GDS}"/>
+                  <env key="LIBCUDF_CONFIGURE_ONLY" value="${LIBCUDF_CONFIGURE_ONLY}"/>
                 </exec>
               </target>
             </configuration>