QuickCheck<2, ifdef i386 finit, and credit to Simon Beaumont

4 files changed, 13 insertions, 3 deletions

diff --git a/README b/README
index 77d384e..42f5218 100644
--- a/README
+++ b/README
@@ -103,3 +103,6 @@ in the Haskell mailing lists for their help.
   avoid the wrong NaNs produced by foreign functions.
 
 - Reiner Pope added support for luSolve, based on (d|z)getrs.
+
+- Simon Beaumont reported the need of QuickCheck<2 and the invalid
+  asm("finit") on ppc.
diff --git a/examples/benchmarks.hs b/examples/benchmarks.hs
index e210280..4fd7a56 100644
--- a/examples/benchmarks.hs
+++ b/examples/benchmarks.hs
@@ -55,6 +55,9 @@ bench1 = do
     time $ print $ vectorMax t
     time $ print $ sqrt $ foldVector (\v s -> v*v+s) 0 t
     time $ print $ pnorm PNorm2 t
+    putStrLn "scale C/BLAS vs H:"
+    time $ print $ mapVector (*2) t @> 7
+    time $ print $ (2 * t) @> 7
 
 sumVB v = constant 1 (dim v) <.> v
 
diff --git a/hmatrix.cabal b/hmatrix.cabal
index b91790a..114be5d 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -30,9 +30,9 @@ flag unsafe
 
 library
     if flag(splitBase)
-      build-depends:    base >= 3, array, QuickCheck, HUnit, storable-complex
+      build-depends:    base >= 3, array, QuickCheck < 2, HUnit, storable-complex
     else
-      build-depends:    base < 3, QuickCheck, HUnit, storable-complex
+      build-depends:    base < 3, QuickCheck < 2, HUnit, storable-complex
 
     Build-Depends:      haskell98
     Extensions:         ForeignFunctionInterface,
diff --git a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c
index 6315041..a8ccf5f 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c
+++ b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c
@@ -35,7 +35,11 @@
 #define NOSPRTD  2007
 
 //---------------------------------------
-void asm_finit() { asm("finit");}
+void asm_finit() {
+#ifdef i386
+    asm("finit");
+#endif
+}
 //---------------------------------------
 
 //////////////////// real svd ////////////////////////////////////