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

[REVIEW] Move DistanceType enum to RAFT #2918

Closed
wants to merge 16 commits into from

Conversation

wphicks
Copy link
Contributor

@wphicks wphicks commented Oct 5, 2020

Update all references from the DistanceType enum defined in cuML to the equivalent defined in RAFT. This change facilitates future re-use of this enum across Cython and prims code.

@wphicks wphicks requested review from a team as code owners October 5, 2020 15:18
@GPUtester
Copy link
Contributor

Please update the changelog in order to start CI tests.

View the gpuCI docs here.

@wphicks wphicks changed the title [FEA] Move DistanceType enum to RAFT [WIP] [FEA] Move DistanceType enum to RAFT Oct 5, 2020
@wphicks wphicks changed the title [WIP] [FEA] Move DistanceType enum to RAFT [WIP] Move DistanceType enum to RAFT Oct 5, 2020
@wphicks
Copy link
Contributor Author

wphicks commented Oct 5, 2020

Linked RAFT PR: rapidsai/raft#73

@wphicks wphicks changed the title [WIP] Move DistanceType enum to RAFT [REVIEW] Move DistanceType enum to RAFT Oct 5, 2020
@wphicks wphicks added the 3 - Ready for Review Ready for review by team label Oct 5, 2020
Copy link
Contributor

@JohnZed JohnZed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but can you target at 0.17 branch instead?

@divyegala
Copy link
Member

@wphicks @JohnZed sorry to butt in, but I just noticed it: can we use namespace raft::distance for this instead of raft::linalg? Just to be consistent with the namespace it was in before (MLCommon::Distance)

@wphicks
Copy link
Contributor Author

wphicks commented Oct 5, 2020

Yes of course! I'd actually meant to ask about what namespace made sense when I posted this. I'll update tomorrow.

@wphicks
Copy link
Contributor Author

wphicks commented Oct 5, 2020

Oh and yep, I'll update to target 0.17 as well.

@wphicks wphicks changed the base branch from branch-0.16 to branch-0.17 October 6, 2020 14:13
@wphicks wphicks added the RAFT Issue or PR is related to RAFT label Oct 6, 2020
Copy link
Member

@divyegala divyegala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes look mostly good to me, but let's run clang-tidy on the RAFT side of changes and cascade any naming convention diffs down here - I'll add the same comment there

cpp/src/kmeans/kmeans_mg_impl.cuh Show resolved Hide resolved
@dantegd dantegd removed the 3 - Ready for Review Ready for review by team label Oct 19, 2020
@wphicks
Copy link
Contributor Author

wphicks commented Oct 26, 2020

Looks like conda timed out in solving the environment. Retrying...

@wphicks
Copy link
Contributor Author

wphicks commented Oct 26, 2020

rerun tests

@codecov-io
Copy link

Codecov Report

Merging #2918 into branch-0.17 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           branch-0.17    #2918   +/-   ##
============================================
  Coverage        59.23%   59.23%           
============================================
  Files              142      142           
  Lines             8966     8966           
============================================
  Hits              5311     5311           
  Misses            3655     3655           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 70302e3...c2a2335. Read the comment docs.

@wphicks wphicks added 4 - Waiting on Reviewer Waiting for reviewer to review or respond and removed 4 - Waiting on Author Waiting for author to respond to review labels Oct 29, 2020
@wphicks
Copy link
Contributor Author

wphicks commented Oct 29, 2020

@divyegala This finally worked its way through CI (hooray!). Would you mind giving it one final review?

Copy link
Member

@divyegala divyegala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@wphicks
Copy link
Contributor Author

wphicks commented Oct 30, 2020

Took care of merge conflicts; no other changes

@wphicks
Copy link
Contributor Author

wphicks commented Nov 13, 2020

Merge conflicts were causing too many problems to easily track down. Closing in favor of #3141.

@wphicks wphicks closed this Nov 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4 - Waiting on Reviewer Waiting for reviewer to review or respond RAFT Issue or PR is related to RAFT
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants