Merge pull request #7061 from JuliaLang/dh/reduce3

Further refactoring of reduce/mapreduce functions
JuliaLang · Jun 2, 2014 · 4930f60 · 4930f60
2 parents 17b6262 + e8c3a8a
commit 4930f60
Show file tree

Hide file tree

Showing 3 changed files with 342 additions and 517 deletions.
diff --git a/base/linalg/dense.jl b/base/linalg/dense.jl
@@ -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)