git.iko.soy/streamly
on master help sign in
Change module structure for PrimArray
9bab836adithyaov
benchmark/Streamly/Benchmark/Data/PrimArray.hs → benchmark/Streamly/Benchmark/Data/Prim/Array.hsrenamed+3−3
compare with master
unifiedsplit
@@ -14,8 +14,8 @@ module Main (main) where
14import Control.DeepSeq (NFData(..))
14import Control.DeepSeq (NFData(..))
15import System.Random (randomRIO)
15import System.Random (randomRIO)
16
16
17−import qualified Streamly.Benchmark.Data.PrimArrayOps as Ops
17+import qualified Streamly.Benchmark.Data.Prim.ArrayOps as Ops
18−import qualified Streamly.Data.PrimArray as A
18+import qualified Streamly.Internal.Data.Prim.Array as A
19import qualified Streamly.Prelude as S
19import qualified Streamly.Prelude as S
20
20
21import Gauge
21import Gauge
@@ -55,7 +55,7 @@ mkString = "[1" ++ concat (replicate Ops.value ",1") ++ "]"
55main :: IO ()
55main :: IO ()
56main =
56main =
57 defaultMain
57 defaultMain
58− [ bgroup "Data.PrimArray"
58+ [ bgroup "Data.Prim.Array"
59 [ bgroup "generation"
59 [ bgroup "generation"
60 [ benchIOSrc "writeN . intFromTo" Ops.sourceIntFromTo
60 [ benchIOSrc "writeN . intFromTo" Ops.sourceIntFromTo
61 , benchIOSrc "write . intFromTo" Ops.sourceIntFromToFromStream
61 , benchIOSrc "write . intFromTo" Ops.sourceIntFromToFromStream
benchmark/Streamly/Benchmark/Data/PrimArrayOps.hs → benchmark/Streamly/Benchmark/Data/Prim/ArrayOps.hsrenamed+3−3
@@ -1,5 +1,5 @@
1-- |
1-- |
2−-- Module : Streamly.Benchmark.Data.PrimArrayOps
2+-- Module : Streamly.Benchmark.Data.Prim.ArrayOps
3-- Copyright : (c) 2019 Composewell Technologies
3-- Copyright : (c) 2019 Composewell Technologies
4--
4--
5-- License : BSD-3-Clause
5-- License : BSD-3-Clause
@@ -13,7 +13,7 @@
13{-# LANGUAGE FlexibleContexts #-}
13{-# LANGUAGE FlexibleContexts #-}
14{-# LANGUAGE ScopedTypeVariables #-}
14{-# LANGUAGE ScopedTypeVariables #-}
15
15
16−module Streamly.Benchmark.Data.PrimArrayOps where
16+module Streamly.Benchmark.Data.Prim.ArrayOps where
17
17
18import Control.Monad.IO.Class (MonadIO)
18import Control.Monad.IO.Class (MonadIO)
19import Prelude (Int, Bool, (+), ($), (==), (>), (.), Maybe(..), undefined)
19import Prelude (Int, Bool, (+), ($), (==), (>), (.), Maybe(..), undefined)
@@ -23,7 +23,7 @@ import qualified Data.Foldable as F
23#endif
23#endif
24
24
25import qualified Streamly as S hiding (foldMapWith, runStream)
25import qualified Streamly as S hiding (foldMapWith, runStream)
26−import qualified Streamly.Data.PrimArray as A
26+import qualified Streamly.Internal.Data.Prim.Array as A
27import qualified Streamly.Prelude as S
27import qualified Streamly.Prelude as S
28
28
29value :: Int
29value :: Int
src/Streamly/Data/PrimArray.hs → src/Streamly/Data/Prim/Array.hsrenamed+4−4
@@ -1,5 +1,5 @@
1-- |
1-- |
2−-- Module : Streamly.Data.PrimArray
2+-- Module : Streamly.Data.Prim.Array
3-- Copyright : (c) 2019 Composewell Technologies
3-- Copyright : (c) 2019 Composewell Technologies
4--
4--
5-- License : BSD-3-Clause
5-- License : BSD-3-Clause
@@ -7,7 +7,7 @@
7-- Stability : experimental
7-- Stability : experimental
8-- Portability : GHC
8-- Portability : GHC
9--
9--
10−module Streamly.Data.PrimArray
10+module Streamly.Data.Prim.Array
11 ( PrimArray
11 ( PrimArray
12 , Prim
12 , Prim
13
13
@@ -39,6 +39,6 @@ module Streamly.Data.PrimArray
39 )
39 )
40where
40where
41
41
42−import Streamly.Internal.Data.PrimArray (PrimArray, Prim)
42+import Streamly.Internal.Data.Prim.Array (PrimArray, Prim)
43
43
44−import qualified Streamly.Internal.Data.PrimArray as A
44+import qualified Streamly.Internal.Data.Prim.Array as A
src/Streamly/Internal/Data/PrimArray.hs → src/Streamly/Internal/Data/Prim/Array.hsrenamed+2−3
@@ -7,7 +7,7 @@
7#include "inline.hs"
7#include "inline.hs"
8
8
9-- |
9-- |
10−-- Module : Streamly.Internal.Data.PrimArray
10+-- Module : Streamly.Internal.Data.Prim.Array
11-- Copyright : (c) 2019 Composewell Technologies
11-- Copyright : (c) 2019 Composewell Technologies
12--
12--
13-- License : BSD-3-Clause
13-- License : BSD-3-Clause
@@ -15,7 +15,7 @@
15-- Stability : experimental
15-- Stability : experimental
16-- Portability : GHC
16-- Portability : GHC
17--
17--
18−module Streamly.Internal.Data.PrimArray
18+module Streamly.Internal.Data.Prim.Array
19 ( PrimArray(..)
19 ( PrimArray(..)
20 , Prim(..)
20 , Prim(..)
21
21
@@ -52,7 +52,6 @@ import Control.DeepSeq (NFData(..))
52import Control.Monad (when)
52import Control.Monad (when)
53import Control.Monad.IO.Class (liftIO, MonadIO)
53import Control.Monad.IO.Class (liftIO, MonadIO)
54import GHC.IO (unsafePerformIO)
54import GHC.IO (unsafePerformIO)
55−import GHC.Base (Int(..))
56import Data.Primitive.PrimArray
55import Data.Primitive.PrimArray
57import Data.Primitive.Types (Prim(..))
56import Data.Primitive.Types (Prim(..))
58
57
streamly.cabal+4−4
@@ -284,7 +284,7 @@ library
284 , Streamly.FileSystem.FDIO
284 , Streamly.FileSystem.FDIO
285 , Streamly.FileSystem.FD
285 , Streamly.FileSystem.FD
286
286
287− , Streamly.Data.PrimArray
287+ , Streamly.Data.Prim.Array
288
288
289 exposed-modules:
289 exposed-modules:
290 Streamly.Prelude
290 Streamly.Prelude
@@ -310,7 +310,7 @@ library
310 , Streamly.Internal.Data.Time.Clock
310 , Streamly.Internal.Data.Time.Clock
311 , Streamly.Internal.Data.SVar
311 , Streamly.Internal.Data.SVar
312 , Streamly.Internal.Data.Array
312 , Streamly.Internal.Data.Array
313− , Streamly.Internal.Data.PrimArray
313+ , Streamly.Internal.Data.Prim.Array
314 , Streamly.Internal.Data.SmallArray
314 , Streamly.Internal.Data.SmallArray
315 , Streamly.Internal.Memory.Array.Types
315 , Streamly.Internal.Memory.Array.Types
316 , Streamly.Internal.Memory.Array
316 , Streamly.Internal.Memory.Array
@@ -696,8 +696,8 @@ benchmark prim-array
696 import: bench-options
696 import: bench-options
697 type: exitcode-stdio-1.0
697 type: exitcode-stdio-1.0
698 hs-source-dirs: benchmark
698 hs-source-dirs: benchmark
699− main-is: Streamly/Benchmark/Data/PrimArray.hs
699+ main-is: Streamly/Benchmark/Data/Prim/Array.hs
700− other-modules: Streamly.Benchmark.Data.PrimArrayOps
700+ other-modules: Streamly.Benchmark.Data.Prim.ArrayOps
701 build-depends:
701 build-depends:
702 streamly
702 streamly
703 , base >= 4.8 && < 5
703 , base >= 4.8 && < 5
test/Streamly/Test/Array.hs+1−1
@@ -32,7 +32,7 @@ import qualified Streamly.Internal.Memory.Array as A
32import qualified Streamly.Internal.Prelude as IP
32import qualified Streamly.Internal.Prelude as IP
33type Array = A.Array
33type Array = A.Array
34#elif defined(TEST_PRIM_ARRAY)
34#elif defined(TEST_PRIM_ARRAY)
35−import qualified Streamly.Data.PrimArray as A
35+import qualified Streamly.Internal.Data.Prim.Array as A
36type Array = A.PrimArray
36type Array = A.PrimArray
37#else
37#else
38import qualified Streamly.Internal.Data.Array as A
38import qualified Streamly.Internal.Data.Array as A