diff options
Diffstat (limited to 'packages/base')
-rw-r--r-- | packages/base/hmatrix.cabal | 1 | ||||
-rw-r--r-- | packages/base/src/Internal/Element.hs | 3 | ||||
-rw-r--r-- | packages/base/src/Internal/Numeric.hs | 1 | ||||
-rw-r--r-- | packages/base/src/Internal/Vector.hs | 6 |
4 files changed, 1 insertions, 10 deletions
diff --git a/packages/base/hmatrix.cabal b/packages/base/hmatrix.cabal index aba6fa7..faf84e8 100644 --- a/packages/base/hmatrix.cabal +++ b/packages/base/hmatrix.cabal | |||
@@ -93,7 +93,6 @@ library | |||
93 | if arch(i386) | 93 | if arch(i386) |
94 | cc-options: -msse2 | 94 | cc-options: -msse2 |
95 | 95 | ||
96 | cpp-options: -DBINARY | ||
97 | 96 | ||
98 | if os(OSX) | 97 | if os(OSX) |
99 | if flag(openblas) | 98 | if flag(openblas) |
diff --git a/packages/base/src/Internal/Element.hs b/packages/base/src/Internal/Element.hs index a459678..eb3a25b 100644 --- a/packages/base/src/Internal/Element.hs +++ b/packages/base/src/Internal/Element.hs | |||
@@ -3,7 +3,6 @@ | |||
3 | {-# LANGUAGE FlexibleInstances #-} | 3 | {-# LANGUAGE FlexibleInstances #-} |
4 | {-# LANGUAGE UndecidableInstances #-} | 4 | {-# LANGUAGE UndecidableInstances #-} |
5 | {-# LANGUAGE MultiParamTypeClasses #-} | 5 | {-# LANGUAGE MultiParamTypeClasses #-} |
6 | {-# LANGUAGE CPP #-} | ||
7 | 6 | ||
8 | ----------------------------------------------------------------------------- | 7 | ----------------------------------------------------------------------------- |
9 | -- | | 8 | -- | |
@@ -35,7 +34,6 @@ import Control.Monad(liftM) | |||
35 | 34 | ||
36 | ------------------------------------------------------------------- | 35 | ------------------------------------------------------------------- |
37 | 36 | ||
38 | #ifdef BINARY | ||
39 | 37 | ||
40 | import Data.Binary | 38 | import Data.Binary |
41 | 39 | ||
@@ -48,7 +46,6 @@ instance (Binary (Vector a), Element a) => Binary (Matrix a) where | |||
48 | v <- get | 46 | v <- get |
49 | return (reshape c v) | 47 | return (reshape c v) |
50 | 48 | ||
51 | #endif | ||
52 | 49 | ||
53 | ------------------------------------------------------------------- | 50 | ------------------------------------------------------------------- |
54 | 51 | ||
diff --git a/packages/base/src/Internal/Numeric.hs b/packages/base/src/Internal/Numeric.hs index e8c7440..dd74165 100644 --- a/packages/base/src/Internal/Numeric.hs +++ b/packages/base/src/Internal/Numeric.hs | |||
@@ -1,4 +1,3 @@ | |||
1 | {-# LANGUAGE CPP #-} | ||
2 | {-# LANGUAGE TypeFamilies #-} | 1 | {-# LANGUAGE TypeFamilies #-} |
3 | {-# LANGUAGE FlexibleContexts #-} | 2 | {-# LANGUAGE FlexibleContexts #-} |
4 | {-# LANGUAGE FlexibleInstances #-} | 3 | {-# LANGUAGE FlexibleInstances #-} |
diff --git a/packages/base/src/Internal/Vector.hs b/packages/base/src/Internal/Vector.hs index de4e670..b4e235c 100644 --- a/packages/base/src/Internal/Vector.hs +++ b/packages/base/src/Internal/Vector.hs | |||
@@ -1,4 +1,4 @@ | |||
1 | {-# LANGUAGE MagicHash, CPP, UnboxedTuples, BangPatterns, FlexibleContexts #-} | 1 | {-# LANGUAGE MagicHash, UnboxedTuples, BangPatterns, FlexibleContexts #-} |
2 | {-# LANGUAGE TypeSynonymInstances #-} | 2 | {-# LANGUAGE TypeSynonymInstances #-} |
3 | 3 | ||
4 | 4 | ||
@@ -39,12 +39,10 @@ import GHC.Base(realWorld#, IO(IO), when) | |||
39 | import qualified Data.Vector.Storable as Vector | 39 | import qualified Data.Vector.Storable as Vector |
40 | import Data.Vector.Storable(Vector, fromList, unsafeToForeignPtr, unsafeFromForeignPtr, unsafeWith) | 40 | import Data.Vector.Storable(Vector, fromList, unsafeToForeignPtr, unsafeFromForeignPtr, unsafeWith) |
41 | 41 | ||
42 | #ifdef BINARY | ||
43 | import Data.Binary | 42 | import Data.Binary |
44 | import Control.Monad(replicateM) | 43 | import Control.Monad(replicateM) |
45 | import qualified Data.ByteString.Internal as BS | 44 | import qualified Data.ByteString.Internal as BS |
46 | import Data.Vector.Storable.Internal(updPtr) | 45 | import Data.Vector.Storable.Internal(updPtr) |
47 | #endif | ||
48 | 46 | ||
49 | type I = CInt | 47 | type I = CInt |
50 | type Z = Int64 | 48 | type Z = Int64 |
@@ -380,7 +378,6 @@ mapVectorWithIndex f v = unsafePerformIO $ do | |||
380 | -------------------------------------------------------------------------------- | 378 | -------------------------------------------------------------------------------- |
381 | 379 | ||
382 | 380 | ||
383 | #ifdef BINARY | ||
384 | 381 | ||
385 | -- a 64K cache, with a Double taking 13 bytes in Bytestring, | 382 | -- a 64K cache, with a Double taking 13 bytes in Bytestring, |
386 | -- implies a chunk size of 5041 | 383 | -- implies a chunk size of 5041 |
@@ -432,7 +429,6 @@ instance (Binary a, Storable a) => Binary (Vector a) where | |||
432 | 429 | ||
433 | -- get = fmap bs2v get | 430 | -- get = fmap bs2v get |
434 | 431 | ||
435 | #endif | ||
436 | 432 | ||
437 | 433 | ||
438 | ------------------------------------------------------------------- | 434 | ------------------------------------------------------------------- |