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

Further refactoring of reduce/mapreduce functions #7061

Merged
merged 16 commits into from
Jun 2, 2014
Merged

Further refactoring of reduce/mapreduce functions #7061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
595c428
Refactoring of folding functions: `foldl`, `foldr`, `mapfoldl`, and `…
lindahua May 30, 2014
514683c
Merge branch 'master' into dh/reduce3
lindahua May 30, 2014
271d8a2
test mapfoldl and mapfoldr + a bug fix to mapfoldr
lindahua May 30, 2014
bc023fb
move mapreduce functions above
lindahua May 30, 2014
de8f672
generalize mapreduce (still need some tweaking ...)
lindahua May 30, 2014
bcfcfe0
fix a bug of mapreduce
lindahua May 31, 2014
f5fb96a
reduce implemented based on new mapreduce
lindahua May 31, 2014
5bf769a
sum functions implemented based on new mapreduce
lindahua May 31, 2014
5e0a762
prod functions implemented based on new mapreduce
lindahua May 31, 2014
78bbf10
maximum/minimum functions implemented based on new mapreduce
lindahua May 31, 2014
6024a32
move and/all codes above
lindahua May 31, 2014
80e8a28
reorganize tests for reduce
lindahua May 31, 2014
5336b78
and, or, count reimplemented using new paradigm
lindahua May 31, 2014
03746ef
tweak extrema
lindahua May 31, 2014
7828db5
a small fix of mapreduce function signature
lindahua May 31, 2014
e8c3a8a
small fix to extrema, now it correctly handles [NaN, ....]
lindahua Jun 1, 2014
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
9 changes: 4 additions & 5 deletions base/linalg/dense.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@ isposdef(x::Number) = imag(x)==0 && real(x) > 0
stride1(x::Array) = 1
stride1(x::StridedVector) = stride(x, 1)::Int

Base.sum_seq{T<:BlasFloat}(::Base.AbsFun, a::Union(Array{T},StridedVector{T}), ifirst::Int, ilast::Int) =
BLAS.asum(ilast-ifirst+1, pointer(a, ifirst), stride1(a))
import Base: mapreduce_seq_impl, AbsFun, Abs2Fun, AddFun

# This appears to show a benefit from a larger block size
Base.sum_pairwise_blocksize(::Base.Abs2Fun) = 4096
mapreduce_seq_impl{T<:BlasFloat}(::AbsFun, ::AddFun, a::Union(Array{T},StridedVector{T}), ifirst::Int, ilast::Int) =
BLAS.asum(ilast-ifirst+1, pointer(a, ifirst), stride1(a))

function Base.sum_seq{T<:BlasFloat}(::Base.Abs2Fun, a::Union(Array{T},StridedVector{T}), ifirst::Int, ilast::Int)
function mapreduce_seq_impl{T<:BlasFloat}(::Abs2Fun, ::AddFun, a::Union(Array{T},StridedVector{T}), ifirst::Int, ilast::Int)
n = ilast-ifirst+1
px = pointer(a, ifirst)
incx = stride1(a)
Expand Down
Loading