summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README5
-rw-r--r--hmatrix.cabal32
2 files changed, 18 insertions, 19 deletions
diff --git a/README b/README
index bd6a7f0..4744f68 100644
--- a/README
+++ b/README
@@ -50,8 +50,8 @@ KNOWN PROBLEMS / BUGS -------------------------------
50 50
51ACKNOWLEDGEMENTS ----------------------------------------------------- 51ACKNOWLEDGEMENTS -----------------------------------------------------
52 52
53I thank Don Stewart, Henning Thielemann, Bulat Ziganshin and all the people 53I thank Don Stewart, Henning Thielemann, Bulat Ziganshin, Heinrich Apfelmus,
54in the Haskell mailing lists for their help. 54and all the people in the Haskell mailing lists for their help.
55 55
56- Nico Mahlo discovered a bug in the eigendecomposition wrapper. 56- Nico Mahlo discovered a bug in the eigendecomposition wrapper.
57 57
@@ -109,3 +109,4 @@ in the Haskell mailing lists for their help.
109 109
110- Jean-Francois Tremblay discovered an error in the tutorial. 110- Jean-Francois Tremblay discovered an error in the tutorial.
111 111
112- Heinrich Apfelmus fixed hmatrix.cabal for OS/X.
diff --git a/hmatrix.cabal b/hmatrix.cabal
index 1080dcd..3d58fa2 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -1,5 +1,5 @@
1Name: hmatrix 1Name: hmatrix
2Version: 0.8.3.0 2Version: 0.8.3.1
3License: GPL 3License: GPL
4License-file: LICENSE 4License-file: LICENSE
5Author: Alberto Ruiz 5Author: Alberto Ruiz
@@ -14,10 +14,11 @@ Category: Math
14tested-with: GHC ==6.10.4, GHC ==6.12.1 14tested-with: GHC ==6.10.4, GHC ==6.12.1
15 15
16cabal-version: >=1.2 16cabal-version: >=1.2
17
17build-type: Custom 18build-type: Custom
18extra-source-files: lib/Numeric/LinearAlgebra/Tests/quickCheckCompat.h
19 19
20extra-source-files: configure configure.hs README INSTALL CHANGES 20extra-source-files: lib/Numeric/LinearAlgebra/Tests/quickCheckCompat.h
21 configure configure.hs README INSTALL CHANGES
21extra-tmp-files: hmatrix.buildinfo 22extra-tmp-files: hmatrix.buildinfo
22 23
23extra-source-files: examples/tests.hs 24extra-source-files: examples/tests.hs
@@ -47,28 +48,19 @@ extra-source-files: lib/Numeric/GSL/Special/auto.hs,
47 lib/Numeric/GSL/Special/autoall.sh, 48 lib/Numeric/GSL/Special/autoall.sh,
48 lib/Numeric/GSL/Special/replace.hs 49 lib/Numeric/GSL/Special/replace.hs
49 50
50flag splitBase
51 description: Choose the new smaller, split-up base package.
52
53flag mkl 51flag mkl
54 description: Link with Intel's MKL optimized libraries. 52 description: Link with Intel's MKL optimized libraries.
55 default: False 53 default: False
56 54
57flag accelerate
58 description: Use the accelerate framework for LAPACK/BLAS on OS X
59 default: False
60
61flag unsafe 55flag unsafe
62 description: Compile the library with bound checking disabled. 56 description: Compile the library with bound checking disabled.
63 default: False 57 default: False
64 58
65library 59library
66 if flag(splitBase)
67 build-depends: base >= 3 && < 5, array
68 else
69 build-depends: base < 3
70 60
71 Build-Depends: haskell98, 61 Build-Depends: base >= 3 && < 5,
62 array,
63 haskell98,
72 QuickCheck, HUnit, 64 QuickCheck, HUnit,
73 storable-complex, 65 storable-complex,
74 process 66 process
@@ -160,9 +152,11 @@ library
160 else 152 else
161 extra-libraries: gsl mkl_lapack mkl_intel mkl_sequential mkl_core 153 extra-libraries: gsl mkl_lapack mkl_intel mkl_sequential mkl_core
162 154
163 if flag(accelerate) 155 if os(OSX)
164 frameworks: Accelerate 156 extra-lib-dirs: /opt/local/lib/
157 include-dirs: /opt/local/include
165 extra-libraries: gsl 158 extra-libraries: gsl
159 frameworks: Accelerate
166 160
167-- The extra-libraries required for GSL and LAPACK 161-- The extra-libraries required for GSL and LAPACK
168-- should now be automatically detected by configure(.hs) 162-- should now be automatically detected by configure(.hs)
@@ -170,3 +164,7 @@ library
170 extra-libraries: 164 extra-libraries:
171 extra-lib-dirs: 165 extra-lib-dirs:
172 166
167 source-repository head
168 type: darcs
169 location: http://code.haskell.org/hmatrix
170