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

Restrict types accepted by frule muladd and make tests more comprehensive #728

Merged
merged 2 commits into from
Jul 11, 2023
Merged

Restrict types accepted by frule muladd and make tests more comprehensive #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b9cd00
restrict muladd frule and add more tests
oxinabox Jul 11, 2023
aa2fd65
bump version
oxinabox Jul 11, 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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "ChainRules"
uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2"
version = "1.52.0"
version = "1.52.1"

[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Expand Down
8 changes: 7 additions & 1 deletion src/rulesets/Base/arraymath.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,13 @@ end # VERSION
##### `muladd`
#####

function frule((_, ΔA, ΔB, Δz), ::typeof(muladd), A, B, z)
function frule(
(_, ΔA, ΔB, Δz),
::typeof(muladd),
A::AbstractVecOrMat{<:CommutativeMulNumber},
B::AbstractVecOrMat{<:CommutativeMulNumber},
z::Union{CommutativeMulNumber, AbstractVecOrMat{<:CommutativeMulNumber}}
)
Ω = muladd(A, B, z)
return Ω, ΔA * B .+ A * ΔB .+ Δz
end
Expand Down
11 changes: 8 additions & 3 deletions test/rulesets/Base/arraymath.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,44 +85,49 @@

@testset "muladd: $T" for T in (Float64, ComplexF64)
@testset "add $(typeof(z))" for z in [rand(), rand(T, 3), rand(T, 3, 3), false]
@testset "forward mode" begin
@gpu test_frule(muladd, rand(T, 3, 5), rand(T, 5, 3), z)
end
@testset "matrix * matrix" begin
A = rand(T, 3, 3)
B = rand(T, 3, 3)
@gpu test_rrule(muladd, A, B, z)
@gpu test_rrule(muladd, A', B, z)
@gpu test_rrule(muladd, A , B', z)
@gpu test_frule(muladd, A, B, z)
@gpu test_frule(muladd, A', B, z)
@gpu test_frule(muladd, A , B', z)

C = rand(T, 3, 5)
D = rand(T, 5, 3)
@gpu test_rrule(muladd, C, D, z)
@gpu test_frule(muladd, C, D, z)
end
if ndims(z) <= 1
@testset "matrix * vector" begin
A, B = rand(T, 3, 3), rand(T, 3)
test_rrule(muladd, A, B, z)
test_rrule(muladd, A, B ⊢ rand(T, 3,1), z)
test_frule(muladd, A, B, z)
end
@testset "adjoint * matrix" begin
At, B = rand(T, 3)', rand(T, 3, 3)
test_rrule(muladd, At, B, z')
test_rrule(muladd, At ⊢ rand(T,1,3), B, z')
test_frule(muladd, At, B, z')
end
end
if ndims(z) == 0
@testset "adjoint * vector" begin # like dot
A, B = rand(T, 3)', rand(T, 3)
test_rrule(muladd, A, B, z)
test_rrule(muladd, A ⊢ rand(T,1,3), B, z')
test_frule(muladd, A, B, z)
end
end
if ndims(z) == 2 # other dims lead to e.g. muladd(ones(4), ones(1,4), 1)
@testset "vector * adjoint" begin # outer product
A, B = rand(T, 3), rand(T, 3)'
test_rrule(muladd, A, B, z)
test_rrule(muladd, A, B ⊢ rand(T,1,3), z)
test_frule(muladd, A, B, z)
end
end
end
Expand Down