summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto Ruiz <aruiz@um.es>2014-06-20 12:41:54 +0200
committerAlberto Ruiz <aruiz@um.es>2014-06-20 12:41:54 +0200
commit3d327e510e441d58bfc4d5109eb9501d49f2f1c0 (patch)
tree87798acc33a66a1089961b021d8c11c72721a3c6
parent21a70f76d47d4851f27161eab350a31ab0651047 (diff)
upper bound and readme
-rw-r--r--README.md10
-rw-r--r--packages/base/hmatrix.cabal2
-rw-r--r--packages/glpk/hmatrix-glpk.cabal2
-rw-r--r--packages/gsl/hmatrix-gsl.cabal31
-rw-r--r--packages/special/hmatrix-special.cabal2
5 files changed, 13 insertions, 34 deletions
diff --git a/README.md b/README.md
index 388b0ba..7ff9590 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,11 @@ Version 0.16 (june 2014) has [new features][changes].
9 9
10- [Code examples (in construction)][examples] 10- [Code examples (in construction)][examples]
11 11
12- [Source code and documentation (Hackage)][source] 12- Source code and documentation (Hackage)
13 - linear algebra: [hmatrix](http://hackage.haskell.org/package/hmatrix)
14 - numeric algorithms: [hmatrix-gsl](http://hackage.haskell.org/package/hmatrix-gsl)
15 - special functions: [hmatrix-special](http://hackage.haskell.org/package/hmatrix-special)
16 - linear programming: [hmatrix-glpk]((http://hackage.haskell.org/package/hmatrix-glpk))
13 17
14- [Tutorial (old version)][tutorial] 18- [Tutorial (old version)][tutorial]
15 19
@@ -23,11 +27,11 @@ Contributions, suggestions, and bug reports are welcome!
23[blas]: http://www.netlib.org/blas/ 27[blas]: http://www.netlib.org/blas/
24[gsl]: http://www.gnu.org/software/gsl/ 28[gsl]: http://www.gnu.org/software/gsl/
25 29
26[source]: http://hackage.haskell.org/package/hmatrix 30[source]:
27[tutorial]: http://dis.um.es/profesores/alberto/material/hmatrix.pdf 31[tutorial]: http://dis.um.es/profesores/alberto/material/hmatrix.pdf
28[installation]: https://github.com/AlbertoRuiz/hmatrix/blob/master/INSTALL.md 32[installation]: https://github.com/AlbertoRuiz/hmatrix/blob/master/INSTALL.md
29[changes]: https://github.com/albertoruiz/hmatrix/tree/master/packages/base/CHANGELOG 33[changes]: https://github.com/albertoruiz/hmatrix/tree/master/packages/base/CHANGELOG
30[examples]: http://dis.um.es/profesores/alberto/hmatrix/hmatrix.html 34[examples]: http://dis.um.es/~/alberto/hmatrix/hmatrix.html
31 35
32 36
33[hmatrix-static]: http://hackage.haskell.org/package/hmatrix-static 37[hmatrix-static]: http://hackage.haskell.org/package/hmatrix-static
diff --git a/packages/base/hmatrix.cabal b/packages/base/hmatrix.cabal
index 0eeb6f0..fd45c6d 100644
--- a/packages/base/hmatrix.cabal
+++ b/packages/base/hmatrix.cabal
@@ -21,7 +21,7 @@ extra-source-files: src/C/lapack-aux.h
21 21
22library 22library
23 23
24 Build-Depends: base, 24 Build-Depends: base >= 4 && < 5,
25 binary, 25 binary,
26 array, 26 array,
27 deepseq, 27 deepseq,
diff --git a/packages/glpk/hmatrix-glpk.cabal b/packages/glpk/hmatrix-glpk.cabal
index ae8a967..646c73c 100644
--- a/packages/glpk/hmatrix-glpk.cabal
+++ b/packages/glpk/hmatrix-glpk.cabal
@@ -22,7 +22,7 @@ extra-source-files: examples/simplex1.hs
22 examples/simplex4.hs 22 examples/simplex4.hs
23 23
24library 24library
25 Build-Depends: base, hmatrix >= 0.16 25 Build-Depends: base <5, hmatrix >= 0.16
26 26
27 hs-source-dirs: src 27 hs-source-dirs: src
28 28
diff --git a/packages/gsl/hmatrix-gsl.cabal b/packages/gsl/hmatrix-gsl.cabal
index e2f02e9..ce57619 100644
--- a/packages/gsl/hmatrix-gsl.cabal
+++ b/packages/gsl/hmatrix-gsl.cabal
@@ -7,9 +7,8 @@ Maintainer: Alberto Ruiz <aruiz@um.es>
7Stability: provisional 7Stability: provisional
8Homepage: https://github.com/albertoruiz/hmatrix 8Homepage: https://github.com/albertoruiz/hmatrix
9Synopsis: Numerical computation 9Synopsis: Numerical computation
10Description: Purely functional interface to basic linear algebra 10Description: Purely functional interface to selected numerical computations,
11 and other numerical computations, internally implemented using 11 internally implemented using GSL.
12 GSL, BLAS and LAPACK.
13 12
14Category: Math 13Category: Math
15tested-with: GHC ==7.8 14tested-with: GHC ==7.8
@@ -20,33 +19,9 @@ build-type: Simple
20 19
21extra-source-files: src/Numeric/GSL/gsl-ode.c 20extra-source-files: src/Numeric/GSL/gsl-ode.c
22 21
23flag dd
24 description: svd = zgesdd
25 default: True
26
27flag mkl
28 description: Link with Intel's MKL optimized libraries.
29 default: False
30
31flag unsafe
32 description: Compile the library with bound checking disabled.
33 default: False
34
35flag finit
36 description: Force FPU initialization in foreing calls
37 default: False
38
39flag debugfpu
40 description: Check FPU stack
41 default: False
42
43flag debugnan
44 description: Check NaN
45 default: False
46
47library 22library
48 23
49 Build-Depends: base, hmatrix>=0.16, array, vector, 24 Build-Depends: base<5, hmatrix>=0.16, array, vector,
50 process, random 25 process, random
51 26
52 27
diff --git a/packages/special/hmatrix-special.cabal b/packages/special/hmatrix-special.cabal
index 89f4f80..6d9438c 100644
--- a/packages/special/hmatrix-special.cabal
+++ b/packages/special/hmatrix-special.cabal
@@ -27,7 +27,7 @@ flag safe-cheap
27 default: False 27 default: False
28 28
29library 29library
30 Build-Depends: base, hmatrix, hmatrix-gsl 30 Build-Depends: base <5, hmatrix, hmatrix-gsl
31 31
32 Extensions: ForeignFunctionInterface, 32 Extensions: ForeignFunctionInterface,
33 CPP 33 CPP