hsbencher 1.3.8 → 1.3.9

raw patch · 2 files changed

+29/−4 lines, 2 filesdep ~io-streamsPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: io-streams

API changes (from Hackage documentation)

Files

• HSBencher/App.hs +4/−0
• hsbencher.cabal +25/−4

@@ -62,8 +62,10 @@ import qualified System.IO.Streams.Process as Strm import qualified System.IO.Streams.Combinators as Strm +#ifdef USE_HYDRAPRINT import UI.HydraPrint (hydraPrint, HydraConf(..), DeleteWinWhen(..), defaultHydraConf, hydraPrintStatic) import Scripting.Parallel.ThreadPool (parForM)+#endif  #ifdef FUSION_TABLES import HSBencher.Fusion@@ -643,12 +645,14 @@ catParallelOutput :: [Strm.InputStream B.ByteString] -> Strm.OutputStream B.ByteString -> IO () catParallelOutput strms stdOut = do   case 4 of+#ifdef USE_HYDRAPRINT       -- First option is to create N window panes immediately.    1 -> do            hydraPrintStatic defaultHydraConf (zip (map show [1..]) strms)    2 -> do            srcs <- Strm.fromList (zip (map show [1..]) strms)            hydraPrint defaultHydraConf{deleteWhen=Never} srcs+#endif    -- This version interleaves their output lines (ugly):    3 -> do             strms2 <- mapM Strm.lines strms

@@ -1,6 +1,6 @@  name:                hsbencher-version:             1.3.8+version:             1.3.9 -- CHANGELOG: -- 1.0   : Initial release, new flexible benchmark format. -- 1.1   : Change interface to RunInPlace@@ -13,6 +13,7 @@ -- 1.3.4 : Add ability to prune/select benchmarks with commmand line args -- 1.3.6 : bugfix productivity for timeouts -- 1.3.8 : Added --skipto and --runid+-- 1.3.8 : Remove hydra-print dep by default.  Add 'hydra' flag.  synopsis:  Flexible benchmark runner for Haskell and non-Haskell benchmarks. @@ -65,6 +66,7 @@  ChangesLog:  .  * (1.3.8) Added @--skipto@ and @--runid@ arguments+ .  * (1.3.4) Added ability to prune benchmarks with patterns on command line.  @@ -93,6 +95,11 @@       Add support for Google Fusion Table upload of benchmark data.   default: True +Flag hydra+  description:+      Add support for (and dependency on) the hydra-print library.+  default: False+ Library    source-repository head     type:  git@@ -111,8 +118,14 @@       -- base ==4.6.*, bytestring ==0.10.*, process ==1.1.*, directory ==1.2.*, filepath ==1.3.*, random ==1.0.*,        -- unix ==2.6.*, containers ==0.5.*, time ==1.4.*, mtl ==2.1.*, async >= 2.0,       base >= 4.5 && <= 4.7, bytestring, process, directory, filepath, random, unix, containers, time, mtl, async, -      hydra-print >= 0.1.0.3, io-streams >= 1.0,+      io-streams >= 1.1,       GenericPretty >= 1.2, http-conduit++  if flag(hydra) {+    build-depends: hydra-print >= 0.1.0.3+    cpp-options: -DUSE_HYDRAPRINT+  }+   default-language:    Haskell2010    if flag(fusion) {@@ -148,12 +161,16 @@   build-depends:     -- <DUPLICATED from above>     base >= 4.5 && <= 4.7, bytestring, process, directory, filepath, random, unix, containers, time, mtl, async, -    hydra-print >= 0.1.0.3, io-streams >= 1.0,+    io-streams >= 1.0,     GenericPretty >= 1.2, http-conduit, hsbencher     -- </DUPLICATED>   ghc-options: -threaded    default-language:  Haskell2010 +  if flag(hydra) {+     build-depends: hydra-print >= 0.1.0.3+  }+   if flag(fusion) {     build-depends: handa-gdata >= 0.6.2     cpp-options: -DFUSION_TABLES@@ -165,11 +182,15 @@   build-depends:     -- <DUPLICATED from above>     base >= 4.5 && <= 4.7, bytestring, process, directory, filepath, random, unix, containers, time, mtl, async, -    hydra-print >= 0.1.0.3, io-streams >= 1.0,+    io-streams >= 1.0,     GenericPretty >= 1.2, http-conduit, hsbencher     -- </DUPLICATED>   ghc-options: -threaded    default-language:  Haskell2010++  if flag(hydra) {+     build-depends: hydra-print >= 0.1.0.3+  }    if flag(fusion) {     build-depends: handa-gdata >= 0.6.2