Merge pull request #257 from araujoms/muladd

redirect muladd to fma

Author: JeffreySarnoff

src/DoubleFloats.jl

@@ -120,7 +120,6 @@ include("math/elementary/archyptrig.jl")
 include("math/elementary/templated.jl")
 include("math/elementary/complex.jl")
 
-include("math/linearalgebra/matmul.jl")
 include("math/linearalgebra/support.jl")
 include("math/linearalgebra/matrixfunction.jl")
 

src/math/arithmetic/fma.jl

@@ -51,24 +51,12 @@ end
    return fma(x.hi, x.lo, y.hi, y.lo, z)
 end
 
-@inline function fma(x::DoubleFloat{T}, y::DoubleFloat{T}, z::Tuple{T,T}) where {T<:IEEEFloat}
-   return fma(x.hi, x.lo, y.hi, y.lo, z[1], z[2])
+@inline function muladd(x::DoubleFloat{T}, y::DoubleFloat{T}, z::DoubleFloat{T}) where {T<:IEEEFloat}
+    return fma(x, y, z)
 end
-@inline function fma(x::DoubleFloat{T}, y::Tuple{T,T}, z::DoubleFloat{T}) where {T<:IEEEFloat}
-   return fma(x.hi, x.lo, y[1], y[2], z.hi, z.lo)
+@inline function muladd(x::DoubleFloat{T}, y::DoubleFloat{T}, z::T) where {T<:IEEEFloat}
+    return fma(x, y, z)
 end
-@inline function fma(x::Tuple{T,T}, y::DoubleFloat{T}, z::DoubleFloat{T}) where {T<:IEEEFloat}
-   return fma(x[1], x[2], y.hi, y.lo, z.hi, z.lo)
-end
-@inline function fma(x::DoubleFloat{T}, y::Tuple{T,T}, z::Tuple{T,T}) where {T<:IEEEFloat}
-   return fma(x.hi, x.lo, y[1], y[2], z[1], z[2])
-end
-@inline function fma(x::Tuple{T,T}, y::Tuple{T,T}, z::DoubleFloat{T}) where {T<:IEEEFloat}
-   return fma(x[1], x[2], y[1], y[2], z.hi, z.lo)
-end
-@inline function fma(x::Tuple{T,T}, y::DoubleFloat{T}, z::Tuple{T,T}) where {T<:IEEEFloat}
-   return fma(x[1], x[2], y.hi, y.lo, z[1], z[2])
-end
-@inline function fma(x::Tuple{T,T}, y::Tuple{T,T}, z::Tuple{T,T}) where {T<:IEEEFloat}
-   return fma(x[1], x[2], y[1], y[2], z[1], z[2])
+@inline function muladd(x::T, y::T, z::DoubleFloat{T}) where {T<:IEEEFloat}
+    return fma(x, y, z)
 end