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

Branch 24.02 merge branch 23.12 #4012

Merged
merged 6 commits into from
Nov 20, 2023

Conversation

vyasr
Copy link
Contributor

@vyasr vyasr commented Nov 18, 2023

Replaces #3999

galipremsagar and others added 6 commits November 14, 2023 15:35
…ions (rapidsai#3991)

Currently dask versions are pinned as part of every release cycle and then unpinned for the next development cycle across all of RAPIDS. This introduces a great deal of churn. To centralize the dependency, we have created a metapackage to manage the required dask version and this PR introduces that metapackage as a dependency of cugraph.

xref: rapidsai/cudf#14364

Authors:
   - Chuck Hastings (https://github.com/ChuckHastings)
   - Rick Ratzel (https://github.com/rlratzel)
   - Vyas Ramasubramani (https://github.com/vyasr)
   - GALI PREM SAGAR (https://github.com/galipremsagar)
   - Naim (naim@uib.no)

Approvers:
   - Jake Awe (https://github.com/AyodeAwe)
…pidsai#4004)

This PR fixes some pinnings in cuGraph conda recipes. The problem is similar to that handled in rapidsai/cudf#14420. The `{{ version }}` variable can only be used to constrain conda packages built by CI workflows in the _same repository_ because `{{ version }}` includes information about the git commit. We must use `{{ minor_version }}` to constrain other RAPIDS packages. In cuGraph, that means that `pylibcugraphops` (which is built by the cugraph-ops repository) and `rapids-dask-dependency` must pin with `={{ minor_version }}` instead of `={{ version }}`.

Authors:
   - Bradley Dice (https://github.com/bdice)

Approvers:
   - GALI PREM SAGAR (https://github.com/galipremsagar)
   - Ray Douglass (https://github.com/raydouglass)
…ader (rapidsai#3978)

Fixes three major bugs:
1. Edge index is set to [dst, dst] instead of [dst, src] in some cases
2. The sample directory is always set to a new temporary directory rather than the path given
3. The version of `pylibcugraphops` in `meta.yaml` is wrong and causes the wrong packages to be resolved

This PR also simplifies `ci/test_python.sh` by doing only a single conda install when creating the `test_cugraph_pyg` environment.

Closes rapidsai#3959

Authors:
  - Alex Barghi (https://github.com/alexbarghi-nv)
  - Naim (https://github.com/naimnv)

Approvers:
  - Brad Rees (https://github.com/BradReesWork)
  - Ray Douglass (https://github.com/raydouglass)

URL: rapidsai#3978
RAPIDS currently relies on copies of CCCL headers bundled into rmm. This dependency is centralized by virtue of rmm installing these into the package and everything else finding those installed packages. To do this, however, rmm must be loaded first so that the libcudacxx install location is patched into CMake's search paths. cugraph also uses cuco, which requires libcudacxx but does not bundle its own, so rmm must be found first so that cuco can find libcudacxx where rmm installed it.

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

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

URL: rapidsai#4011
@vyasr vyasr added bug Something isn't working non-breaking Non-breaking change labels Nov 18, 2023
@vyasr vyasr self-assigned this Nov 18, 2023
@vyasr vyasr requested review from a team as code owners November 18, 2023 17:07
@vyasr vyasr added the DO NOT MERGE Hold off on merging; see PR for details label Nov 18, 2023
@AyodeAwe AyodeAwe merged commit 8e213ec into rapidsai:branch-24.02 Nov 20, 2023
71 of 74 checks passed
@vyasr vyasr deleted the branch-24.02-merge-branch-23.12 branch November 20, 2023 22:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working DO NOT MERGE Hold off on merging; see PR for details non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants