port restrict from Images
#59
Merged
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
johnnychen94
commented
Aug 20, 2021
| restrict(img::AxisArray, ::Tuple{}) = img | ||
|
|
||
| function restrict(img::AxisArray, region::Dims) | ||
| inregiont = ntuple(i->in(i, region), ndims(img)) |
There was a problem hiding this comment.
Originally this is:
- inregiont = ntuple(i->in(i, region), ndims(img))
+ inregion = falses(ndims(img))
+ inregion[[region...]] .= true
+ inregiont = (inregion...,)::NTuple{ndims(img),Bool}It's more efficient to use ntuple here:
imgcol = rand(RGB{Float64}, 5, 6)
imgcolax = AxisArray(imgcol, :y, :x)
@btime restrict($imgcolax, (1,2))
# before: 965.077 ns (18 allocations: 1.62 KiB)
# after: 690.381 ns (12 allocations: 1.33 KiB)
There was a problem hiding this comment.
Yeah, it's funny looking at old code I wrote! 😆 Thanks for cleaning this up.
timholy
approved these changes
Aug 20, 2021
| ImageCore = "0.8.1, 0.9" | ||
| Reexport = "0.2, 1.0" | ||
| SimpleTraits = "0.8, 0.9" | ||
| julia = "1" | ||
|
|
||
| [extras] | ||
| ColorVectorSpace = "c3611d14-8923-5661-9e6a-0046d554d3a4" |
There was a problem hiding this comment.
ColorVectorSpace is already loaded by ImageCore 0.9. Perhaps we should just standardize on 0.9? Or is it transitionally useful to bridge the gap? (I'm fine with this if so, it's a very minor point.)
There was a problem hiding this comment.
Yes, I just planned to set all our packages on top of ImageCore 0.9 and drop compatibilities with old versions JuliaImages/Images.jl#972.
Will do this in the next PR.
| restrict(img::AxisArray, ::Tuple{}) = img | ||
|
|
||
| function restrict(img::AxisArray, region::Dims) | ||
| inregiont = ntuple(i->in(i, region), ndims(img)) |
There was a problem hiding this comment.
Yeah, it's funny looking at old code I wrote! 😆 Thanks for cleaning this up.
3 tasks
johnnychen94
added a commit
to JuliaImages/Images.jl
that referenced
this pull request
Oct 31, 2021
We used to host `restrict` in ImageTransformations, which is a big dependency for ImageAxes and ImageMetadata. Thus specialized `restrict` methods for those data types are kept in Images. Now that we have `restrict` in ImageBase, we can move these specialized methods to ImageAxes and ImageMetadata. This commit requires three new versions: - ImageBase v0.1.2: this version fixes some of old `restrict` type inferrence issues. - ImageAxes v0.6.9: JuliaImages/ImageAxes.jl#59 - ImageMetadata v0.9.7: JuliaImages/ImageMetadata.jl#79 AxisArrays is no longer needed because the method is moved to ImageAxes. ImageTransformations <v0.9 compatibility is dropped so that we can avoid symbol conflict on `restrict`.
johnnychen94
added a commit
to johnnychen94/Images.jl
that referenced
this pull request
May 21, 2022
We used to host `restrict` in ImageTransformations, which is a big dependency for ImageAxes and ImageMetadata. Thus specialized `restrict` methods for those data types are kept in Images. Now that we have `restrict` in ImageBase, we can move these specialized methods to ImageAxes and ImageMetadata. This commit requires three new versions: - ImageBase v0.1.2: this version fixes some of old `restrict` type inferrence issues. - ImageAxes v0.6.9: JuliaImages/ImageAxes.jl#59 - ImageMetadata v0.9.7: JuliaImages/ImageMetadata.jl#79 AxisArrays is no longer needed because the method is moved to ImageAxes. ImageTransformations <v0.9 compatibility is dropped so that we can avoid symbol conflict on `restrict`.
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
With
restrictnow moved to ImageBase, it's possible to port the glue codes from Images.jl to this package and ImageMetadata.