on master help sign in
Depend on streamly library for internal benchmarks.

- Move StreamDK to exposed modules.

commit210f6da49d9247b0a59d584c9098164314a85e6f authorPranay Sashank <pranaysashank@gmail.com> dateMon 23 Dec 2019, 12:41 (7 years ago) parent7032579
1 file changed+18−85
streamly.cabal+18−85
streamly.cabal+18−85
@@ -269,9 +269,6 @@ library
269269 c-sources: src/Streamly/Internal/Data/Time/Darwin.c
270270 hs-source-dirs: src
271271 other-modules:
272− Streamly.Internal.Data.Stream.StreamDK.Type
273− , Streamly.Internal.Data.Stream.StreamDK
274−
275272 -- Memory storage
276273 Streamly.Memory.Malloc
277274 , Streamly.Memory.Ring
@@ -302,7 +299,6 @@ library
302299 , Streamly.Internal.Data.Time
303300 , Streamly.Internal.Data.Time.Units
304301 , Streamly.Internal.Data.Time.Clock
305− , Streamly.Internal.Data.Stream.StreamD.Type
306302 , Streamly.Internal.Data.SVar
307303 , Streamly.Internal.Data.Array
308304 , Streamly.Internal.Data.SmallArray
@@ -317,7 +313,10 @@ library
317313 -- Base streams
318314 , Streamly.Internal.Data.Stream.StreamK.Type
319315 , Streamly.Internal.Data.Stream.StreamK
316+ , Streamly.Internal.Data.Stream.StreamD.Type
320317 , Streamly.Internal.Data.Stream.StreamD
318+ , Streamly.Internal.Data.Stream.StreamDK.Type
319+ , Streamly.Internal.Data.Stream.StreamDK
321320 , Streamly.Internal.Data.Stream.Enumeration
322321 , Streamly.Internal.Data.Stream.Prelude
323322
@@ -733,112 +732,46 @@ benchmark concurrent
733732 buildable: False
734733
735734-------------------------------------------------------------------------------
736−-- Internal benchmarks for unexposed modules
735+-- Internal benchmarks
737736-------------------------------------------------------------------------------
738737
739−-- We have to copy the streamly library modules here because there is no
740−-- way to use unexposed modules from the library.
741−
742738benchmark base
743739 import: bench-options
744740 type: exitcode-stdio-1.0
745− include-dirs: src/Streamly/Internal/Data/Time
746− , src
747− if os(windows)
748− c-sources: src/Streamly/Internal/Data/Time/Windows.c
749− if os(darwin)
750− c-sources: src/Streamly/Internal/Data/Time/Darwin.c
751− hs-source-dirs: benchmark, src
741+ hs-source-dirs: benchmark
752742 main-is: BaseStreams.hs
753− other-modules: Streamly.Internal.Data.Atomics
754− , Streamly.Internal.Data.Stream.StreamD.Type
755− , Streamly.Internal.Data.SVar
756− , Streamly.Internal.Data.Time.Units
757− , Streamly.Internal.Data.Time.Clock
758− , Streamly.Internal.Data.Stream.StreamDK.Type
759− , Streamly.Internal.Data.Stream.StreamDK
760− , Streamly.Internal.Data.Stream.StreamK.Type
761− , Streamly.Internal.Data.Stream.StreamK
762− , Streamly.Internal.Data.Stream.StreamD
763− , Streamly.Internal.Data.Stream.Prelude
764− , Streamly.FileSystem.IOVec
765−
766− , StreamDOps
743+ other-modules: StreamDOps
767744 , StreamKOps
768745 , StreamDKOps
769746
770747 if flag(dev)
771748 buildable: True
772749 build-depends:
773− base >= 4.8 && < 5
750+ streamly
751+ , base >= 4.8 && < 5
774752 , deepseq >= 1.4.1 && < 1.5
775753 , random >= 1.0 && < 2.0
776754 , gauge >= 0.2.4 && < 0.3
777−
778− , ghc-prim >= 0.2 && < 0.6
779− , containers >= 0.5.8.2 && < 0.7
780− , heaps >= 0.3 && < 0.4
781−
782− -- concurrency
783− , atomic-primops >= 0.8 && < 0.9
784− , lockfree-queue >= 0.2.3 && < 0.3
785−
786− , exceptions >= 0.8 && < 0.11
787− , monad-control >= 1.0 && < 2
788− , mtl >= 2.2 && < 3
789− , transformers >= 0.4 && < 0.6
790− , transformers-base >= 0.4 && < 0.5
791−
792− if impl(ghc < 8.0)
793− build-depends:
794− semigroups >= 0.18 && < 0.19
795755 else
796756 buildable: False
797757
798758executable nano-bench
799759 import: bench-options
800− hs-source-dirs: benchmark, src
801− include-dirs: src/Streamly/Internal/Data/Time
802− , src
803− if os(windows)
804− c-sources: src/Streamly/Internal/Data/Time/Windows.c
805− if os(darwin)
806− c-sources: src/Streamly/Internal/Data/Time/Darwin.c
760+ hs-source-dirs: benchmark
807761 main-is: NanoBenchmarks.hs
808− other-modules: Streamly.Internal.Data.Atomics
809− , Streamly.Internal.Data.Stream.StreamD.Type
810− , Streamly.Internal.Data.SVar
811− , Streamly.Internal.Data.Time.Units
812− , Streamly.Internal.Data.Time.Clock
813− , Streamly.Internal.Data.Stream.StreamK.Type
814− , Streamly.Internal.Data.Stream.StreamK
815− , Streamly.FileSystem.IOVec
816− , Streamly.Internal.Data.Stream.StreamD
817762 if flag(dev)
818763 buildable: True
819764 build-depends:
820− base >= 4.8 && < 5
821− , gauge >= 0.2.4 && < 0.3
822− , ghc-prim >= 0.2 && < 0.6
823− , containers >= 0.5.8.2 && < 0.7
824− , deepseq >= 1.4.1 && < 1.5
825− , heaps >= 0.3 && < 0.4
826− , random >= 1.0 && < 2.0
827−
828− -- concurrency
829− , atomic-primops >= 0.8 && < 0.9
830− , lockfree-queue >= 0.2.3 && < 0.3
831−
832− , exceptions >= 0.8 && < 0.11
833− , monad-control >= 1.0 && < 2
834− , mtl >= 2.2 && < 3
835− , transformers >= 0.4 && < 0.6
836− , transformers-base >= 0.4 && < 0.5
765+ streamly
766+ , base >= 4.8 && < 5
767+ , gauge >= 0.2.4 && < 0.3
768+ , random >= 1.0 && < 2.0
837769 else
838770 buildable: False
839771
840−executable adaptive
772+benchmark adaptive
841773 import: bench-options
774+ type: exitcode-stdio-1.0
842775 hs-source-dirs: benchmark
843776 main-is: Adaptive.hs
844777 default-language: Haskell2010
@@ -846,9 +779,9 @@ executable adaptive
846779 buildable: True
847780 build-depends:
848781 streamly
849− , base >= 4.8 && < 5
850− , gauge >= 0.2.4 && < 0.3
851− , random >= 1.0 && < 2.0
782+ , base >= 4.8 && < 5
783+ , gauge >= 0.2.4 && < 0.3
784+ , random >= 1.0 && < 2.0
852785 else
853786 buildable: False
854787