Repository navigation
Forward merge branch-22.10 to branch-22.12 - #420
Merged
Merged
Conversation
Fixes rapidsai#397 Fixes rapidsai#395 * Symlinks top-level README and CHANGELOG into `python/cucim/` * Adds links to the developer page on PyPI and Anaconda * Also adds links for docs, source, etc. cc @grlee77 @gigony Authors: - https://github.com/jakirkham Approvers: - Gigon Bae (https://github.com/gigony) - Joseph (https://github.com/jolorunyomi) URL: rapidsai#415
…rable convolution (rapidsai#409) closes rapidsai#408 An error in the keyword arguments passed to the shared memory calculation is fixed in the first commit here. In the second commit, a second fallback is added in case of any other anticipated compilation failure. Authors: - Gregory Lee (https://github.com/grlee77) Approvers: - https://github.com/jakirkham - Gigon Bae (https://github.com/gigony) URL: rapidsai#409
closes rapidsai#193 This PR adds `cucim.skimage.feature.match_descriptors`. It is a very straightforward adaptation of the scikit-image code, only substituting numpy->cupy. The only differences of note are: - when new enough CuPy and pylibraft are not available it warns and falls back to `cdist` on the CPU - test cases involving BRIEF temporarily involve round trip to the host until we implement BRIEF here (looks not too hard) This PR also removes the deprecated `masked_register_translation` and `register_translation` (these were moved to cucim.skimage.registration.phase_cross_correlation`) from the `feature` module. Removing those was missed when previously updating the API here to match scikit-image 0.19. Authors: - Gregory Lee (https://github.com/grlee77) Approvers: - Gigon Bae (https://github.com/gigony) URL: rapidsai#338
…ai#378) This PR adds benchmarks for a few of the recently introduced functions. It also uses more realistic nD label object generation for the segmentation benchmarks. Authors: - Gregory Lee (https://github.com/grlee77) Approvers: - Gigon Bae (https://github.com/gigony) - https://github.com/jakirkham URL: rapidsai#378
Contributor
Author
|
@jakirkham, please review and merge when you get a chance, thanks |
jjacobelli
approved these changes
Oct 24, 2022
Contributor
Author
|
Thanks @ethyling, the forward merge docs state that one should change the merge strategy to "Create a Merge Commit" but I am not able to do this via the UI here. If I ask the gpuci bot to merge is it going to do the right thing, or is there another step needed? (not sure if the docs are up to date) |
This file contains hidden or 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
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.
Resolved the conflicts present in #416.