improved windows installation instructions

5 files changed, 53 insertions, 64 deletions

diff --git a/INSTALL b/INSTALL
index e4c7e12..1a92fa5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -13,46 +13,45 @@ Detailed installation instructions:
 
 INSTALLATION ON WINDOWS ----------------------------------------
 
-1) Download the developer files gsl-1.8-lib.zip from
-   http://gnuwin32.sourceforge.net/packages/gsl.htm
-   and copy the gsl headers folder (under include) to:
-       C:\ghc\ghc.6.x.1\include
-   These headers are also available from:
-       http://perception.inf.um.es/~aruiz/darcs/hmatrix/gsl.zip
-
-2) Copy libgsl.dll, libcblas.dll (from the binaries package gsl-1.8.bin.zip)
-   and liblapack.dll (borrowed from the R system) to the ghc folder, e.g.:
-       C:\ghc\ghc-6.x.x.
-   Rename libcblas.dll to libblas.dll.
-   They are needed to compile programs.
-   These three dlls are available from:
-       http://perception.inf.um.es/~aruiz/darcs/hmatrix/dll1.zip
-
-2.5) Remove the following functions from the export list of
-     lib/Numeric/GSL/Special/Ellint.hs:
-     ellint_Pcomp_e, ellint_Pcomp, ellint_Dcomp_e, ellint_Dcomp
-
-3) Install the package as usual:
-       runhaskell Setup.lhs configure
-       runhaskell Setup.lhs build
-       runhaskell Setup.lhs install
-
-3.5) If configure cannot find ld please see:
-       http://article.gmane.org/gmane.comp.lang.haskell.cafe/32025
-
-4) Copy the dlls available from:
-       http://perception.inf.um.es/~aruiz/darcs/hmatrix/dll2.zip
-   to the working directory or C:\windows\system
-   They are required to run the programs and ghci.
-
-5) run the tests
-
-Unfortunately the lapack dll supplied by the R system does not include
-zgels_, zgelss_, and zgees_, so the functions depending on them
-(linearSolveLS, linearSolveSVD, and schur for complex data)
-will produce a "non supported in this OS" runtime error.
-
-If you find an alternative free and complete lapack.dll which works well
-for this system please let me know.
-
-The examples using graphics do not yet work in windows.
+1) Install a recent ghc (e.g. ghc-6.10.3)
+
+2) Install cabal-install. A binary for windows can be obtained from:
+
+   http://www.haskell.org/cabal/release/cabal-install-0.6.2/cabal.exe
+
+   Put it somewhere in the path, for instance in c:\ghc\ghc-6.10.3\bin
+
+3) Download and uncompress in a temporary location the following file:
+
+   http://code.haskell.org/hmatrix/gsl-lapack-windows.zip
+
+   It contains a folder, gsl, and four DLL's.
+
+4) Move the gsl folder to C:\ghc\ghc-6.10.3\include
+
+5) Move the four DLL's to C:\ghc\ghc-6.10.3\bin
+
+6) Download and uncompress hmatrix-x.y.z.tar.gz from Hackage:
+
+   http://hackage.haskell.org/cgi-bin/hackage-scripts/package/hmatrix
+
+7) Edit hmatrix.cabal:
+
+     line 17:      build-type:         Custom
+     change to:    build-type:         Simple
+
+     line 160:     extra-libraries:
+     add:          extra-libraries: libgls-0 blas lapack
+
+     line 161:     extra-lib-dirs:
+     add:          extra-lib-dirs: c:\ghc\ghc-6.10.3\bin
+
+8) Open a terminal, cd to the hmatrix folder, and run
+
+   > cabal install
+
+9) If everything is ok we can run the tests:
+
+   > runhaskell examples\tests.hs
+
+NOTE: The examples using graphics do not yet work in windows.
diff --git a/hmatrix.cabal b/hmatrix.cabal
index 70de11e..7645d79 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -134,7 +134,9 @@ library
 
     ghc-prof-options:   -auto-all
 
-    ghc-options:        -Wall -fno-warn-missing-signatures -fno-warn-orphans -fno-warn-unused-binds
+    ghc-options:        -Wall -fno-warn-missing-signatures
+                              -fno-warn-orphans
+                              -fno-warn-unused-binds
 
     if flag(unsafe)
         cpp-options: -DUNSAFE
