diff options
author | Joe Crayne <joe@jerkface.net> | 2019-08-10 03:52:20 -0400 |
---|---|---|
committer | Joe Crayne <joe@jerkface.net> | 2019-08-10 03:52:20 -0400 |
commit | 8ce80f6d8a38d67e9781f4a361e5c904bb73c7cd (patch) | |
tree | 63207aa57b2dadf86a8949e1fb243e86acca873b | |
parent | 7f23aabba933c8e7ef44dbe21e35fa8fa0300f49 (diff) |
It builds!
-rw-r--r-- | packages/base/hmatrix.cabal | 1 | ||||
-rw-r--r-- | packages/base/src/Internal/Chain.hs | 1 | ||||
-rw-r--r-- | packages/base/src/Internal/Random.hs | 1 | ||||
-rw-r--r-- | packages/base/src/Internal/Sparse.hs | 1 | ||||
-rw-r--r-- | packages/base/src/Internal/Specialized.hs | 3 | ||||
-rw-r--r-- | packages/base/src/Internal/Util.hs | 4 | ||||
-rw-r--r-- | packages/base/src/Numeric/LinearAlgebra/Data.hs | 3 | ||||
-rw-r--r-- | packages/base/src/Numeric/LinearAlgebra/Devel.hs | 1 | ||||
-rw-r--r-- | packages/base/src/Numeric/Matrix.hs | 1 |
9 files changed, 13 insertions, 3 deletions
diff --git a/packages/base/hmatrix.cabal b/packages/base/hmatrix.cabal index 4dc62e5..fafd7c8 100644 --- a/packages/base/hmatrix.cabal +++ b/packages/base/hmatrix.cabal | |||
@@ -84,6 +84,7 @@ library | |||
84 | Internal.Util | 84 | Internal.Util |
85 | Internal.Modular | 85 | Internal.Modular |
86 | Internal.Static | 86 | Internal.Static |
87 | Internal.Specialized | ||
87 | 88 | ||
88 | C-sources: src/Internal/C/lapack-aux.c | 89 | C-sources: src/Internal/C/lapack-aux.c |
89 | src/Internal/C/vector-aux.c | 90 | src/Internal/C/vector-aux.c |
diff --git a/packages/base/src/Internal/Chain.hs b/packages/base/src/Internal/Chain.hs index 4000c2b..0d90198 100644 --- a/packages/base/src/Internal/Chain.hs +++ b/packages/base/src/Internal/Chain.hs | |||
@@ -25,6 +25,7 @@ module Internal.Chain ( | |||
25 | import Data.Maybe | 25 | import Data.Maybe |
26 | 26 | ||
27 | import Internal.Matrix | 27 | import Internal.Matrix |
28 | import Internal.Specialized | ||
28 | import Internal.Numeric | 29 | import Internal.Numeric |
29 | 30 | ||
30 | import qualified Data.Array.IArray as A | 31 | import qualified Data.Array.IArray as A |
diff --git a/packages/base/src/Internal/Random.hs b/packages/base/src/Internal/Random.hs index 60b2cef..9459dd9 100644 --- a/packages/base/src/Internal/Random.hs +++ b/packages/base/src/Internal/Random.hs | |||
@@ -22,6 +22,7 @@ module Internal.Random ( | |||
22 | import Internal.Vectorized | 22 | import Internal.Vectorized |
23 | import Internal.Vector | 23 | import Internal.Vector |
24 | import Internal.Matrix | 24 | import Internal.Matrix |
25 | import Internal.Specialized | ||
25 | import Internal.Numeric | 26 | import Internal.Numeric |
26 | import Internal.Algorithms | 27 | import Internal.Algorithms |
27 | import System.Random(randomIO) | 28 | import System.Random(randomIO) |
diff --git a/packages/base/src/Internal/Sparse.hs b/packages/base/src/Internal/Sparse.hs index fbea11a..82f1855 100644 --- a/packages/base/src/Internal/Sparse.hs +++ b/packages/base/src/Internal/Sparse.hs | |||
@@ -14,6 +14,7 @@ module Internal.Sparse( | |||
14 | 14 | ||
15 | import Internal.Vector | 15 | import Internal.Vector |
16 | import Internal.Matrix | 16 | import Internal.Matrix |
17 | import Internal.Specialized | ||
17 | import Internal.Numeric | 18 | import Internal.Numeric |
18 | import qualified Data.Vector.Storable as V | 19 | import qualified Data.Vector.Storable as V |
19 | import Data.Function(on) | 20 | import Data.Function(on) |
diff --git a/packages/base/src/Internal/Specialized.hs b/packages/base/src/Internal/Specialized.hs index 46587d2..19a62d1 100644 --- a/packages/base/src/Internal/Specialized.hs +++ b/packages/base/src/Internal/Specialized.hs | |||
@@ -12,6 +12,9 @@ | |||
12 | {-# LANGUAGE LambdaCase #-} | 12 | {-# LANGUAGE LambdaCase #-} |
13 | module Internal.Specialized | 13 | module Internal.Specialized |
14 | ( Mod(..) | 14 | ( Mod(..) |
15 | , f2i | ||
16 | , i2f | ||
17 | , f2iM | ||
15 | , MatrixOrder(..) | 18 | , MatrixOrder(..) |
16 | , Matrix(..) | 19 | , Matrix(..) |
17 | , createMatrix | 20 | , createMatrix |
diff --git a/packages/base/src/Internal/Util.hs b/packages/base/src/Internal/Util.hs index 4cc6b66..646dea8 100644 --- a/packages/base/src/Internal/Util.hs +++ b/packages/base/src/Internal/Util.hs | |||
@@ -64,8 +64,8 @@ module Internal.Util( | |||
64 | ) where | 64 | ) where |
65 | 65 | ||
66 | import Internal.Vector | 66 | import Internal.Vector |
67 | import Internal.Matrix hiding (size) | 67 | import Internal.Matrix |
68 | import Internal.Specialized | 68 | import Internal.Specialized hiding (size) |
69 | import Internal.Numeric | 69 | import Internal.Numeric |
70 | import Internal.Element | 70 | import Internal.Element |
71 | import Internal.Container | 71 | import Internal.Container |
diff --git a/packages/base/src/Numeric/LinearAlgebra/Data.hs b/packages/base/src/Numeric/LinearAlgebra/Data.hs index a389aac..ed293ab 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Data.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Data.hs | |||
@@ -108,7 +108,8 @@ module Numeric.LinearAlgebra.Data( | |||
108 | 108 | ||
109 | import Internal.Vector | 109 | import Internal.Vector |
110 | import Internal.Vectorized | 110 | import Internal.Vectorized |
111 | import Internal.Matrix hiding (size) | 111 | import Internal.Matrix |
112 | import Internal.Specialized hiding (size) | ||
112 | import Internal.Element | 113 | import Internal.Element |
113 | import Internal.IO | 114 | import Internal.IO |
114 | import Internal.Numeric | 115 | import Internal.Numeric |
diff --git a/packages/base/src/Numeric/LinearAlgebra/Devel.hs b/packages/base/src/Numeric/LinearAlgebra/Devel.hs index e974fc4..b9fd2e7 100644 --- a/packages/base/src/Numeric/LinearAlgebra/Devel.hs +++ b/packages/base/src/Numeric/LinearAlgebra/Devel.hs | |||
@@ -63,6 +63,7 @@ import Internal.Devel | |||
63 | import Internal.ST | 63 | import Internal.ST |
64 | import Internal.Vector | 64 | import Internal.Vector |
65 | import Internal.Matrix | 65 | import Internal.Matrix |
66 | import Internal.Specialized | ||
66 | import Internal.Element | 67 | import Internal.Element |
67 | import Internal.Sparse | 68 | import Internal.Sparse |
68 | 69 | ||
diff --git a/packages/base/src/Numeric/Matrix.hs b/packages/base/src/Numeric/Matrix.hs index 6e3db61..ed57fd0 100644 --- a/packages/base/src/Numeric/Matrix.hs +++ b/packages/base/src/Numeric/Matrix.hs | |||
@@ -30,6 +30,7 @@ module Numeric.Matrix ( | |||
30 | 30 | ||
31 | import Internal.Vector | 31 | import Internal.Vector |
32 | import Internal.Matrix | 32 | import Internal.Matrix |
33 | import Internal.Specialized | ||
33 | import Internal.Element | 34 | import Internal.Element |
34 | import Internal.Numeric | 35 | import Internal.Numeric |
35 | import qualified Data.Monoid as M | 36 | import qualified Data.Monoid as M |