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

Fix Forward-Merge Conflicts [skip ci] #1786

Merged
merged 5 commits into from
Aug 23, 2021

Conversation

ajschmidt8
Copy link
Member

This PR fixes the merge conflicts in CHANGELOG.md for the latest forward-merger PR.

raydouglass and others added 5 commits August 4, 2021 10:11
…apidsai#1773)

Added guards for preventing k-truss execution on CUDA 11.4 systems and the appropriate user-friendly messaging, along with a new unit test.
Also updated the k-truss notebook with a note about the unsupported CUDA version and a comment to skip automated tests on CUDA 11.4, along with updates to the notebook skip mechanism to also look at CUDA version.

Tested on a CUDA 11.2 system by changing the unsupported version to 11.2 to verify correct behavior.

Behavior on a CUDA 11.4 systems should be to allow cugraph to be imported as always, but if the user calls k_truss or kturss_subgraph, a NotImplementedError exception with "is not currently supported in CUDA 11.4 environments" message is raised. If the user directly imports the module (ie. from cugraph.community.ktruss_subgraph import k_truss), the exception is raised immediately.

Behavior on non-CUDA 11.4 systems should be exactly the same as prior to this change.
…ai#1777)

Updated to handle CUDA version check on machines with no GPUs. When no GPUs are present, cugraph can import and ktruss is available, which should match the original behavior prior to when the checks were added for disabling ktruss on CUDA 11.4

Tested by setting CUDA_VISIBLE_DEVICES to " ", verifying the expected exception was raised, made the change, then verified cugraph could be imported.
@ajschmidt8 ajschmidt8 requested review from a team as code owners August 23, 2021 13:56
@ajschmidt8 ajschmidt8 added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Aug 23, 2021
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@ajschmidt8 ajschmidt8 merged commit b3dfba3 into rapidsai:branch-21.10 Aug 23, 2021
@ajschmidt8 ajschmidt8 deleted the fix-changelogs branch August 23, 2021 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants