Merge branch-24.08 into branch-24.10 #4565
Merged
Conversation
This file contains 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
rapidsai#4496 introduced a ceiling on `thriftpy2`. Context: rapidsai#4496 (comment) The bug that ceiling was added to avoid was fixed in v0.5.2 of `thriftpy2`, which was just released (rapidsai#4478 (comment)). This removes that, adding `!=` constraints to skip the 2 versions that `cugraph` was not compatible with. ## Notes for Reviewers ### Why not a floor? I'm proposing adding `!=` constraints to skip v0.5.0 and v0.5.1 to maximize `cugraph`'s compatibility with other environments... that'd allow it to be used in environments with `thriftpy2<0.5.0` and in environments with `thriftpy2>0.5.2`. Let me know if you'd prefer the simplicity of a floor like `>=0.5.2` instead. Authors: - James Lamb (https://github.com/jameslamb) - Ralph Liu (https://github.com/nv-rliu) Approvers: - Bradley Dice (https://github.com/bdice) - Ralph Liu (https://github.com/nv-rliu) - Rick Ratzel (https://github.com/rlratzel) URL: rapidsai#4521
… pyproject.toml's project.dependencies list (rapidsai#4530) This change ensures RAPIDS build backend writes the correct `cugraph-service-client` package in the `cugraph-service-server` wheel's dependencies metadata. Authors: - Paul Taylor (https://github.com/trxcllnt) Approvers: - Mike Sarahan (https://github.com/msarahan) URL: rapidsai#4530
This PR count the total number of triangles before testing it against the ground truth. It also remove an unnecessary sorting before testing. Authors: - Joseph Nke (https://github.com/jnke2016) Approvers: - Rick Ratzel (https://github.com/rlratzel) URL: rapidsai#4549
CI is currently blocked due to these tests failing. This PR disables the failing tests to unblock CI.
Contributes to rapidsai/build-planning#31 In short, RAPIDS DLFW builds want to produce wheels with unsuffixed dependencies, e.g. `cudf` depending on `rmm`, not `rmm-cu12`. This PR is part of a series across all of RAPIDS to try to support that type of build by setting up CUDA-suffixed and CUDA-unsuffixed dependency lists in `dependencies.yaml`. For more details, see: * rapidsai/build-planning#31 (comment) * rapidsai/cudf#16183 ## Notes for Reviewers ### Why target 24.08? This is targeting 24.08 because: 1. it should be very low-risk 2. getting these changes into 24.08 prevents the need to carry around patches for every library in DLFW builds using RAPIDS 24.08 Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Bradley Dice (https://github.com/bdice) URL: rapidsai#4552
jameslamb
added
improvement
bdice
approved these changes
Jul 30, 2024
| @@ -666,7 +674,7 @@ dependencies: | |||
| common: | |||
| - output_types: [conda] | |||
| packages: | |||
| - &pytorch_conda pytorch>=2.0,<2.2.0a0 | |||
| - &pytorch_unsuffixed pytorch>=2.0,<2.2.0a0 | |||
There was a problem hiding this comment.
Not sure if we discussed this in another PR (lost track) but we don’t need the suffix here.
Suggested change
| - &pytorch_unsuffixed pytorch>=2.0,<2.2.0a0 | |
| - &pytorch pytorch>=2.0,<2.2.0a0 |
There was a problem hiding this comment.
we definitely did! It must have been on a different PR (maybe wholegraph?). I agree, will fix this up in a follow-up PR.
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.
Replaces #4546
Fixes forward-merge conflicts, per the process described at https://docs.rapids.ai/maintainers/forward-merger/.
Tested to be sure I got everything like this:
git grep -E '24\.8|24\.08|0\.39'