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

#207, but rebased against master #214

Merged
merged 2 commits into from
Apr 11, 2017
Merged

#207, but rebased against master #214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b3eb12
fix wrong partials multiplied in FMA
KristofferC Mar 18, 2017
edec71b
use more fma
KristofferC Mar 18, 2017
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
23 changes: 14 additions & 9 deletions src/dual.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,13 @@ end
@ambiguous @inline Base.atan2(y::Real, x::Dual) = calc_atan2(y, x)
@ambiguous @inline Base.atan2(y::Dual, x::Real) = calc_atan2(y, x)

@inline function Base.fma(x::Dual, y::Dual, z::Dual)
vx, vy = value(x), value(y)
result = fma(vx, vy, value(z))
return Dual(result,
_mul_partials(partials(x), partials(y), vy, vx) + partials(z))
@generated function Base.fma{N}(x::Dual{N}, y::Dual{N}, z::Dual{N})
ex = Expr(:tuple, [:(fma(value(x), partials(y)[$i], fma(value(y), partials(x)[$i], partials(z)[$i]))) for i in 1:N]...)
return quote
$(Expr(:meta, :inline))
v = fma(value(x), value(y), value(z))
Dual(v, $ex)
end
end

@inline function Base.fma(x::Dual, y::Dual, z::Real)
Expand All @@ -423,10 +425,13 @@ end
return Dual(result, _mul_partials(partials(x), partials(y), vy, vx))
end

@inline function Base.fma(x::Dual, y::Real, z::Dual)
vx = value(x)
result = fma(vx, y, value(z))
return Dual(result, partials(x) * y + partials(z))
@generated function Base.fma{N}(x::Dual{N}, y::Real, z::Dual{N})
ex = Expr(:tuple, [:(fma(partials(x)[$i], y, partials(z)[$i])) for i in 1:N]...)
return quote
$(Expr(:meta, :inline))
v = fma(value(x), y, value(z))
Dual(v, $ex)
end
end

@inline Base.fma(x::Real, y::Dual, z::Dual) = fma(y, x, z)
Expand Down