-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #15449 from JuliaLang/teh/reshapedarrays2
ReshapedArrays, take2
- Loading branch information
Showing
26 changed files
with
268 additions
and
107 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| using Base.MultiplicativeInverses: SignedMultiplicativeInverse | ||
|
|
||
| immutable ReshapedArray{T,N,P<:AbstractArray,MI<:Tuple{Vararg{SignedMultiplicativeInverse{Int}}}} <: AbstractArray{T,N} | ||
| parent::P | ||
| dims::NTuple{N,Int} | ||
| mi::MI | ||
| end | ||
| ReshapedArray{T,N}(parent::AbstractArray{T}, dims::NTuple{N,Int}, mi) = ReshapedArray{T,N,typeof(parent),typeof(mi)}(parent, dims, mi) | ||
|
|
||
| # LinearFast ReshapedArray | ||
| typealias ReshapedArrayLF{T,N,P<:AbstractArray} ReshapedArray{T,N,P,Tuple{}} | ||
|
|
||
| # Fast iteration on ReshapedArrays: use the parent iterator | ||
| immutable ReshapedRange{I,M} | ||
| iter::I | ||
| mi::NTuple{M,SignedMultiplicativeInverse{Int}} | ||
| end | ||
| ReshapedRange(A::ReshapedArray) = reshapedrange(parent(A), A.mi) | ||
| function reshapedrange{M}(P, mi::NTuple{M}) | ||
| iter = eachindex(P) | ||
| ReshapedRange{typeof(iter),M}(iter, mi) | ||
| end | ||
|
|
||
| immutable ReshapedIndex{T} | ||
| parentindex::T | ||
| end | ||
|
|
||
| # eachindex(A::ReshapedArray) = ReshapedRange(A) # TODO: uncomment this line | ||
| start(R::ReshapedRange) = start(R.iter) | ||
| @inline done(R::ReshapedRange, i) = done(R.iter, i) | ||
| @inline function next(R::ReshapedRange, i) | ||
| item, inext = next(R.iter, i) | ||
| ReshapedIndex(item), inext | ||
| end | ||
| length(R::ReshapedRange) = length(R.iter) | ||
|
|
||
| function reshape(parent::AbstractArray, dims::Dims) | ||
| prod(dims) == length(parent) || throw(DimensionMismatch("parent has $(length(parent)) elements, which is incompatible with size $dims")) | ||
| _reshape((parent, linearindexing(parent)), dims) | ||
| end | ||
| reshape(R::ReshapedArray, dims::Dims) = reshape(R.parent, dims) | ||
| reshape(a::AbstractArray, len::Int) = reshape(a, (len,)) | ||
| reshape(a::AbstractArray, dims::Int...) = reshape(a, dims) | ||
|
|
||
| # When reshaping Vector->Vector, don't wrap with a ReshapedArray | ||
| reshape{T}(v::ReshapedArray{T,1}, dims::Tuple{Int}) = reshape(v.parent, dims[1]) | ||
| reshape(v::AbstractVector, dims::Tuple{Int}) = reshape(v, dims[1]) | ||
| function reshape(v::AbstractVector, len::Int) | ||
| len == length(v) || throw(DimensionMismatch("parent has $(length(v)) elements, which is incompatible with length $len")) | ||
| v | ||
| end | ||
|
|
||
| function _reshape(p::Tuple{AbstractArray,LinearSlow}, dims::Dims) | ||
| parent = p[1] | ||
| strds = front(size_strides(parent)) | ||
| strds1 = map(s->max(1,s), strds) # for resizing empty arrays | ||
| mi = map(SignedMultiplicativeInverse, strds1) | ||
| ReshapedArray(parent, dims, reverse(mi)) | ||
| end | ||
|
|
||
| function _reshape(p::Tuple{AbstractArray,LinearFast}, dims::Dims) | ||
| parent = p[1] | ||
| ReshapedArray(parent, dims, ()) | ||
| end | ||
|
|
||
| @inline size_strides(A::AbstractArray) = tail(size_strides((1,), size(A)...)) | ||
| size_strides(out::Tuple) = out | ||
| @inline size_strides(out, s, sz...) = size_strides((out..., out[end]*s), sz...) | ||
|
|
||
| size(A::ReshapedArray) = A.dims | ||
| size(A::ReshapedArray, d) = d <= ndims(A) ? A.dims[d] : 1 | ||
| similar(A::ReshapedArray, eltype::Type) = similar(parent(A), eltype, size(A)) | ||
| similar(A::ReshapedArray, eltype::Type, dims...) = similar(parent(A), eltype, dims...) | ||
| linearindexing{R<:ReshapedArrayLF}(::Type{R}) = LinearFast() | ||
| parent(A::ReshapedArray) = A.parent | ||
| parentindexes(A::ReshapedArray) = map(s->1:s, size(parent(A))) | ||
| reinterpret{T}(::Type{T}, A::ReshapedArray, dims::Dims) = reinterpret(T, parent(A), dims) | ||
|
|
||
| @inline ind2sub_rs(::Tuple{}, i::Int) = i | ||
| @inline ind2sub_rs(strds, i) = ind2sub_rs((), strds, i-1) | ||
| @inline ind2sub_rs(out, ::Tuple{}, ind) = (ind+1, out...) | ||
| @inline function ind2sub_rs(out, strds, ind) | ||
| d, r = divrem(ind, strds[1]) | ||
| ind2sub_rs((d+1, out...), tail(strds), r) | ||
| end | ||
|
|
||
| @inline getindex(A::ReshapedArrayLF, index::Int) = (@boundscheck checkbounds(A, index); @inbounds ret = parent(A)[index]; ret) | ||
| @inline getindex(A::ReshapedArray, indexes::Int...) = (@boundscheck checkbounds(A, indexes...); _unsafe_getindex(A, indexes...)) | ||
| @inline getindex(A::ReshapedArray, index::ReshapedIndex) = (@boundscheck checkbounds(parent(A), index.parentindex); @inbounds ret = parent(A)[index.parentindex]; ret) | ||
|
|
||
| @inline _unsafe_getindex(A::ReshapedArray, indexes::Int...) = (@inbounds ret = parent(A)[ind2sub_rs(A.mi, sub2ind(size(A), indexes...))...]; ret) | ||
| @inline _unsafe_getindex(A::ReshapedArrayLF, indexes::Int...) = (@inbounds ret = parent(A)[sub2ind(size(A), indexes...)]; ret) | ||
|
|
||
| @inline setindex!(A::ReshapedArrayLF, val, index::Int) = (@boundscheck checkbounds(A, index); @inbounds parent(A)[index] = val; val) | ||
| @inline setindex!(A::ReshapedArray, val, indexes::Int...) = (@boundscheck checkbounds(A, indexes...); _unsafe_setindex!(A, val, indexes...)) | ||
| @inline setindex!(A::ReshapedArray, val, index::ReshapedIndex) = (@boundscheck checkbounds(parent(A), index.parentindex); @inbounds parent(A)[index.parentindex] = val; val) | ||
|
|
||
| @inline _unsafe_setindex!(A::ReshapedArray, val, indexes::Int...) = (@inbounds parent(A)[ind2sub_rs(A.mi, sub2ind(size(A), indexes...))...] = val; val) | ||
| @inline _unsafe_setindex!(A::ReshapedArrayLF, val, indexes::Int...) = (@inbounds parent(A)[sub2ind(size(A), indexes...)] = val; val) | ||
|
|
||
| typealias ArrayT{N, T} Array{T,N} | ||
| convert{T,S,N}(::Type{Array{T,N}}, V::ReshapedArray{S,N}) = copy!(Array(T, size(V)), V) | ||
| convert{T,N}(::Type{ArrayT{N}}, V::ReshapedArray{T,N}) = copy!(Array(T, size(V)), V) | ||
|
|
||
| unsafe_convert{T}(::Type{Ptr{T}}, a::ReshapedArray{T}) = unsafe_convert(Ptr{T}, parent(a)) | ||
| unsafe_convert{T,N,P<:ReshapedArray,I<:Tuple{Vararg{Union{RangeIndex, NoSlice}}}}(::Type{Ptr{T}}, V::SubArray{T,N,P,I}) = | ||
| unsafe_convert(Ptr{T}, V.parent) + (first_index(V)-1)*sizeof(T) |
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
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
Oops, something went wrong.