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.08 into branch-24.10 #4546

Merged
merged 12 commits into from
Jul 30, 2024
Merged

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Jul 19, 2024

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

#4496 introduced a ceiling on `thriftpy2`. Context: #4496 (comment)

The bug that ceiling was added to avoid was fixed in v0.5.2 of `thriftpy2`, which was just released (#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: #4521
@rapids-bot rapids-bot bot requested a review from a team as a code owner July 19, 2024 23:55
@rapids-bot rapids-bot bot requested a review from bdice July 19, 2024 23:55
Copy link
Author

rapids-bot bot commented Jul 19, 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 and others added 2 commits July 23, 2024 02:00
… pyproject.toml's project.dependencies list (#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: #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: #4549
@rapids-bot rapids-bot bot requested a review from a team as a code owner July 24, 2024 09:04
alexbarghi-nv and others added 2 commits July 29, 2024 11:13
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: #4552
@jameslamb
Copy link
Member

Unable to forward-merge due to an error, manual merge is necessary.

Put up #4565 fixing the conflicts.

This PR leverages our existing edge triangle count to implement both SG and MG K-Truss as our initial version.
This PR also:

- Exposes the `rx count` in several as our shuffling functions
- Add C and C++ tests for MG K-Truss

Closes #4500

Authors:
  - Joseph Nke (https://github.com/jnke2016)
  - Brad Rees (https://github.com/BradReesWork)

Approvers:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)
  - Seunghwa Kang (https://github.com/seunghwak)
  - Chuck Hastings (https://github.com/ChuckHastings)

URL: #4375
seunghwak and others added 6 commits July 30, 2024 06:02
Closes #4554, user bug found building cugraph 24.10

Authors:
  - Seunghwa Kang (https://github.com/seunghwak)

Approvers:
  - Chuck Hastings (https://github.com/ChuckHastings)

URL: #4563
Tests were added to improve coverage. Perhaps we could/should upstream tests to networkx.

Authors:
  - Erik Welch (https://github.com/eriknw)
  - Ralph Liu (https://github.com/nv-rliu)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)

URL: #4537
…4550)

This fixes this: networkx/networkx#7466

We would catch this (and other changes) if we tested networkx nightlies. Someday!

I kept the buggy behavior for older versions of networkx in order to match networkx, which feels kinda silly, but also okay-ish.

Authors:
  - Erik Welch (https://github.com/eriknw)
  - Rick Ratzel (https://github.com/rlratzel)
  - Ralph Liu (https://github.com/nv-rliu)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)

URL: #4550
This does add new functionality (so it's not just sugar!), since dijstra methods have `cutoff=` arguments.

Note that we are missing multi-source dijstra methods, since `plc.sssp` only accepts a single source.

We also do not have `bidirectional_dijkstra`, since PLC does not implement this algorithm.

Authors:
  - Erik Welch (https://github.com/eriknw)
  - Rick Ratzel (https://github.com/rlratzel)
  - Ralph Liu (https://github.com/nv-rliu)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)

URL: #4538
This continues #4525 (and [this comment](#4525 (comment))) to avoid copies and to be more optimal whether using pandas, cudf, or cudf.pandas. Notably, using `s.to_numpy` with cudf will return a _numpy_ array, but `cudf.pandas` may return a _cupy_ array (proxy).

Also, `s.to_numpy(copy=False)` ([from comment](#4525 (comment))) is not used, b/c cudf's `to_numpy` raises if `copy=False`. We get the behavior we want by not specifying `copy=`.

I don't know if this is the best way to determine whether a copy occurred or not, but this seems like a useful pattern to establish, because we want to make ingest more efficient.

CC @rlratzel

Authors:
  - Erik Welch (https://github.com/eriknw)
  - Ralph Liu (https://github.com/nv-rliu)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)

URL: #4528
[This](rapidsai/cudf#16311) PR recently introduced some API changes that broke `test_katz_centrality_mg.py` because it was using an improper method of trying to evaluate a `cudf.DataFrame` to a truth value.


This PR adds a fix to check if the `nstart` argument is set to `None`.

Authors:
  - Ralph Liu (https://github.com/nv-rliu)

Approvers:
  - Rick Ratzel (https://github.com/rlratzel)

URL: #4555
@AyodeAwe AyodeAwe merged commit e9709f8 into branch-24.10 Jul 30, 2024
23 of 35 checks passed
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.

8 participants