diff options
-rw-r--r-- | README | 3 | ||||
-rw-r--r-- | examples/benchmarks.hs | 3 | ||||
-rw-r--r-- | hmatrix.cabal | 4 | ||||
-rw-r--r-- | lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c | 6 |
4 files changed, 13 insertions, 3 deletions
@@ -103,3 +103,6 @@ in the Haskell mailing lists for their help. | |||
103 | avoid the wrong NaNs produced by foreign functions. | 103 | avoid the wrong NaNs produced by foreign functions. |
104 | 104 | ||
105 | - Reiner Pope added support for luSolve, based on (d|z)getrs. | 105 | - Reiner Pope added support for luSolve, based on (d|z)getrs. |
106 | |||
107 | - Simon Beaumont reported the need of QuickCheck<2 and the invalid | ||
108 | 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 | |||
55 | time $ print $ vectorMax t | 55 | time $ print $ vectorMax t |
56 | time $ print $ sqrt $ foldVector (\v s -> v*v+s) 0 t | 56 | time $ print $ sqrt $ foldVector (\v s -> v*v+s) 0 t |
57 | time $ print $ pnorm PNorm2 t | 57 | time $ print $ pnorm PNorm2 t |
58 | putStrLn "scale C/BLAS vs H:" | ||
59 | time $ print $ mapVector (*2) t @> 7 | ||
60 | time $ print $ (2 * t) @> 7 | ||
58 | 61 | ||
59 | sumVB v = constant 1 (dim v) <.> v | 62 | sumVB v = constant 1 (dim v) <.> v |
60 | 63 | ||
diff --git a/hmatrix.cabal b/hmatrix.cabal index b91790a..114be5d 100644 --- a/hmatrix.cabal +++ b/hmatrix.cabal | |||
@@ -30,9 +30,9 @@ flag unsafe | |||
30 | 30 | ||
31 | library | 31 | library |
32 | if flag(splitBase) | 32 | if flag(splitBase) |
33 | build-depends: base >= 3, array, QuickCheck, HUnit, storable-complex | 33 | build-depends: base >= 3, array, QuickCheck < 2, HUnit, storable-complex |
34 | else | 34 | else |
35 | build-depends: base < 3, QuickCheck, HUnit, storable-complex | 35 | build-depends: base < 3, QuickCheck < 2, HUnit, storable-complex |
36 | 36 | ||
37 | Build-Depends: haskell98 | 37 | Build-Depends: haskell98 |
38 | Extensions: ForeignFunctionInterface, | 38 | 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 @@ | |||
35 | #define NOSPRTD 2007 | 35 | #define NOSPRTD 2007 |
36 | 36 | ||
37 | //--------------------------------------- | 37 | //--------------------------------------- |
38 | void asm_finit() { asm("finit");} | 38 | void asm_finit() { |
39 | #ifdef i386 | ||
40 | asm("finit"); | ||
41 | #endif | ||
42 | } | ||
39 | //--------------------------------------- | 43 | //--------------------------------------- |
40 | 44 | ||
41 | //////////////////// real svd //////////////////////////////////// | 45 | //////////////////// real svd //////////////////////////////////// |