Skip to content
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

Forward-merge branch-24.10 into branch-24.12 #401

Closed
wants to merge 5 commits into from

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Sep 24, 2024

Forward-merge triggered by push to branch-24.10 that creates a PR to keep branch-24.12 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge. See forward-merger docs for more info.

trxcllnt and others added 5 commits September 19, 2024 11:00
* install
[`nv-gha-aws`](https://github.com/nv-gha-runners/gh-nv-gha-aws) CLI
extension
* use `nv-gha-aws` to generate credentials if `AWS_ROLE_ARN` is set
This fixes an issue where a submodule branch is not included in the
history of the default branch upon first clone (where the clone
recursively fetches the submodule) when the user passes the
`--single-branch` argument to `clone-*`.

---------

Co-authored-by: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
There have been a number of changes to RAPIDS builds over the course of
this release and not all changes were fully propagated to the
devcontainers repo. This repo addresses the following:
- As of rapidsai/kvikio#369, kvikio produces
wheels, and rapidsai/kvikio#439 contains
critical fixes that allow the kvikio Python wheel to use the C++
libkvikio wheel. In RAPIDS Python builds we have consistently removed
support for the Python build triggering the C++ build as we have created
C++ wheels since in both conda and pip environments we now expect the
library to be found and we do not need to automatically support the more
esoteric use case of someone turning off build isolation but not having
the C++ library available (devs can handle this case themselves if they
wish). As a result, once rapidsai/kvikio#466 is
merged, the `FIND_KVIKIO_CPP` variable will be completely superfluous
and we can remove that here.
- As of rapidsai/cudf#16640 libcudf no longer
links to libarrow and `USE_LIBARROW_FROM_PYARROW` is no longer used.
- The libcudf and libcuspatial Python package builds in the devcontainer
should (like all other Python packages) omit the CUDA version suffix.
For that, they need to use the `rapids_build_backend_args`.
I always forget this... For
#397 in this case.
Revert change to stop the sccache server between rebuilds.
@rapids-bot rapids-bot bot requested a review from a team as a code owner September 24, 2024 00:11
@rapids-bot rapids-bot bot requested review from KyleFromNVIDIA and removed request for a team September 24, 2024 00:11
Copy link
Author

rapids-bot bot commented Sep 24, 2024

FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/

IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the /merge comment). Instead, an admin must manually merge by changing the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

@trxcllnt trxcllnt closed this Sep 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants