-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Fill Java CI gaps for Maven Central publication #23447
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
paul-aiyedun
wants to merge
33
commits into
NVIDIA:release/26.08
from
paul-aiyedun:paul/fix_maven_publication_gaps
Closed
Changes from all commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
93e5329
Fill Java CI gaps for Maven Central publication
paul-aiyedun ecf8bde
TEMPORARY: commit for testing CI
paul-aiyedun e7d81cd
TEMPORARY: commit for testing CI (simulate release)
paul-aiyedun 27b5602
Revert "TEMPORARY: commit for testing CI (simulate release)"
paul-aiyedun 59a982e
Revert "TEMPORARY: commit for testing CI"
paul-aiyedun d8507da
Add java-publish job
paul-aiyedun a57548e
TEMPORARY: commit for testing CI (simulate maven release staging)
paul-aiyedun c3ddf15
Merge branch 'release/26.08' into paul/fix_maven_publication_gaps
paul-aiyedun bdb4da6
TEMPORARY: add temporary suppression to enable CI run
paul-aiyedun 4bfd057
TEMPORARY: use the shared-workflows PR commit sha
paul-aiyedun 279c4b3
TEMPORARY: empty commit for CI test
paul-aiyedun b202563
TEMPORARY: Update referenced shared-workflows branch
paul-aiyedun 91b532a
TEMPORARY: empty commit for CI test
paul-aiyedun 50ddf52
TEMPORARY: Update referenced shared-workflows commit
paul-aiyedun 4fb8a71
TEMPORARY: Update referenced shared-workflows commit
paul-aiyedun f10ee95
Remove references to artifactory secrets
paul-aiyedun b85c60a
Remove MAVEN_DEPLOY_USERNAME secret
paul-aiyedun cd3f51b
TEMPORARY: Update referenced shared-workflows commit
paul-aiyedun 14b7677
TEMPORARY: Update referenced shared-workflows commit
paul-aiyedun 33507a8
Merge branch 'release/26.08' into paul/fix_maven_publication_gaps
paul-aiyedun 55e6366
Clean up temporary changes
paul-aiyedun c047a47
TEMPORARY: end-to-end workflow validation
paul-aiyedun f04d57d
TEMPORARY: Add suppression for test
paul-aiyedun e2dbf8d
Revert "TEMPORARY: Add suppression for test"
paul-aiyedun 4b2b800
Revert "TEMPORARY: end-to-end workflow validation"
paul-aiyedun a0ce3bd
Address CodeRabbit comments
paul-aiyedun 2eb18cb
Merge branch 'release/26.08' into paul/fix_maven_publication_gaps
paul-aiyedun 879beab
Merge branch 'release/26.08' into paul/fix_maven_publication_gaps
paul-aiyedun 69bc5ef
TEMPORARY: manual Maven Central deployment for the 26.08.00 release
paul-aiyedun 79be8de
TEMPORARY: Apply same patch as spark-rapids-jni for nvcomp workaround
paul-aiyedun 45175e2
TEMPORARY: Apply patch to address libspdlog error
paul-aiyedun 2f41ae5
TEMPORARY: Drop old deployment
paul-aiyedun 404d68d
Undo temporary pr.yaml related changes
paul-aiyedun File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| #!/bin/bash | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
| # Fail if a cudf classifier JAR's libcudf.so DT_NEEDs libspdlog or libfmt. | ||
| # | ||
| # Usage: check_jar_libcudf_needed.sh <cudf-*-cuda*.jar> | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| if [[ $# -ne 1 ]]; then | ||
| echo "Usage: $0 <cudf-classifier.jar>" >&2 | ||
| exit 2 | ||
| fi | ||
|
|
||
| JAR="$(realpath "$1")" | ||
| if [[ ! -f ${JAR} ]]; then | ||
| echo "Error: JAR not found: ${JAR}" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| if ! command -v readelf >/dev/null 2>&1; then | ||
| echo "Error: readelf not found (install binutils)" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| if ! command -v unzip >/dev/null 2>&1; then | ||
| echo "Error: unzip not found" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| TMP="$(mktemp -d)" | ||
| trap 'rm -rf "${TMP}"' EXIT | ||
|
|
||
| MEMBER="$(unzip -Z1 "${JAR}" | grep -E '(^|/)libcudf\.so$' | head -1 || true)" | ||
| if [[ -z ${MEMBER} ]]; then | ||
| echo "Error: ${JAR} does not contain libcudf.so" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| # -j flattens the JAR-internal path (e.g. native/.../libcudf.so) into ${TMP}. | ||
| unzip -j -o -q "${JAR}" "${MEMBER}" -d "${TMP}" | ||
|
|
||
| SO="${TMP}/libcudf.so" | ||
| if [[ ! -f ${SO} ]]; then | ||
| echo "Error: failed to extract libcudf.so from ${JAR}" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| if readelf -d "${SO}" | grep -E 'NEEDED.*\[(libspdlog|libfmt)\.so'; then | ||
| echo "Error: ${JAR} libcudf.so still depends on shared spdlog/fmt:" >&2 | ||
| readelf -d "${SO}" | grep NEEDED >&2 || true | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "OK: no libspdlog/libfmt DT_NEEDED in $(basename "${JAR}")" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| #!/bin/bash | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
| # Install PIC static libfmt.a / libspdlog.a into the static libcudf install | ||
| # prefix (same tree as rmm / rapids_logger). Versions match the shared libs | ||
| # from the ci-conda build_java env (libfmt.so.12.1.0, libspdlog.so.1.17.0). | ||
| # | ||
| # Usage: | ||
| # . install_static_logging_libs.sh | ||
| # install_static_logging_libs "${INSTALL_PREFIX}" | ||
|
|
||
| install_static_libfmt() { | ||
| local prefix="$1" | ||
| local src | ||
| src="$(mktemp -d /tmp/cudf-java-fmt.XXXXXX)" | ||
|
|
||
| rapids-logger "Installing static libfmt.a (12.1.0) into ${prefix}" | ||
| curl -fsSL "https://github.com/fmtlib/fmt/archive/refs/tags/12.1.0.tar.gz" \ | ||
| | tar -xz -C "${src}" | ||
| cmake -S "${src}/fmt-12.1.0" -B "${src}/build" -GNinja \ | ||
| -DCMAKE_BUILD_TYPE=Release \ | ||
| -DCMAKE_INSTALL_PREFIX="${prefix}" \ | ||
| -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ | ||
| -DBUILD_SHARED_LIBS=OFF \ | ||
| -DFMT_DOC=OFF \ | ||
| -DFMT_TEST=OFF | ||
| cmake --build "${src}/build" --parallel "${PARALLEL_LEVEL}" | ||
| cmake --install "${src}/build" | ||
| rm -rf "${src}" | ||
| [[ -f ${prefix}/lib/libfmt.a ]] \ | ||
| || { echo "Error: failed to install ${prefix}/lib/libfmt.a" >&2; return 1; } | ||
| } | ||
|
|
||
| install_static_libspdlog() { | ||
| local prefix="$1" | ||
| local src | ||
| src="$(mktemp -d /tmp/cudf-java-spdlog.XXXXXX)" | ||
|
|
||
| rapids-logger "Installing static libspdlog.a (v1.17.0) into ${prefix}" | ||
| curl -fsSL "https://github.com/gabime/spdlog/archive/refs/tags/v1.17.0.tar.gz" \ | ||
| | tar -xz -C "${src}" | ||
| cmake -S "${src}/spdlog-1.17.0" -B "${src}/build" -GNinja \ | ||
| -DCMAKE_BUILD_TYPE=Release \ | ||
| -DCMAKE_INSTALL_PREFIX="${prefix}" \ | ||
| -DCMAKE_PREFIX_PATH="${prefix}" \ | ||
| -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ | ||
| -DSPDLOG_BUILD_SHARED=OFF \ | ||
| -DSPDLOG_BUILD_PIC=ON \ | ||
| -DSPDLOG_FMT_EXTERNAL=ON \ | ||
| -DSPDLOG_BUILD_EXAMPLE=OFF \ | ||
| -DSPDLOG_BUILD_TESTS=OFF \ | ||
| -DSPDLOG_BUILD_BENCH=OFF | ||
| cmake --build "${src}/build" --parallel "${PARALLEL_LEVEL}" | ||
| cmake --install "${src}/build" | ||
| rm -rf "${src}" | ||
| [[ -f ${prefix}/lib/libspdlog.a ]] \ | ||
| || { echo "Error: failed to install ${prefix}/lib/libspdlog.a" >&2; return 1; } | ||
| } | ||
|
|
||
| install_static_logging_libs() { | ||
| local prefix="$1" | ||
| if [[ -z ${prefix} ]]; then | ||
| echo "Error: install_static_logging_libs requires an install prefix" >&2 | ||
| return 1 | ||
| fi | ||
| mkdir -p "${prefix}" | ||
|
|
||
| [[ -f ${prefix}/lib/libfmt.a ]] || install_static_libfmt "${prefix}" | ||
| [[ -f ${prefix}/lib/libspdlog.a ]] || install_static_libspdlog "${prefix}" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/java/src/main/java/ai/rapids/cudf/NativeDepsLoader.java b/java/src/main/java/ai/rapids/cudf/NativeDepsLoader.java | ||
| index 0000000000..0000000000 100644 | ||
| --- a/java/src/main/java/ai/rapids/cudf/NativeDepsLoader.java | ||
| +++ b/java/src/main/java/ai/rapids/cudf/NativeDepsLoader.java | ||
| @@ -69,9 +69,6 @@ public class NativeDepsLoader { | ||
| * subsequent stages are loaded. | ||
| */ | ||
| private static final String[][] loadOrder = new String[][]{ | ||
| - new String[]{ | ||
| - "nvcomp" | ||
| - }, | ||
| new String[]{ | ||
| "cudf" | ||
| }, |
29 changes: 29 additions & 0 deletions
29
java/ci/patches/0002-static-spdlog-fmt-for-java-libcudf.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt | ||
| index 0000000000..1111111111 100644 | ||
| --- a/cpp/CMakeLists.txt | ||
| +++ b/cpp/CMakeLists.txt | ||
| @@ -1359,4 +1359,23 @@ if(TARGET spdlog::spdlog) | ||
| else() | ||
| - target_link_libraries(cudf PRIVATE ${_spdlog_link}) | ||
| + # TEMPORARY (java packaging): absorb PIC static spdlog/fmt from the | ||
| + # libcudf install prefix (same tree as rmm). BUILD_INTERFACE uses the | ||
| + # libs found at configure time; INSTALL_INTERFACE uses $<INSTALL_PREFIX> | ||
| + # so consumers (JAR container at /libcudf) resolve them like other deps. | ||
| + find_library( | ||
| + CUDF_JAVA_SPDLOG_STATIC NAMES libspdlog.a | ||
| + PATHS "${CMAKE_INSTALL_PREFIX}/lib" NO_DEFAULT_PATH REQUIRED | ||
| + ) | ||
| + find_library( | ||
| + CUDF_JAVA_FMT_STATIC NAMES libfmt.a | ||
| + PATHS "${CMAKE_INSTALL_PREFIX}/lib" NO_DEFAULT_PATH REQUIRED | ||
| + ) | ||
| + target_link_libraries( | ||
| + cudf | ||
| + PRIVATE | ||
| + "$<BUILD_INTERFACE:$<LINK_LIBRARY:WHOLE_ARCHIVE,${CUDF_JAVA_SPDLOG_STATIC}>>" | ||
| + "$<BUILD_INTERFACE:$<LINK_LIBRARY:WHOLE_ARCHIVE,${CUDF_JAVA_FMT_STATIC}>>" | ||
| + "$<INSTALL_INTERFACE:$<LINK_LIBRARY:WHOLE_ARCHIVE,$<INSTALL_PREFIX>/lib/libspdlog.a>>" | ||
| + "$<INSTALL_INTERFACE:$<LINK_LIBRARY:WHOLE_ARCHIVE,$<INSTALL_PREFIX>/lib/libfmt.a>>" | ||
| + ) | ||
| endif() | ||
| endif() |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.