From cb5afa5636dab5264c29f23a72177f0b09d4fc52 Mon Sep 17 00:00:00 2001 From: Pablo Zubieta Date: Sat, 31 Dec 2016 01:43:31 -0600 Subject: [PATCH] Fix sparse methods --- base/sparse/higherorderfns.jl | 4 ++-- test/broadcast.jl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/sparse/higherorderfns.jl b/base/sparse/higherorderfns.jl index 2887eec75291e..fe7f78ac1352d 100644 --- a/base/sparse/higherorderfns.jl +++ b/base/sparse/higherorderfns.jl @@ -73,7 +73,7 @@ function _noshapecheck_map{Tf,N}(f::Tf, A::SparseVecOrMat, Bs::Vararg{SparseVecO fofzeros = f(_zeros_eltypes(A, Bs...)...) fpreszeros = fofzeros == zero(fofzeros) maxnnzC = fpreszeros ? min(length(A), _sumnnzs(A, Bs...)) : length(A) - entrytypeC = Base.Broadcast._broadcast_type(Any, f, A, Bs...) + entrytypeC = Base.Broadcast._broadcast_type(f, A, Bs...) indextypeC = _promote_indtype(A, Bs...) C = _allocres(size(A), indextypeC, entrytypeC, maxnnzC) return fpreszeros ? _map_zeropres!(f, C, A, Bs...) : @@ -101,7 +101,7 @@ function _diffshape_broadcast{Tf,N}(f::Tf, A::SparseVecOrMat, Bs::Vararg{SparseV fofzeros = f(_zeros_eltypes(A, Bs...)...) fpreszeros = fofzeros == zero(fofzeros) indextypeC = _promote_indtype(A, Bs...) - entrytypeC = Base.Broadcast._broadcast_type(Any, f, A, Bs...) + entrytypeC = Base.Broadcast._broadcast_type(f, A, Bs...) shapeC = to_shape(Base.Broadcast.broadcast_indices(A, Bs...)) maxnnzC = fpreszeros ? _checked_maxnnzbcres(shapeC, A, Bs...) : _densennz(shapeC) C = _allocres(shapeC, indextypeC, entrytypeC, maxnnzC) diff --git a/test/broadcast.jl b/test/broadcast.jl index 81dc6f8a424bf..66ec6effb07e5 100644 --- a/test/broadcast.jl +++ b/test/broadcast.jl @@ -413,5 +413,5 @@ end # broadcast should only "peel" one container level let io = IOBuffer() broadcast(x -> print(io, x), [Nullable(1.0)]) - String(take!(io)) == "Nullable{Float64}(1.0)" + @test String(take!(io)) == "Nullable{Float64}(1.0)" end