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

add copy and othe single arg methods to force dispatch on parent type #13

Merged
merged 2 commits into from
Oct 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/array.jl
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Base.@propagate_inbounds Base.view(A::AbDimArray, I::Vararg{<:StandardIndices})
Base.convert(::Type{Array{T,N}}, A::AbDimArray{T,N}) where {T,N} =
convert(Array{T,N}, parent(A))

Base.copy(A::AbDimArray) = rebuild(A, copy(parent(A)))
Base.copy!(dst::AbDimArray, src::AbDimArray) = copy!(parent(src), parent(dst))

# Similar. TODO this need a rethink. How do we know what the new dims are?
Expand Down
3 changes: 3 additions & 0 deletions src/methods.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
for (mod, fname) in ((:Base, :sum), (:Base, :prod), (:Base, :maximum), (:Base, :minimum), (:Statistics, :mean))
_fname = Symbol('_', fname)
@eval begin
@inline ($mod.$fname)(A::AbDimArray) = ($mod.$fname)(parent(A))
@inline ($mod.$_fname)(A::AbstractArray, dims::AllDimensions) =
rebuild(A, ($mod.$_fname)(parent(A), dimnum(A, dims)), reducedims(A, dims))
@inline ($mod.$_fname)(f, A::AbstractArray, dims::AllDimensions) =
Expand All @@ -16,13 +17,15 @@ end
for fname in (:std, :var)
_fname = Symbol('_', fname)
@eval begin
@inline (Statistics.$fname)(A::AbDimArray) = (Statistics.$fname)(parent(A))
@inline (Statistics.$_fname)(A::AbstractArray, corrected::Bool, mean, dims::AllDimensions) =
rebuild(A, (Statistics.$_fname)(A, corrected, mean, dimnum(A, dims)), reducedims(A, dims))
@inline (Statistics.$_fname)(A::AbDimArray, corrected::Bool, mean, dims::Union{Int,Base.Dims}) =
rebuild(A, (Statistics.$_fname)(parent(A), corrected, mean, dims), reducedims(A, dims))
end
end

Statistics.median(A::AbDimArray) = Statistics.median(parent(A))
Statistics._median(A::AbstractArray, dims::AllDimensions) =
rebuild(A, Statistics._median(parent(A), dimnum(A, dims)), reducedims(A, dims))
Statistics._median(A::AbDimArray, dims::Union{Int,Base.Dims}) =
Expand Down
36 changes: 21 additions & 15 deletions test/benchmarks.jl
Original file line number Diff line number Diff line change
Expand Up @@ -85,26 +85,32 @@ println("reverse: normal, numbers + rebuild, dims + rebuild")
@btime reverse($da; dims=1)
@btime reverse($da; dims=Y())

# Sparse
using SparseArrays, Statistics
# Sparse (and similar specialised arrays)

@dim Var "Variable"
@dim Obs "Observation"

sparsear = sprand(10000, 10000, 0.1)
sparsed = DimensionalArray(
sparsear,
(Var <| ["var$i" for i in 1:10000], Obs <| ["obs$i" for i in 1:10000])
)
sparse_a = sprand(1000, 1000, 0.1)
sparse_d = DimensionalArray(sparse_a, (Var <| 1:1000, Obs <| 1:1000))

# Jit warmups
mean(sparsear, dims=1)
mean(sparsear, dims=2)
mean(sparsed, dims=Var())
mean(sparsed, dims=Obs())
mean(sparse_a, dims=1)
mean(sparse_a, dims=2)
mean(sparse_d, dims=Var())
mean(sparse_d, dims=Obs())

# Benchmarks
println("Regular sparse")
@btime mean($sparsear, dims=$1)
println("Dims sparse")
@btime mean($sparsed, dims=$Var)
println("mean with dims arge: regular sparse")
@btime mean($sparse_a, dims=$1)
println("mean with dims arge: dims sparse")
@btime mean($sparse_d, dims=$(Var()))

println("mean: regular sparse")
@btime mean($sparse_a)
println("mean: dims sparse")
@btime mean($sparse_d)

println("copy: regular sparse")
@btime copy($sparse_a)
println("copy: dims sparse")
@btime copy($sparse_d)
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using DimensionalData, Statistics, Test, BenchmarkTools, Unitful
using DimensionalData, Statistics, Test, BenchmarkTools, Unitful, SparseArrays

using DimensionalData: val, basetype, slicedims, dims2indices, formatdims,
@dim, reducedims, dimnum, basetype, X, Y, Z, Time, Forward
Expand Down