summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto Ruiz <aruiz@um.es>2012-01-15 11:14:22 +0100
committerAlberto Ruiz <aruiz@um.es>2012-01-15 11:14:22 +0100
commitb315b00d0d646c2786a86720865b55d1882b9ee9 (patch)
tree8c649863b81fbb5d83387c9c3593602d1fc53b9c
parent776f4b9fbda8eeec006b24ed5f1548be752eae3c (diff)
parentb4f18a13826316be5362ab525d7122c0ca39d6ce (diff)
Merge branch 'master' of github.com:AlbertoRuiz/hmatrix
-rw-r--r--lib/Numeric/LinearAlgebra/LAPACK.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Numeric/LinearAlgebra/LAPACK.hs b/lib/Numeric/LinearAlgebra/LAPACK.hs
index 349650c..7ad58e1 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK.hs
+++ b/lib/Numeric/LinearAlgebra/LAPACK.hs
@@ -61,8 +61,8 @@ foreign import ccall "multiplyQ" cgemmc :: CInt -> CInt -> TQMQMQM
61isT Matrix{order = ColumnMajor} = 0 61isT Matrix{order = ColumnMajor} = 0
62isT Matrix{order = RowMajor} = 1 62isT Matrix{order = RowMajor} = 1
63 63
64tt x@Matrix{order = RowMajor} = x 64tt x@Matrix{order = ColumnMajor} = x
65tt x@Matrix{order = ColumnMajor} = trans x 65tt x@Matrix{order = RowMajor} = trans x
66 66
67multiplyAux f st a b = unsafePerformIO $ do 67multiplyAux f st a b = unsafePerformIO $ do
68 when (cols a /= rows b) $ error $ "inconsistent dimensions in matrix product "++ 68 when (cols a /= rows b) $ error $ "inconsistent dimensions in matrix product "++