Skip to content

Forward-merge branch-24.06 into branch-24.08#4476

Merged
raydouglass merged 2 commits intobranch-24.08from
branch-24.06
Jun 24, 2024
Merged

Forward-merge branch-24.06 into branch-24.08#4476
raydouglass merged 2 commits intobranch-24.08from
branch-24.06

Conversation

@rapids-bot
Copy link
Copy Markdown
Contributor

@rapids-bot rapids-bot Bot commented Jun 10, 2024

Forward-merge triggered by push to branch-24.06 that creates a PR to keep branch-24.08 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.

Addresses #4474 

Currently `openmpi=5.0.3-hfd7b305_105` is blocking our CI `cpp_build`
job.

Most likely introduced by this PR:
conda-forge/openmpi-feedstock#158

This PR will unblock cugraph development until the issues are fixed.
Once that happens, the version pinning should be removed.
@rapids-bot rapids-bot Bot requested a review from a team as a code owner June 10, 2024 14:54
@rapids-bot rapids-bot Bot requested a review from bdice June 10, 2024 14:54
@github-actions github-actions Bot added the conda label Jun 10, 2024
@rapids-bot
Copy link
Copy Markdown
Contributor Author

rapids-bot Bot commented Jun 10, 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.

PyTorch 2.2+ is incompatible with the NCCL version on our containers.
Normally, this would not be an issue, but there is a bug in CuPy that
loads the system NCCL instead of the user NCCL. This PR binds the
PyTorch test dependency version to get around this issue.

---------

Co-authored-by: Bradley Dice <bdice@bradleydice.com>
Co-authored-by: Ralph Liu <137829296+nv-rliu@users.noreply.github.com>
Co-authored-by: James Lamb <jlamb@nvidia.com>
@raydouglass raydouglass requested review from a team as code owners June 13, 2024 17:22
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 70.00000% with 3 lines in your changes missing coverage. Please review.

Please upload report for BASE (branch-24.08@286591e). Learn more about missing BASE report.

Files Patch % Lines
...n/cugraph/cugraph/gnn/data_loading/dist_sampler.py 70.00% 3 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff               @@
##             branch-24.08    #4476   +/-   ##
===============================================
  Coverage                ?   65.41%           
===============================================
  Files                   ?      217           
  Lines                   ?    14875           
  Branches                ?        0           
===============================================
  Hits                    ?     9731           
  Misses                  ?     5144           
  Partials                ?        0           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Copy Markdown
Member

@alexbarghi-nv alexbarghi-nv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@nv-rliu
Copy link
Copy Markdown
Contributor

nv-rliu commented Jun 19, 2024

@raydouglass Can this be closed now that #4489 has been merged?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants