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

Jump to bottom

don't materialize when broadcasting Zeros with Vector #211

Merged
merged 6 commits into from
Apr 18, 2023
Merged

don't materialize when broadcasting Zeros with Vector #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd72d42
don't materialize when broadcasting Zeros with Vector
jishnub Mar 6, 2023
d3474ec
fix method overwrite
jishnub Mar 17, 2023
ef6da45
fix type signature
jishnub Mar 17, 2023
de44143
version bump to v0.13.9
jishnub Mar 17, 2023
073c6b6
Merge branch 'master' into broadcastedvector
jishnub Mar 28, 2023
7bfe07b
Add tests
jishnub Apr 14, 2023
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
19 changes: 13 additions & 6 deletions src/fillbroadcast.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,21 +202,28 @@ _copy_oftype(A::AbstractArray{T,N}, ::Type{S}) where {T,N,S} = convert(AbstractA
_copy_oftype(A::AbstractRange{T}, ::Type{T}) where T = copy(A)
_copy_oftype(A::AbstractRange{T}, ::Type{S}) where {T,S} = map(S, A)

for op in (:+, -)
for op in (:+, :-)
@eval begin
function broadcasted(::DefaultArrayStyle{1}, ::typeof($op), a::AbstractVector{T}, b::ZerosVector{V}) where {T,V}
function broadcasted(::DefaultArrayStyle{1}, ::typeof($op), a::AbstractRange{T}, b::ZerosVector{V}) where {T,V}
broadcast_shape(axes(a), axes(b)) == axes(a) || throw(ArgumentError("Cannot broadcast $a and $b. Convert $b to a Vector first."))
_copy_oftype(a, promote_type(T,V))
end
function broadcasted(::DefaultArrayStyle{1}, ::typeof($op), a::AbstractVector{T}, b::ZerosVector{V}) where {T,V}
broadcast_shape(axes(a), axes(b)) == axes(a) || throw(ArgumentError("Cannot broadcast $a and $b. Convert $b to a Vector first."))
TT = promote_type(T,V)
broadcasted(TT∘$op, a)
end

broadcasted(::DefaultArrayStyle{1}, ::typeof($op), a::AbstractFill{T,1}, b::ZerosVector) where T =
broadcasted(::DefaultArrayStyle{1}, ::typeof($op), a::AbstractFillVector{T}, b::ZerosVector) where T =
Base.invoke(broadcasted, Tuple{DefaultArrayStyle, typeof($op), AbstractFill, AbstractFill}, DefaultArrayStyle{1}(), $op, a, b)
end
end

function broadcasted(::DefaultArrayStyle{1}, ::typeof(+), a::ZerosVector{T}, b::AbstractVector{V}) where {T,V}
broadcast_shape(axes(a), axes(b))
_copy_oftype(b, promote_type(T,V))
function broadcasted(S::DefaultArrayStyle{1}, ::typeof(+), a::ZerosVector, b::AbstractRange)
broadcasted(S, +, b, a)
end
function broadcasted(S::DefaultArrayStyle{1}, ::typeof(+), a::ZerosVector, b::AbstractVector)
broadcasted(S, +, b, a)
end

broadcasted(::DefaultArrayStyle{1}, ::typeof(+), a::ZerosVector, b::AbstractFillVector) =
Expand Down
9 changes: 9 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,15 @@ end
@test Zeros(10) .- Zeros(1,9) ≡ Zeros(10,9)
@test Ones(10) .- Zeros(1,9) ≡ Ones(10,9)
@test Ones(10) .- Ones(1,9) ≡ Zeros(10,9)

end

@testset "issue #208" begin
u = rand(2); v = Zeros(2)
@test Broadcast.broadcasted(-, u, v) isa Broadcast.Broadcasted
@test Broadcast.broadcasted(+, u, v) isa Broadcast.Broadcasted
@test Broadcast.broadcasted(-, v, u) isa Broadcast.Broadcasted
@test Broadcast.broadcasted(+, v, u) isa Broadcast.Broadcasted
end

@testset "Zero .*" begin
Expand Down