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

Mutable addition of one array into result #288

Merged
merged 3 commits into from
Jun 10, 2024
Merged

Mutable addition of one array into result #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8623fff
Mutable addition of one array into result
blegat May 21, 2024
df3446f
Add tests
blegat May 21, 2024
e1f2f3a
Add test
blegat Jun 10, 2024
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
18 changes: 18 additions & 0 deletions src/implementations/LinearAlgebra.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,24 @@ function operate!(
return broadcast!(op, A, B)
end

function operate_to!(
output::AbstractArray,
op::Union{typeof(+),typeof(-)},
A::AbstractArray,
)
if axes(output) != axes(A)
throw(
DimensionMismatch(
"Cannot sum or substract a matrix of axes `$(axes(A))`" *
" into a matrix of axes `$(axes(output))`, expected" *
" axes `$(axes(A))`.",
),
)
end
# We don't have `MA.broadcast_to!` as it would be exactly `Base.broadcast!`.
return Base.broadcast!(op, output, A)
end

function operate_to!(
output::AbstractArray,
op::Union{typeof(+),typeof(-)},
Expand Down
14 changes: 8 additions & 6 deletions test/matmul.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@ end
"Cannot sum or substract matrices of axes `$(axes(A))` and `$(axes(B))` into a matrix of axes `$(axes(output))`, expected axes `$(axes(B))`.",
)
@test_throws err MA.operate_to!(output, +, A, B)
err = DimensionMismatch(
"Cannot sum or substract a matrix of axes `$(axes(A))` into a matrix of axes `$(axes(output))`, expected axes `$(axes(A))`.",
)
@test_throws err MA.operate_to!(output, +, A)
@test_throws err MA.operate_to!(output, -, A)
end
@testset "unsupported_product" begin
unsupported_product()
Expand Down Expand Up @@ -471,17 +476,14 @@ function test_sparse_vector_sum(::Type{T}) where {T}
x = SparseArrays.sparsevec([1, 3], T[5, 7])
y = copy(x)
z = copy(y)
alloc_test(() -> MA.operate!(+, y, z), 0)
alloc_test(() -> MA.operate!(-, y, z), 0)
alloc_test(() -> MA.add!!(y, z), 0)
alloc_test(() -> MA.sub!!(y, z), 0)
alloc_test(() -> MA.operate_to!(x, +, y, z), 0)
alloc_test(() -> MA.operate_to!(x, -, y, z), 0)
alloc_test(() -> MA.add_to!!(x, y, z), 0)
alloc_test(() -> MA.sub_to!!(x, y, z), 0)
alloc_test(() -> MA.operate_to!(x, +, y), 0)
alloc_test(() -> MA.operate_to!(x, -, y), 0)
return
end

@testset "Array sum" begin
test_array_sum(Int)
test_sparse_vector_sum(Int)
end
Loading