Skip to content

Fix panama headers when RAPIDS_VERSION points to a PR branch #185

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.

Sign up for GitHub

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
imotov wants to merge 6 commits into from
Closed

Fix panama headers when RAPIDS_VERSION points to a PR branch #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e95eee3
Fix panama headers when RAPIDS_VERSION points to a PR branch
imotov Jul 28, 2026
13fba23
Fix RAPIDS_BRANCH
imotov Jul 28, 2026
d7b3973
Move handling of PRs into ci/build.sh
imotov Jul 28, 2026
d52f444
Fix conda remove command
imotov Jul 28, 2026
e42bee6
Fix RAPIDS_BRANCH
imotov Jul 29, 2026
941e78a
Merge branch 'release/26.08' into fix-panama-compilation-in-cuvs-pr-pull
imotov Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,7 @@ if hasArg --build-cuvs-java; then
pushd $CUVS_WORKDIR
fi

# libcuvs comes from the conda packages, so normally only the java bindings have
# to be built. For a pull request, the conda packages do not contain the PR's
# changes, so CI downloads the pre-built libcuvs artifact from the PR's own CI run.
CUVS_BUILD_TARGETS=("java")
if hasArg --use-pr-libcuvs && [[ "$BRANCH" == pull-request/* ]]; then
PR_NUM="${BRANCH#pull-request/}"
echo "Downloading libcuvs conda artifact from cuvs PR #${PR_NUM}..."
LIBCUVS_CONDA_DIR=$(rapids-get-pr-artifact NVIDIA/cuvs "$PR_NUM" cpp conda)
LIBCUVS_DIR=$(rapids-extract-conda-files "$LIBCUVS_CONDA_DIR")
# The downloaded library has to take precedence over the one provided by the
# conda packages, both here and while running the java tests.
LD_LIBRARY_PATH="$LIBCUVS_DIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
export LD_LIBRARY_PATH
echo "LD_LIBRARY_PATH is: $LD_LIBRARY_PATH"
fi
./build.sh "${CUVS_BUILD_TARGETS[@]}"
./build.sh java
popd
fi

Expand Down
26 changes: 21 additions & 5 deletions ci/build_java.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ fi
# Always build cuvs-java when running the pipeline
EXTRA_BUILD_ARGS+=("--build-cuvs-java")

# When RAPIDS_BRANCH points at a cuvs pull request, the libcuvs from the conda
# packages does not contain the PR's changes, so download the pre-built artifact
# from the PR's CI run instead. Only done in CI, local builds use the conda packages.
EXTRA_BUILD_ARGS+=("--use-pr-libcuvs")

# shellcheck disable=SC1091
. /opt/conda/etc/profile.d/conda.sh

Expand Down Expand Up @@ -66,6 +61,27 @@ else
exit 1
fi

# When RAPIDS_BRANCH points at a cuvs PR, the conda packages do not contain the
# PR's changes, so download the pre-built libcuvs artifact from the PR's own CI run.
BRANCH=$(cat "RAPIDS_BRANCH")
if [[ "$BRANCH" == pull-request/* ]]; then
rapids-logger "Remove libcuvs from conda environment"
# Uninstall the conda libcuvs so the JVM's RPATH (which points to the conda
# env's lib dir) cannot find the old libcuvs_c.so ahead of the PR artifact.
set +u
conda remove --yes --force-remove libcuvs
set -u
# Download PR artifact
PR_NUM="${BRANCH#pull-request/}"
rapids-logger "Downloading libcuvs conda artifact from cuvs PR #${PR_NUM}"
LIBCUVS_CONDA_DIR=$(rapids-get-pr-artifact NVIDIA/cuvs "$PR_NUM" cpp conda)
LIBCUVS_ARTIFACT_DIR=$(rapids-extract-conda-files "$LIBCUVS_CONDA_DIR")
# The PR artifact must take precedence over the conda-installed libcuvs both
# at runtime and for cmake's find_package (to pick up new C API headers for jextract).
export LD_LIBRARY_PATH="$LIBCUVS_ARTIFACT_DIR/lib:$LD_LIBRARY_PATH"
export cuvs_ROOT="$LIBCUVS_ARTIFACT_DIR"
fi

rapids-logger "Run Java build"

bash ./build.sh "${EXTRA_BUILD_ARGS[@]}"