Merge pull request #5291 from JuliaLang/anj/dotu

Change complex dot to use cblas to avoid problem with complex return type
JuliaLang · Jan 3, 2014 · 756a34a · 756a34a
2 parents af66fc4 + 4720e92
commit 756a34a
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/base/linalg/blas.jl b/base/linalg/blas.jl
@@ -102,8 +102,8 @@ for (fname, elty) in ((:ddot_,:Float64),
         end
     end
 end
-for (fname, elty) in ((:zdotc_,:Complex128),
-                      (:cdotc_,:Complex64))
+for (fname, elty) in ((:cblas_zdotc_sub,:Complex128),
+                      (:cblas_cdotc_sub,:Complex64))
     @eval begin
                 #       DOUBLE PRECISION FUNCTION DDOT(N,DX,INCX,DY,INCY)
                 # *     .. Scalar Arguments ..
@@ -112,14 +112,16 @@ for (fname, elty) in ((:zdotc_,:Complex128),
                 # *     .. Array Arguments ..
                 #       DOUBLE PRECISION DX(*),DY(*)
         function dotc(n::Integer, DX::Union(Ptr{$elty},Array{$elty}), incx::Integer, DY::Union(Ptr{$elty},Array{$elty}), incy::Integer)
+            result = Array($elty, 1)
             ccall(($(string(fname)),libblas), $elty,
-                (Ptr{BlasInt}, Ptr{$elty}, Ptr{BlasInt}, Ptr{$elty}, Ptr{BlasInt}),
-                 &n, DX, &incx, DY, &incy)
+                (BlasInt, Ptr{$elty}, BlasInt, Ptr{$elty}, BlasInt, Ptr{$elty}),
+                 n, DX, incx, DY, incy, result)
+            result[1]
         end
     end
 end
-for (fname, elty) in ((:zdotu_,:Complex128),
-                      (:cdotu_,:Complex64))
+for (fname, elty) in ((:cblas_zdotu_sub,:Complex128),
+                      (:cblas_cdotu_sub,:Complex64))
     @eval begin
                 #       DOUBLE PRECISION FUNCTION DDOT(N,DX,INCX,DY,INCY)
                 # *     .. Scalar Arguments ..
@@ -128,9 +130,11 @@ for (fname, elty) in ((:zdotu_,:Complex128),
                 # *     .. Array Arguments ..
                 #       DOUBLE PRECISION DX(*),DY(*)
         function dotu(n::Integer, DX::Union(Ptr{$elty},Array{$elty}), incx::Integer, DY::Union(Ptr{$elty},Array{$elty}), incy::Integer)
+            result = Array($elty, 1)
             ccall(($(string(fname)),libblas), $elty,
-                (Ptr{BlasInt}, Ptr{$elty}, Ptr{BlasInt}, Ptr{$elty}, Ptr{BlasInt}),
-                 &n, DX, &incx, DY, &incy)
+                (BlasInt, Ptr{$elty}, BlasInt, Ptr{$elty}, BlasInt, Ptr{$elty}),
+                 n, DX, incx, DY, incy, result)
+            result[1]
         end
     end
 end