Merge pull request #33 from JuliaMath/ludvigak-complex

Fix transcdendentals with complex args

Author: simonbyrne

src/Quadmath.jl

@@ -8,7 +8,7 @@ import Base: (*), +, -, /,  <, <=, ==, ^, convert,
           significand_mask, exponent, significand,
           promote_rule, widen,
           string, print, show, parse,
-          acos, acosh, asin, asinh, atan, atanh, cosh, cos,
+          acos, acosh, asin, asinh, atan, atanh, cosh, cos, sincos,
           exp, expm1, log, log2, log10, log1p, sin, sinh, sqrt,
           tan, tanh,
           ceil, floor, trunc, round, fma,
@@ -41,7 +41,7 @@ macro ccall(expr)
 
     expr_call = expr.args[1]
     @assert expr_call isa Expr && expr_call.head == :call
-    
+
     expr_fname = expr_call.args[1]
 
     if expr_fname isa Symbol
@@ -51,9 +51,9 @@ macro ccall(expr)
     end
 
     expr_args = expr_call.args[2:end]
-    
-    @assert all(ex isa Expr && ex.head == :(::) for ex in expr_args)   
-    
+
+    @assert all(ex isa Expr && ex.head == :(::) for ex in expr_args)
+
     arg_names = [ex.args[1] for ex in expr_args]
     arg_types = [ex.args[2] for ex in expr_args]
 
@@ -65,7 +65,7 @@ macro ccall(expr)
                 r = Ref{Cfloat128}()
                 ccall($fname, Cvoid, (Ref{Cfloat128}, $(esc.(arg_types)...),), r, $(esc.(arg_names)...))
                 r[]
-            end                
+            end
         else
             :(ccall($fname, $(esc(ret_type)), ($(esc.(arg_types)...),), $(esc.(arg_names)...)))
         end
@@ -345,11 +345,15 @@ hypot(x::Float128, y::Float128) =
     Float128(@ccall(libquadmath.hypotq(x::Cfloat128, y::Cfloat128)::Cfloat128))
 atan(x::Float128, y::Float128) =
     Float128(@ccall(libquadmath.atan2q(x::Cfloat128, y::Cfloat128)::Cfloat128))
+sincos(x::Float128) = (sin(x), cos(x))
 
 ## misc
-fma(x::Float128, y::Float128, z::Float128) =
-    Float128(@ccall(libquadmath.fmaq(x::Cfloat128, y::Cfloat128, z::Cfloat128)::Cfloat128))
-
+@static if !Sys.iswindows()
+    # disable fma on Windows until rounding mode issue fixed
+    # https://github.com/JuliaMath/Quadmath.jl/issues/31
+    fma(x::Float128, y::Float128, z::Float128) =
+        Float128(@ccall(libquadmath.fmaq(x::Cfloat128, y::Cfloat128, z::Cfloat128)::Cfloat128))
+end
 
 isnan(x::Float128) = 0 != @ccall(libquadmath.isnanq(x::Cfloat128)::Cint)
 isinf(x::Float128) = 0 != @ccall(libquadmath.isinfq(x::Cfloat128)::Cint)
@@ -366,8 +370,8 @@ precision(::Type{Float128}) = 113
 eps(::Type{Float128}) = reinterpret(Float128, 0x3f8f_0000_0000_0000_0000_0000_0000_0000)
 floatmin(::Type{Float128}) = reinterpret(Float128, 0x0001_0000_0000_0000_0000_0000_0000_0000)
 floatmax(::Type{Float128}) = reinterpret(Float128, 0x7ffe_ffff_ffff_ffff_ffff_ffff_ffff_ffff)
-
 maxintfloat(::Type{Float128}) = Float128(0x0002_0000_0000_0000_0000_0000_0000_0000)
+
 """
     Inf128
 

test/runtests.jl

@@ -55,7 +55,7 @@ end
     x = parse(Float128, "100.0")
     y = parse(Float128, "25.0")
     @test Float64(x+y) == Float64(BigInt(x) + BigInt(y))
-    @test x+y == Float128(BigInt(x) + BigInt(y))    
+    @test x+y == Float128(BigInt(x) + BigInt(y))
 end
 end
 
@@ -86,7 +86,7 @@ end
     fpart, ipart = modf(y)
     @test y == ipart + fpart
     @test signbit(fpart) == signbit(ipart) == true
-    
+
     z = x^3
     fpart, ipart = modf(x) .+ modf(y)
     @test x+y == ipart+fpart
@@ -113,20 +113,28 @@ end
 
 @testset "transcendental etc. calls" begin
     # at least enough to cover all the wrapping code
-    x = sqrt(Float128(2.0))
-    xd = Float64(x)
-    @test (x^Float128(4.0)) ≈ Float128(4.0)
-    @test exp(x) ≈ exp(xd)
-    @test abs(x) == x
-    @test hypot(Float128(3),Float128(4)) == Float128(5)
-    @test atan(x,x) ≈ Float128(pi) / 4
-    h = floatmax(Float128)
-    @test isinf(h+h)
-    @test fma(x,x,Float128(-1.0)) ≈ Float128(1)
-    if Sys.iswindows()
-        @test_broken isinf(h+h)
-    else
-        @test isinf(h+h)
+    @testset "real" begin
+        x = sqrt(Float128(2.0))
+        xd = Float64(x)
+        @test (x^Float128(4.0)) ≈ Float128(4.0)
+        @test exp(x) ≈ exp(xd)
+        @test abs(x) == x
+        @test hypot(Float128(3),Float128(4)) == Float128(5)
+        @test atan(x,x) ≈ Float128(pi) / 4
+        if !Sys.iswindows()
+            @test fma(x,x,Float128(-1.0)) ≈ Float128(1)
+        end
+    end
+    @testset "complex" begin
+        x = sqrt(ComplexF128(1.0 + 1.0im))
+        xd = ComplexF64(x)
+        @test x^x ≈ xd^xd
+        @test exp(x) ≈ exp(xd)
+        @test abs(x) ≈ abs(xd)
+        @test sin(x) ≈ sin(xd)
+        @test cos(x) ≈ cos(xd)
+        @test tan(x) ≈ tan(xd)
+        @test log(x) ≈ log(xd)
     end
 end