Skip to content

Commit cb5afa5

Browse files
committed
Fix sparse methods
1 parent ce7ebeb commit cb5afa5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

base/sparse/higherorderfns.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function _noshapecheck_map{Tf,N}(f::Tf, A::SparseVecOrMat, Bs::Vararg{SparseVecO
7373
fofzeros = f(_zeros_eltypes(A, Bs...)...)
7474
fpreszeros = fofzeros == zero(fofzeros)
7575
maxnnzC = fpreszeros ? min(length(A), _sumnnzs(A, Bs...)) : length(A)
76-
entrytypeC = Base.Broadcast._broadcast_type(Any, f, A, Bs...)
76+
entrytypeC = Base.Broadcast._broadcast_type(f, A, Bs...)
7777
indextypeC = _promote_indtype(A, Bs...)
7878
C = _allocres(size(A), indextypeC, entrytypeC, maxnnzC)
7979
return fpreszeros ? _map_zeropres!(f, C, A, Bs...) :
@@ -101,7 +101,7 @@ function _diffshape_broadcast{Tf,N}(f::Tf, A::SparseVecOrMat, Bs::Vararg{SparseV
101101
fofzeros = f(_zeros_eltypes(A, Bs...)...)
102102
fpreszeros = fofzeros == zero(fofzeros)
103103
indextypeC = _promote_indtype(A, Bs...)
104-
entrytypeC = Base.Broadcast._broadcast_type(Any, f, A, Bs...)
104+
entrytypeC = Base.Broadcast._broadcast_type(f, A, Bs...)
105105
shapeC = to_shape(Base.Broadcast.broadcast_indices(A, Bs...))
106106
maxnnzC = fpreszeros ? _checked_maxnnzbcres(shapeC, A, Bs...) : _densennz(shapeC)
107107
C = _allocres(shapeC, indextypeC, entrytypeC, maxnnzC)

test/broadcast.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,5 +413,5 @@ end
413413
# broadcast should only "peel" one container level
414414
let io = IOBuffer()
415415
broadcast(x -> print(io, x), [Nullable(1.0)])
416-
String(take!(io)) == "Nullable{Float64}(1.0)"
416+
@test String(take!(io)) == "Nullable{Float64}(1.0)"
417417
end

0 commit comments

Comments
 (0)