Revert nvcomp (#2483)

* Revert "Update JNI build to support nvcomp4 (#2217)"

This reverts commit 0bbefc0.

* Version

* Apply and remove patches to CUDF as part of the build

Signed-off-by: Robert (Bobby) Evans <bobby@apache.org>

* Better checking if git is dirty

* Some review comments

* Get submodule sync to work

Signed-off-by: Robert (Bobby) Evans <bobby@apache.org>

---------

Signed-off-by: Robert (Bobby) Evans <bobby@apache.org>
Co-authored-by: Gera Shegalov <gera@apache.org>

build/apply-patches

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+#
+# Copyright (c) 2024, 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Run a command in a Docker container with devtoolset
+
+set -e
+
+BASE_DIR=$( git rev-parse --show-toplevel )
+
+PATCH_DIR=${PATCH_DIR:-$(realpath "$BASE_DIR/patches/")}
+
+CUDF_DIR=${CUDF_DIR:-$(realpath "$BASE_DIR/thirdparty/cudf/")}
+
+pushd "$CUDF_DIR"
+if [ -n "$(git status --porcelain --untracked-files=no)" ] ; then
+    echo "Error: CUDF repository has uncommitted changes. No patches will be applied..."
+    exit 1
+fi
+
+find "$PATCH_DIR" -maxdepth 1 -type f -print0 | sort -zV | while IFS= read -r -d '' file; do
+    echo "patching with: $file"
+    patch --no-backup-if-mismatch -f -t --reject-file=- -p1 -i "$file"
+done
+popd

build/unapply-patches

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+#
+# Copyright (c) 2024, 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Run a command in a Docker container with devtoolset
+
+set -e
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+PATCH_DIR=${PATCH_DIR:-$(realpath "$SCRIPT_DIR/../patches/")}
+
+CUDF_DIR=${CUDF_DIR:-$(realpath "$SCRIPT_DIR/../thirdparty/cudf/")}
+
+
+pushd "$CUDF_DIR"
+if [ -n "$(git status --porcelain --untracked-files=no)" ] ; then
+  #only try to remove patches if it looks like something was changed
+  find "$PATCH_DIR" -maxdepth 1 -type f -print0 | sort -zV -r | while IFS= read -r -d '' file; do
+      echo "patching with: $file"
+      patch -R --no-backup-if-mismatch --reject-file=- -f -t -p1 -i "$file"
+  done
+fi
+
+# Check for modifications
+if [ -n "$(git status --porcelain --untracked-files=no)" ] ; then
+    echo "Error: CUDF repository has uncommitted changes. You might want to clean in manually if you know that is expected"
+    exit 1
+fi
+popd

ci/submodule-sync.sh

@@ -70,24 +70,18 @@ echo "Test against ${cudf_sha}..."
 
 MVN="mvn -Dmaven.wagon.http.retryHandler.count=3 -B"
 set +e
-${MVN} verify ${MVN_MIRROR} \
+# Don't do a full build. Just try to update/build CUDF with no patches on top of it.
+${MVN} validate ${MVN_MIRROR} \
   -DCPP_PARALLEL_LEVEL=${PARALLEL_LEVEL} \
   -Dlibcudf.build.configure=true \
   -Dlibcudf.dependency.mode=latest \
+  -Dsubmodule.patch.skip \
   -DUSE_GDS=ON -Dtest=*,!CuFileTest,!CudaFatalTest,!ColumnViewNonEmptyNullsTest \
   -DBUILD_TESTS=ON \
   -DUSE_SANITIZER=ON
-verify_status=$?
+validate_status=$?
 set -e
 
-test_pass="False"
-if [[ "${verify_status}" == "0" ]]; then
-  echo "Test passed, will try merge the change"
-  test_pass="True"
-else
-  echo "Test failed, will update the result"
-fi
-
 build_name=$(${MVN} help:evaluate -Dexpression=project.build.finalName -q -DforceStdout)
 cuda_version=$(${MVN} help:evaluate -Dexpression=cuda.version -q -DforceStdout)
 . ci/check-cuda-dependencies.sh "target/${build_name}-${cuda_version}.jar"
@@ -100,8 +94,11 @@ echo "${rapids_cmake_sha}" > thirdparty/cudf-pins/rapids-cmake.sha
 
 # Bash the wrong nvcomp version to the correct version until
 # nvcomp version mismatch is fixed. https://github.com/rapidsai/cudf/issues/16772.
-echo "Workaround nvcomp 4.0.1 / 4.0.1.0 versioning issues"
-sed -i 's/4\.0\.1\.0/4.0.1/' thirdparty/cudf-pins/versions.json
+echo "Revert nvcomp to 3.0.6"
+sed -i -e 's/4\.0\.1\.0/3.0.6/' \
+  -e 's|https://developer.download.nvidia.com/compute/nvcomp/${version}/local_installers/nvcomp-linux-sbsa-${version}-cuda${cuda-toolkit-version-mapping}.tar.gz|https://developer.download.nvidia.com/compute/nvcomp/${version}/local_installers/nvcomp_${version}_SBSA_${cuda-toolkit-version-mapping}.tgz|' \
+  -e 's|https://developer.download.nvidia.com/compute/nvcomp/${version}/local_installers/nvcomp-linux-x86_64-${version}-cuda${cuda-toolkit-version-mapping}.tar.gz|https://developer.download.nvidia.com/compute/nvcomp/${version}/local_installers/nvcomp_${version}_x86_64_${cuda-toolkit-version-mapping}.tgz|' \
+  thirdparty/cudf-pins/versions.json
 
 # Do the git add after the build so that we get
 # the updated versions.json generated by the build
@@ -110,6 +107,25 @@ git add .
 git diff-index --quiet HEAD || git commit -s -m "Update submodule cudf to ${cudf_sha}"
 sha=$(git rev-parse HEAD)
 
+set +e
+# now build and test everything with the patches in place
+${MVN} clean verify ${MVN_MIRROR} \
+  -DCPP_PARALLEL_LEVEL=${PARALLEL_LEVEL} \
+  -Dlibcudf.build.configure=true \
+  -DUSE_GDS=ON -Dtest=*,!CuFileTest,!CudaFatalTest,!ColumnViewNonEmptyNullsTest \
+  -DBUILD_TESTS=ON \
+  -DUSE_SANITIZER=ON
+verify_status=$?
+set -e
+
+test_pass="False"
+if [[ ( "${verify_status}" == "0" ) && ( "${validate_status}" == "0" ) ]]; then
+  echo "Test passed, will try merge the change"
+  test_pass="True"
+else
+  echo "Test failed, will update the result"
+fi
+
 # push the intermediate branch and create PR against REF
 # if test passed, it will try auto-merge the PR
 # if test failed, it will only comment the test result in the PR