4 files changed, 19 insertions, 1 deletions

diff --git a/hmatrix.cabal b/hmatrix.cabal
index 5416c09..894bff0 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -51,6 +51,10 @@ flag tests
     description:    Build tests
     default:        True
 
+flag dd
+    description:    svd = zgesdd
+    default:        True
+
 flag mkl
     description:    Link with Intel's MKL optimized libraries.
     default:        False
@@ -119,6 +123,9 @@ library
     if flag(unsafe)
         cpp-options: -DUNSAFE
 
+    if !flag(dd)
+        cpp-options: -DNOZGESDD
+
     if impl(ghc < 6.10.2)
         cpp-options: -DFINIT
 
diff --git a/lib/Numeric/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs
index 0f2ccef..d0f533b 100644
--- a/lib/Numeric/LinearAlgebra/Algorithms.hs
+++ b/lib/Numeric/LinearAlgebra/Algorithms.hs
@@ -129,7 +129,11 @@ instance Field Double where
     multiply' = multiplyR
 
 instance Field (Complex Double) where
+#ifdef NOZGESDD
+    svd' = svdC
+#else
     svd' = svdCd
+#endif
     thinSVD' = thinSVDCd
     sv' = svC
     luPacked' = luC
diff --git a/lib/Numeric/LinearAlgebra/Tests.hs b/lib/Numeric/LinearAlgebra/Tests.hs
index 922bfd5..4910b67 100644
--- a/lib/Numeric/LinearAlgebra/Tests.hs
+++ b/lib/Numeric/LinearAlgebra/Tests.hs
@@ -229,6 +229,10 @@ runTests n = do
     test (svdProp1a svdC)
     test (svdProp1a svdRd)
     test (svdProp1a svdCd)
+    test (svdProp1b svdR)
+    test (svdProp1b svdC)
+    test (svdProp1b svdRd)
+    test (svdProp1b svdCd)
     test (svdProp2 thinSVDR)
     test (svdProp2 thinSVDC)
     test (svdProp2 thinSVDRd)
diff --git a/lib/Numeric/LinearAlgebra/Tests/Properties.hs b/lib/Numeric/LinearAlgebra/Tests/Properties.hs
index 6d176fa..618094b 100644
--- a/lib/Numeric/LinearAlgebra/Tests/Properties.hs
+++ b/lib/Numeric/LinearAlgebra/Tests/Properties.hs
@@ -29,7 +29,7 @@ module Numeric.LinearAlgebra.Tests.Properties (
     pinvProp,
     detProp,
     nullspaceProp,
-    svdProp1, svdProp1a, svdProp2, svdProp3, svdProp4,
+    svdProp1, svdProp1a, svdProp1b, svdProp2, svdProp3, svdProp4,
     svdProp5a, svdProp5b, svdProp6a, svdProp6b, svdProp7,
     eigProp, eigSHProp, eigProp2, eigSHProp2,
     qrProp, rqProp,
@@ -137,6 +137,9 @@ svdProp1a svdfun m = m |~| u <> real d <> trans v && unitary u && unitary v wher
     (u,s,v) = svdfun m
     d = diagRect s (rows m) (cols m)
 
+svdProp1b svdfun m = unitary u && unitary v where
+    (u,_,v) = svdfun m
+
 -- thinSVD
 svdProp2 thinSVDfun m = m |~| u <> diag (real s) <> trans v && orthonormal u && orthonormal v && dim s == min (rows m) (cols m)
     where (u,s,v) = thinSVDfun m