Fix conflicts in 1643
#1651
Merged
Fix conflicts in 1643
#1651
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
Upgraded recipe and dev envs to NCCL 2.9.9. The `cugraph` python conda recipe previously included NCCL, but (I think) it's a transient dependency since `libcugraph` actually needs it, so it was removed from the `cugraph` recipe. cc @dantegd for consistency with cuML. Note: the NCCL 2.9.9 upgrade was tested during benchmark runs, but the conda recipe changes have not been tested. Authors: - Rick Ratzel (https://github.com/rlratzel) Approvers: - Jordan Jacobelli (https://github.com/Ethyling) - Chuck Hastings (https://github.com/ChuckHastings) - Seunghwa Kang (https://github.com/seunghwak) URL: #1636
This effort was originally targeted toward the WCC effort, but has been expanded a bit. This supersedes #1545 which I will close. The goal here is to create a means for constructing test graphs in an easier fashion. Testing the capabilities of different graph algorithms might require a variety of graphs. The objective of this PR is to better organize the graph generation components and to introduce some components to help in composing graphs out of multiple components. This PR introduces the following capabilities: * Create an ER graph * Create a collection of Complete Graphs * Create a collection of 2D mesh graphs * Create a collection of 3D mesh graphs * Create a random path graph (connect all vertices with a single randomly ordered path) * Translate vertex ids of a graph * Combine multiple edge lists into a single graph Closes #1543 Authors: - Chuck Hastings (https://github.com/ChuckHastings) Approvers: - Andrei Schaffer (https://github.com/aschaffer) - Brad Rees (https://github.com/BradReesWork) URL: #1603
Closes #1579 Authors: - https://github.com/Iroy30 - Brad Rees (https://github.com/BradReesWork) Approvers: - Brad Rees (https://github.com/BradReesWork) - Andrei Schaffer (https://github.com/aschaffer) - Rick Ratzel (https://github.com/rlratzel) - Joseph Nke (https://github.com/jnke2016) - Chuck Hastings (https://github.com/ChuckHastings) URL: #1599
Should be merged after PR #1636. - Undo NCCL 2.9.6 bug workarounds. - MG WCC weak scaling improvements. Authors: - Seunghwa Kang (https://github.com/seunghwak) - Rick Ratzel (https://github.com/rlratzel) Approvers: - Andrei Schaffer (https://github.com/aschaffer) - Chuck Hastings (https://github.com/ChuckHastings) - Rick Ratzel (https://github.com/rlratzel) URL: #1628
…1648) Made call to cugraph.random_walks() ignore the unused return value. Manually tested in browser with jupyterlab. Author: - Rick Ratzel (https://github.com/rlratzel) Approvers: - Brad Rees (https://github.com/BradReesWork) - AJ Schmidt (https://github.com/ajschmidt8) URL: #1648
Author: - Peter Andreas Entschev (https://github.com/pentschev) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) - Rick Ratzel (https://github.com/rlratzel) - Brad Rees (https://github.com/BradReesWork) URL: #1649
ajschmidt8
added
improvement
|
Check out this pull request on See visual diffs & provide feedback on Jupyter Notebooks. Powered by ReviewNB |
BradReesWork
approved these changes
Jun 7, 2021
rlratzel
approved these changes
Jun 7, 2021
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.
This PR fixes the conflicts in #1643.
In particular, the following files had conflicts that I resolved:
conda/environments/cugraph_dev_cuda11.0.ymlconda/environments/cugraph_dev_cuda11.1.ymlconda/environments/cugraph_dev_cuda11.2.ymlconda/recipes/cugraph/meta.yaml