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

Jump to bottom

Sum zero-arrays #363

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Sum zero-arrays #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6da83c4
sum zero-arrays
mcabbott Jun 22, 2021
51c2552
max -> maximum
mcabbott Jun 22, 2021
ede96db
better way, allows init
mcabbott Jun 22, 2021
6bedf05
skip tests
mcabbott Jun 22, 2021
1a2af66
zero-dim printing?
mcabbott Jun 22, 2021
4dab8d2
don't forget the = sign
mcabbott Jun 22, 2021
8ded81e
old versions
mcabbott Jun 22, 2021
3c94d37
better bounds?
mcabbott Jun 22, 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: 2 additions & 0 deletions src/host/abstractarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ Base._show_empty(io::IO, X::AnyGPUArray) =
Base._show_empty(io, adapt(ToArray(), X))
Base.show_vector(io::IO, v::AnyGPUArray, args...) =
Base.show_vector(io, adapt(ToArray(), v), args...)
Base.show_zero_dim(io::IO, X::AnyGPUArray{T, 0}) where T =
Base.show_zero_dim(io, adapt(ToArray(), X))

## collect to CPU (discarding wrapper type)

Expand Down
3 changes: 3 additions & 0 deletions src/host/mapreduce.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,7 @@ for (fname, op) in [(:sum, :(Base.add_sum)), (:prod, :(Base.mul_prod)),
end
end

Base._mapreduce_dim(f, op, init, A::AnyGPUArray{<:Any,0}, ::Colon) = op(f(@allowscalar A[]), init)
Base._mapreduce_dim(f, op, ::Base._InitialValue, A::AnyGPUArray{<:Any,0}, ::Colon) = f(@allowscalar A[])

LinearAlgebra.ishermitian(A::AbstractGPUMatrix) = mapreduce(==, &, A, adjoint(A))
8 changes: 8 additions & 0 deletions test/testsuite/io.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,13 @@
@test occursin(Regex("^1×1 Adjoint{Int64,\\s?$AT{Int64,\\s?1}}:\n 1\$"), msg) ||
occursin(Regex("^1×1 LinearAlgebra.Adjoint{Int64,\\s?$AT{Int64,\\s?1}}:\n 1\$"), msg) ||
occursin(Regex("^1×1 adjoint\\(::$AT{Int64,\\s?1}\\) with eltype Int64:\n 1\$"), msg)

C = AT(fill(1))
msg = showstr(A)
if VERSION >= v"1.7-"
@test msg == "fill(1)"
else
@test msg == "[1]"
end
end
end
19 changes: 19 additions & 0 deletions test/testsuite/reductions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,22 @@ end
@test A != B
end
end

@testsuite "reductions/zero-arrays" AT->begin
@testset "$ET" for ET in supported_eltypes()
range = ET <: Real ? (ET(1):ET(10)) : ET
# sum
@test compare(A->sum(A), AT, reshape(rand(range, 1)))
@test compare(A->sum(abs, A), AT, reshape(rand(range, 1)))
if VERSION >= v"1.6"
@test compare(A->sum(A, init=ET(13)), AT, reshape(rand(range, 1)))
end
# other functions, defined together
@test compare(A->prod(A), AT, reshape(rand(range, 1)))
@test compare(A->any(_->true, A), AT, reshape(rand(range, 1)))
@test compare(A->all(_->false, A), AT, reshape(rand(range, 1)))
# zero-dimensional view
@test compare(A->sum(A), AT, view(rand(range, 3),2))
@test compare(A->prod(sqrt, A), AT, view(rand(range, 3),2))
end
end