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.

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

fix division return type #233

Merged
merged 6 commits into from
Jul 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "ChainRules"
uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2"
version = "0.7.7"
version = "0.7.8"

[deps]
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
Expand Down
2 changes: 1 addition & 1 deletion src/rulesets/Base/base.jl
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ end
),
(!(islow | ishigh), islow, ishigh),
)
@scalar_rule x \ y (-((y / x) / x), inv(x))
@scalar_rule x \ y (-(Ω / x), one(y) / x)

function frule((_, ẏ), ::typeof(identity), x)
return (x, ẏ)
Expand Down
4 changes: 2 additions & 2 deletions src/rulesets/Base/fastmath_able.jl
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ let

@scalar_rule x + y (One(), One())
@scalar_rule x - y (One(), -1)
@scalar_rule x / y (inv(y), -((x / y) / y))
@scalar_rule x / y (one(x) / y, -(Ω / y))
#log(complex(x)) is required so it gives correct complex answer for x<0
@scalar_rule(x ^ y,
(ifelse(iszero(x), zero(Ω), y * Ω / x), Ω * log(complex(x))),
)
# x^y for x < 0 errors when y is not an integer, but then derivative wrt y
# is undefined, so we adopt subgradient convention and set derivative to 0.
@scalar_rule(x::Real ^ y::Real,
(ifelse(iszero(x), zero(Ω), y * Ω / x), Ω * log(ifelse(x ≤ 0, one(x), x))),
(ifelse(iszero(x), zero(Ω), y * Ω / x), Ω * log(oftype(Ω, ifelse(x ≤ 0, one(x), x)))),
)
@scalar_rule(
rem(x, y),
Expand Down
24 changes: 23 additions & 1 deletion test/rulesets/Base/fastmath_able.jl
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,29 @@ const FASTABLE_AST = quote
Δz = randn(typeof(f(x, y)))

frule_test(f, (x, Δx), (y, Δy))
rrule_test(f, Δz, (x, x̄), (y, ȳ))
rrule_test(f, Δz, (x, x̄), (y, ȳ))
end

@testset "$f(x::$T, y::$T) type check" for f in (/, +, -,\, hypot, ^), T in (Float32, Float64)
x, Δx, x̄ = 10rand(T, 3)
y, Δy, ȳ = rand(T, 3)
@assert T == typeof(f(x, y))
Δz = randn(typeof(f(x, y)))

@test frule((Zero(), Δx, Δy), f, x, y) isa Tuple{T, T}
_, ∂x, ∂y = rrule(f, x, y)[2](Δz)
@test extern.((∂x, ∂y)) isa Tuple{T, T}

if f != hypot
# Issue #233
@test frule((Zero(), Δx, Δy), f, x, 2) isa Tuple{T, T}
_, ∂x, ∂y = rrule(f, x, 2)[2](Δz)
@test extern.((∂x, ∂y)) isa Tuple{T, T}

@test frule((Zero(), Δx, Δy), f, 2, y) isa Tuple{T, T}
_, ∂x, ∂y = rrule(f, 2, y)[2](Δz)
@test extern.((∂x, ∂y)) isa Tuple{T, T}
end
end

@testset "^(x::$T, n::$T)" for T in (Float64, ComplexF64)
Expand Down