Forward-merge branch-25.02 into branch-25.06 #2303
Merged
Conversation
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
* Update conda env files to ensure pulling pytorch from pypi Signed-off-by: Yuchen Zhang <[email protected]> * remove comments * update * WIP: Tue 03 Jun 2025 10:41:58 AM PDT Signed-off-by: Yuchen Zhang <[email protected]> * update doc * WIP: Tue 03 Jun 2025 11:03:14 AM PDT [skip ci] Signed-off-by: Yuchen Zhang <[email protected]> --------- Signed-off-by: Yuchen Zhang <[email protected]>
* Update dependencies for Morpheus `24.06` container (#2217) * Update conda env files to ensure pulling pytorch from pypi Signed-off-by: Yuchen Zhang <[email protected]> * remove comments * update * WIP: Tue 03 Jun 2025 10:41:58 AM PDT Signed-off-by: Yuchen Zhang <[email protected]> * update doc * WIP: Tue 03 Jun 2025 11:03:14 AM PDT [skip ci] Signed-off-by: Yuchen Zhang <[email protected]> --------- Signed-off-by: Yuchen Zhang <[email protected]> * Fix CR year Signed-off-by: David Gardner <[email protected]> * Update test runner Signed-off-by: David Gardner <[email protected]> * Update CR year Signed-off-by: David Gardner <[email protected]> * Remove broken link Signed-off-by: David Gardner <[email protected]> * Pin click version to avoid test breakage Signed-off-by: David Gardner <[email protected]> * Update CR Year Signed-off-by: David Gardner <[email protected]> * Pin setuptools Signed-off-by: David Gardner <[email protected]> * Pin numba to fix compat Signed-off-by: David Gardner <[email protected]> * Pin numba to fix compat Signed-off-by: David Gardner <[email protected]> * Move to examples section: Signed-off-by: David Gardner <[email protected]> --------- Signed-off-by: Yuchen Zhang <[email protected]> Signed-off-by: David Gardner <[email protected]> Co-authored-by: Yuchen Zhang <[email protected]>
* Update dependencies for Morpheus `24.06` container (#2217) * Update conda env files to ensure pulling pytorch from pypi * remove comments * update * WIP: Tue 03 Jun 2025 10:41:58 AM PDT * update doc * WIP: Tue 03 Jun 2025 11:03:14 AM PDT [skip ci] --------- * Fix CR year * Update test runner * Update CR year * Remove broken link * Pin click version to avoid test breakage * Update CR Year * Pin setuptools * Pin numba to fix compat * Pin numba to fix compat * Move to examples section: --------- Signed-off-by: Yuchen Zhang <[email protected]> Signed-off-by: David Gardner <[email protected]> Co-authored-by: Yuchen Zhang <[email protected]>
Signed-off-by: David Gardner <[email protected]>
Signed-off-by: David Gardner <[email protected]>
Signed-off-by: David Gardner <[email protected]>
## Description * Resolving conflicts from #2299 ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes.
Signed-off-by: David Gardner <[email protected]>
Signed-off-by: David Gardner <[email protected]>
Signed-off-by: David Gardner <[email protected]>
## Description * Manually resolving conflicts from #2301 ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes.
Contributor
Author
|
FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the |
Signed-off-by: David Gardner <[email protected]>
* Set GPU runner to an earlier driver version * Document #2305 as a known issue * Pin `npy-append-array` to avoid version conflict with nvtabular * Update rapids shared workflows to 24.10 to fix the check action * Pin click version to <8.2 to avoid #2219 * Ensure the logger is reset in `test_cli.py` ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes. Authors: - David Gardner (https://github.com/dagardner-nv) - https://github.com/Salonijain27 Approvers: - Will Killian (https://github.com/willkill07) URL: #2306
Signed-off-by: David Gardner <[email protected]>
Signed-off-by: David Gardner <[email protected]>
* Remove pin for npy-append-array, this work-around is not needed in 24.10 Signed-off-by: David Gardner <[email protected]> * Remove old 24.06 work-around Signed-off-by: David Gardner <[email protected]> * Pin the version of faiss to 1.9 to avoid a numpy dependency Signed-off-by: David Gardner <[email protected]> * Numba should be upper-cased Signed-off-by: David Gardner <[email protected]> * Remove npy-append-array pin from conda recipe Signed-off-by: David Gardner <[email protected]> --------- Signed-off-by: David Gardner <[email protected]>
Signed-off-by: David Gardner <[email protected]>
Signed-off-by: David Gardner <[email protected]>
## Description Manually resolving conflicts from #2308 ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes.
Signed-off-by: David Gardner <[email protected]>
github-project-automation
bot
moved this from Review - Ready for Review
to Done
in Morpheus Boards
This was referenced Sep 4, 2025
rapids-bot
bot
closed this pull request by merging all changes
into
branch-25.06
in
32b4d43
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Forward-merge triggered by push to branch-25.02 that creates a PR to keep branch-25.06 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.