From 8ce80f6d8a38d67e9781f4a361e5c904bb73c7cd Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Sat, 10 Aug 2019 03:52:20 -0400 Subject: It builds! --- packages/base/hmatrix.cabal | 1 + packages/base/src/Internal/Chain.hs | 1 + packages/base/src/Internal/Random.hs | 1 + packages/base/src/Internal/Sparse.hs | 1 + packages/base/src/Internal/Specialized.hs | 3 +++ packages/base/src/Internal/Util.hs | 4 ++-- packages/base/src/Numeric/LinearAlgebra/Data.hs | 3 ++- packages/base/src/Numeric/LinearAlgebra/Devel.hs | 1 + 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 Internal.Util Internal.Modular Internal.Static + Internal.Specialized C-sources: src/Internal/C/lapack-aux.c 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 ( import Data.Maybe import Internal.Matrix +import Internal.Specialized import Internal.Numeric 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 ( import Internal.Vectorized import Internal.Vector import Internal.Matrix +import Internal.Specialized import Internal.Numeric import Internal.Algorithms 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( import Internal.Vector import Internal.Matrix +import Internal.Specialized import Internal.Numeric import qualified Data.Vector.Storable as V 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 @@ {-# LANGUAGE LambdaCase #-} module Internal.Specialized ( Mod(..) + , f2i + , i2f + , f2iM , MatrixOrder(..) , Matrix(..) , 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( ) where import Internal.Vector -import Internal.Matrix hiding (size) -import Internal.Specialized +import Internal.Matrix +import Internal.Specialized hiding (size) import Internal.Numeric import Internal.Element 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( import Internal.Vector import Internal.Vectorized -import Internal.Matrix hiding (size) +import Internal.Matrix +import Internal.Specialized hiding (size) import Internal.Element import Internal.IO 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 import Internal.ST import Internal.Vector import Internal.Matrix +import Internal.Specialized import Internal.Element import Internal.Sparse 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 ( import Internal.Vector import Internal.Matrix +import Internal.Specialized import Internal.Element import Internal.Numeric import qualified Data.Monoid as M -- cgit v1.2.3