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.

Sign up for GitHub

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

Cleaning up indexing and dimension mapping code. #181

Merged
merged 7 commits into from
Aug 7, 2021
Merged

Cleaning up indexing and dimension mapping code. #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
107e041
Clean up index-dims mapping
Tokazama Aug 2, 2021
0e09c73
Clean up dimension/indexing related code/docs
Tokazama Aug 2, 2021
6f005e1
Lispy approach to ndims on tuple of inds
Tokazama Aug 3, 2021
2dbb3db
Drop support for contectual index mapping for now.
Tokazama Aug 4, 2021
11f8727
Clean up and more tests
Tokazama Aug 4, 2021
266f138
version bump
Tokazama Aug 6, 2021
12fc825
Merge branch 'master' into dim-api
Tokazama Aug 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ArrayInterface.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,9 +662,9 @@ function _is_lazy_conjugate(::Type{T}, isconj) where {T <: Adjoint}
end

include("ranges.jl")
include("dimensions.jl")
include("axes.jl")
include("size.jl")
include("dimensions.jl")
include("indexing.jl")
include("stridelayout.jl")
include("broadcast.jl")
Expand Down
39 changes: 26 additions & 13 deletions src/dimensions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,22 @@ function is_increasing(perm::Tuple{StaticInt{X},StaticInt{Y}}) where {X, Y}
end
is_increasing(::Tuple{StaticInt{X}}) where {X} = True()

#=
ndims_index(::Type{I})::StaticInt

The number of dimensions an instance of `I` maps to when indexing an instance of `A`.
=#
ndims_index(i) = ndims_index(typeof(i))
ndims_index(::Type{I}) where {I} = static(1)
ndims_index(::Type{I}) where {N,I<:AbstractCartesianIndex{N}} = static(N)
ndims_index(::Type{I}) where {I<:AbstractArray} = ndims_index(eltype(I))
ndims_index(::Type{I}) where {I<:AbstractArray{Bool}} = static(ndims(I))
ndims_index(::Type{I}) where {N,I<:LogicalIndex{<:Any,<:AbstractArray{Bool,N}}} = static(N)
_ndims_index(::Type{I}, i::StaticInt) where {I} = ndims_index(_get_tuple(I, i))
ndims_index(::Type{I}) where {N,I<:Tuple{Vararg{Any,N}}} = eachop(_ndims_index, nstatic(Val(N)), I)

"""
from_parent_dims(::Type{T}) -> Tuple
from_parent_dims(::Type{T})::Tuple{Vararg{Union{Int,StaticInt}}}

Returns the mapping from parent dimensions to child dimensions.
"""
Expand All @@ -37,17 +51,16 @@ from_parent_dims(::Type{<:SubArray{T,N,A,I}}) where {T,N,A,I} = _from_sub_dims(A
dim_i = 1
for i in 1:ndims(A)
p = I.parameters[i]
if argdims(A, p) > 0
if p <: Integer
push!(out.args, :(StaticInt(0)))
else
push!(out.args, :(StaticInt($dim_i)))
dim_i += 1
else
push!(out.args, :(StaticInt(0)))
end
end
out
end
from_parent_dims(::Type{<:PermutedDimsArray{T,N,<:Any,I}}) where {T,N,I} = static(Val(I))

function from_parent_dims(::Type{R}) where {T,N,S,A,R<:ReinterpretArray{T,N,S,A}}
if !_is_reshaped(R) || sizeof(S) === sizeof(T)
return nstatic(Val(ndims(A)))
Expand All @@ -59,7 +72,7 @@ function from_parent_dims(::Type{R}) where {T,N,S,A,R<:ReinterpretArray{T,N,S,A}
end

"""
from_parent_dims(::Type{T}, dim) -> Integer
from_parent_dims(::Type{T}, dim)::Union{Int,StaticInt}

Returns the mapping from child dimensions to parent dimensions.
"""
Expand All @@ -85,7 +98,7 @@ function from_parent_dims(::Type{T}, ::StaticInt{dim}) where {T,dim}
end

"""
to_parent_dims(::Type{T}) -> Tuple
to_parent_dims(::Type{T})::Tuple{Vararg{Union{Int,StaticInt}}}

Returns the mapping from child dimensions to parent dimensions.
"""
Expand All @@ -98,7 +111,7 @@ to_parent_dims(::Type{<:SubArray{T,N,A,I}}) where {T,N,A,I} = _to_sub_dims(A, I)
out = Expr(:tuple)
n = 1
for p in I.parameters
if argdims(A, p) > 0
if !(p <: Integer)
push!(out.args, :(StaticInt($n)))
end
n += 1
Expand All @@ -117,7 +130,7 @@ function to_parent_dims(::Type{R}) where {T,N,S,A,R<:ReinterpretArray{T,N,S,A}}
end

"""
to_parent_dims(::Type{T}, dim) -> Integer
to_parent_dims(::Type{T}, dim)::Union{Int,StaticInt}

Returns the mapping from child dimensions to parent dimensions.
"""
Expand All @@ -143,7 +156,7 @@ function to_parent_dims(::Type{T}, ::StaticInt{dim}) where {T,dim}
end

"""
has_dimnames(::Type{T}) -> Bool
has_dimnames(::Type{T})::Bool

Returns `true` if `x` has names for each dimension.
"""
Expand All @@ -160,8 +173,8 @@ end
const SUnderscore = StaticSymbol(:_)

"""
dimnames(::Type{T}) -> Tuple{Vararg{StaticSymbol}}
dimnames(::Type{T}, dim) -> StaticSymbol
dimnames(::Type{T})::Tuple{Vararg{StaticSymbol}}
dimnames(::Type{T}, dim)::StaticSymbol

Return the names of the dimensions for `x`.
"""
Expand Down Expand Up @@ -191,7 +204,7 @@ function dimnames(::Type{T}) where {T<:SubArray}
end

"""
to_dims(::Type{T}, dim) -> Integer
to_dims(::Type{T}, dim)::Union{Int,StaticInt}

This returns the dimension(s) of `x` corresponding to `d`.
"""
Expand Down
Loading