@@ -152,4 +154,8 @@ library
         frameworks: Accelerate
         extra-libraries: gsl
 
--- the extra-libraries required for gsl and lapack are automatically detected by configure(.hs)
+-- The extra-libraries required for GSL and LAPACK
+-- should now be automatically detected by configure(.hs)
+
+    extra-libraries:
+    extra-lib-dirs:
diff --git a/lib/Data/Packed/Development.hs b/lib/Data/Packed/Development.hs
index cbb2f81..56e7b8f 100644
--- a/lib/Data/Packed/Development.hs
+++ b/lib/Data/Packed/Development.hs
@@ -24,4 +24,4 @@ module Data.Packed.Development (
     MatrixOrder(..), orderOf, cmat, fmat,
 ) where
 
-import Data.Packed.Internal
\ No newline at end of file
+import Data.Packed.Internal
diff --git a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c
index d7248d1..f18bbed 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c
+++ b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.c
@@ -435,9 +435,6 @@ int linearSolveLSR_l(KDMAT(a),KDMAT(b),DMAT(x)) {
 //////////////////// least squares complex linear system ////////////
 
 int linearSolveLSC_l(KCMAT(a),KCMAT(b),CMAT(x)) {
-    #ifdef _WIN32
-    return NOSPRTD;
-    #else
     integer m = ar;
     integer n = ac;
     integer nrhs = bc;
@@ -478,7 +475,6 @@ int linearSolveLSC_l(KCMAT(a),KCMAT(b),CMAT(x)) {
     free(work);
     free(AC);
     OK
-    #endif
 }
 
 //////////////////// least squares real linear system using SVD ////////////
@@ -543,9 +539,6 @@ int zgelss_(integer *m, integer *n, integer *nhrs,
     integer *info);
 
 int linearSolveSVDC_l(double rcond, KCMAT(a),KCMAT(b),CMAT(x)) {
-    #ifdef _WIN32
-    return NOSPRTD;
-    #else
     integer m = ar;
     integer n = ac;
     integer nrhs = bc;
@@ -596,7 +589,6 @@ int linearSolveSVDC_l(double rcond, KCMAT(a),KCMAT(b),CMAT(x)) {
     free(S);
     free(AC);
     OK
-    #endif
 }
 
 //////////////////// Cholesky factorization /////////////////////////
@@ -749,9 +741,6 @@ int schur_l_R(KDMAT(a), DMAT(u), DMAT(s)) {
 }
 
 int schur_l_C(KCMAT(a), CMAT(u), CMAT(s)) {
-    #ifdef _WIN32
-    return NOSPRTD;
-    #else
     integer m = ar;
     integer n = ac;
     REQUIRES(m>=1 && n==m && ur==n && uc==n && sr==n && sc==n, BAD_SIZE);
@@ -776,7 +765,6 @@ int schur_l_C(KCMAT(a), CMAT(u), CMAT(s)) {
     free(BWORK);
     free(WORK);
     OK
-    #endif
 }
 
 //////////////////// LU factorization /////////////////////////
diff --git a/lib/Numeric/LinearAlgebra/Tests.hs b/lib/Numeric/LinearAlgebra/Tests.hs
index 4f73e3a..174e418 100644
--- a/lib/Numeric/LinearAlgebra/Tests.hs
+++ b/lib/Numeric/LinearAlgebra/Tests.hs
@@ -159,9 +159,7 @@ runTests n = do
     test (linearSolveProp (luSolve.luPacked) . cSqWC)
     putStrLn "------ pinv (linearSolveSVD)"
     test (pinvProp  . rM)
-    if os == "mingw32"
-        then putStrLn "complex pinvTest skipped in this OS"
-        else test (pinvProp  . cM)
+    test (pinvProp  . cM)
     putStrLn "------ det"
     test (detProp   . rSqWC)
     test (detProp   . cSqWC)
@@ -186,9 +184,7 @@ runTests n = do
     test (hessProp   . cSq)
     putStrLn "------ schur"
     test (schurProp2 . rSq)
-    if os == "mingw32"
-        then putStrLn "complex schur skipped in this OS"
-        else test (schurProp1 . cSq)
+    test (schurProp1 . cSq)
     putStrLn "------ chol"
     test (cholProp   . rPosDef)
     test (cholProp   . cPosDef)