Skip to content

Remove CombineInit #77

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

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

Remove CombineInit #77

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
938895b
Remove CombineInit
tkf Apr 28, 2021
7f8be4b
Coalesced reduction using shfl
tkf Apr 27, 2021
9da9c87
Merge branch 'master' into shfl
tkf Jul 19, 2021
9479be5
Merge branch 'shfl' into rm-CombineInit
tkf Jul 19, 2021
645fd8f
Remove CombineInit from transduce_shfl_impl
tkf Apr 28, 2021
db4737d
Merge commit '5aab516' into rm-CombineInit
tkf Jul 20, 2021
07d4129
Merge branch 'master' into rm-CombineInit
tkf Jul 20, 2021
3993e16
No need to check start(rf, init) === init
tkf Jul 20, 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
7 changes: 2 additions & 5 deletions src/kernels.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function transduce_impl(rf::F, init, arrays...) where {F}
length(ys) == 1 && return @allowscalar ys[1]
rf2 = AlwaysCombine(rf)
while true
ys, = _transduce!(buf, rf2, CombineInit(), ys)
ys, = _transduce!(buf, rf2, init, ys)
# @info "ys, = _transduce!(buf, rf2, ...)" Text(summary(ys))
# @info "ys, = _transduce!(buf, rf2, ...)" collect(ys)
length(ys) == 1 && return @allowscalar ys[1]
Expand Down Expand Up @@ -282,8 +282,6 @@ function transduce_kernel!(
return
end

struct CombineInit end

struct AlwaysCombine{I} <: AbstractReduction{I}
inner::I
end
Expand All @@ -293,8 +291,7 @@ AlwaysCombine(rf::Transducers.R_{Map}) = AlwaysCombine(Transducers.inner(rf))
AlwaysCombine(rf::Transducers.BottomRF) = AlwaysCombine(Transducers.inner(rf))
=#

@inline Transducers.start(::AlwaysCombine, init::CombineInit) = init
@inline Transducers.next(::AlwaysCombine, ::CombineInit, input) = first(input)
@inline Transducers.start(rf::AlwaysCombine, init) = start(rf.inner, init)
@inline Transducers.next(rf::F, acc, input) where {F<:AlwaysCombine} =
_combine(rf.inner, acc, first(input))
@inline Transducers.complete(rf::F, result) where {F<:AlwaysCombine} =
Expand Down
4 changes: 1 addition & 3 deletions src/shfl.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,8 @@ function transduce_shfl_impl(rf::F, init, arrays...) where {F}
# @info "ys, = transduce_shfl!(nothing, rf, ...)" collect(ys)
length(ys) == 1 && return @allowscalar ys[1]
rf2 = AlwaysCombine(rf)
combine_init = init # require type-stable init
@assert start(rf, init) === init
while true
ys, = transduce_shfl!(buf, rf2, combine_init, ys)
ys, = transduce_shfl!(buf, rf2, init, ys)
# @info "ys, = transduce_shfl!(buf, rf2, ...)" Text(summary(ys))
# @info "ys, = transduce_shfl!(buf, rf2, ...)" collect(ys)
length(ys) == 1 && return @allowscalar ys[1]
Expand Down