Updated to latest released versions of all packages

haskell-perf · Aug 30, 2017 · fdf31fb · fdf31fb
1 parent 7b18804
commit fdf31fb
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 30 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -0,0 +1,4 @@
+0.1.1
+	Switched to the newly hackage-released 'serialise' package from the previously unreleased 'binary-serialise-cbor' package
+	Updated all packages to the latest available version
+
diff --git a/README.md b/README.md
@@ -3,12 +3,12 @@ Time and size benchmarks for the following Haskell serialization libraries:
 
 | Package                                                                              | Laziness                      | Compatibility             |
 | ---                                                                                  | ---                           | ---                       |
-| [store-0.4.2](https://hackage.haskell.org/package/store)                             | Strict                        | Haskell-Same-Architecture |
+| [store-0.4.3.1](https://hackage.haskell.org/package/store)                           | Strict                        | Haskell-Same-Architecture |
 | [packman-0.3.0](http://hackage.haskell.org/package/packman)                          | Lazy                          | Haskell-Same-Architecture |
 | [cereal-0.5.4.0](http://hackage.haskell.org/package/cereal)                          | Strict                        | Haskell                   |
 | [binary-0.8.5.1](http://hackage.haskell.org/package/binary)                          | Lazy                          | Haskell                   |
 | [binary-serialise-cbor-0.1.1.0](https://github.com/well-typed/binary-serialise-cbor) | Lazy                          | Multi-Language            |
-| [flat-0.2.2](https://github.com/tittoassini/flat)                                    | Strict  | Multi-Language            |
+| [flat-0.3](https://github.com/tittoassini/flat)                                      | Strict  | Multi-Language            |
 
 Compatibility Levels (lowest to highest):
 * Haskell-Same-Architecture

diff --git a/report.json b/report.json
diff --git a/serialization.cabal b/serialization.cabal
@@ -1,15 +1,10 @@
 name:                serialization
-version:             0.1.0.0
--- synopsis:
--- description:
--- license:
+version:             0.1.1
+synopsis: Time and size benchmarks for the most popular Haskell serialization libraries
 license-file:        LICENSE
 author:              Ömer Sinan Ağacan
 maintainer:          [email protected]
--- copyright:
--- category:
 build-type:          Simple
--- extra-source-files:
 cabal-version:       >=1.10
 
 library
@@ -25,7 +20,7 @@ benchmark all
                 QuickCheck,
                 base               >=4.8   && <4.10,
                 binary             >=0.8   && <0.9,
-                binary-serialise-cbor,
+                serialise,
                 bytestring,
                 cereal             >=0.5.1 && <0.6,
                 containers >= 0.5.6.2,
@@ -42,4 +37,4 @@ benchmark all
   hs-source-dirs:      src
   default-language:    Haskell2010
   ghc-options:         -Wall -fno-warn-orphans -O2
-  --ghc-options:         -Wall -O2 -ddump-simpl -dsuppress-idinfo -ddump-to-file
+  --ghc-options:         -Wall -O2 -ddump-simpl -dsuppress-idinfo -ddump-to-file
diff --git a/src/Dataset.hs b/src/Dataset.hs
@@ -5,7 +5,8 @@
 module Dataset(carsData,irisData) where
 import           Control.DeepSeq
 import qualified Data.Binary                as B
-import           Data.Binary.Serialise.CBOR as CBOR
+-- import           Data.Binary.Serialise.CBOR as CBOR
+import Codec.Serialise as CBOR
 import qualified Data.Flat                  as F
 import qualified Data.Serialize             as C
 import qualified Data.Store                 as S

diff --git a/src/Main.hs b/src/Main.hs
@@ -22,7 +22,8 @@ import           Data.Typeable
 import           Criterion.Types
 -- import           Data.Bifunctor
 import qualified Data.Binary                as B
-import           Data.Binary.Serialise.CBOR as CBOR
+-- import           Data.Binary.Serialise.CBOR as CBOR
+import Codec.Serialise as CBOR
 -- import           Data.List
 -- import           Data.Ord
 import           GHC.Generics
@@ -182,17 +183,17 @@ instance (S.Store a, NFData a) => Serialize PkgStore a where
 
 instance (F.Flat a, NFData a) => Serialize PkgFlat a where
     {-# NOINLINE serialize #-}
-    serialize _   = return . force . LBS.toStrict . F.flat
+    serialize _   = return . force . F.flat
     {-# NOINLINE deserialize #-}
-    deserialize _ = return . force . fromRight . F.unflat . LBS.fromStrict
+    deserialize _ = return . force . fromRight . F.unflat
 
 pkgs :: (NFData a,C.Serialize a,Typeable a,Serialise a,S.Store a,F.Flat a,B.Binary a) => [(String,a -> IO BS.ByteString,BS.ByteString -> IO a)]
 pkgs = [("store",serialize PkgStore,deserialize PkgStore)
        ,("flat",serialize PkgFlat,deserialize PkgFlat)
        ,("binary",serialize PkgBinary,deserialize PkgBinary)
        ,("cereal",serialize PkgCereal,deserialize PkgCereal)
        ,("packman",serialize PkgPackman,deserialize PkgPackman)
-       ,("binary_serialise_cbor",serialize PkgCBOR,deserialize PkgCBOR)
+       ,("serialise",serialize PkgCBOR,deserialize PkgCBOR)
        ]
 
 prop :: Serialize lib (BinTree Int) => lib -> Property

diff --git a/stack.yaml b/stack.yaml
@@ -1,5 +1,5 @@
 # ghc 7.10.3
-resolver: lts-6.30
+resolver: lts-6.35
 
 # ghc 8.0.1
 # PROB: packman won't compile
@@ -9,24 +9,19 @@ resolver: lts-6.30
 packages:
 - '.'
 
-# - ../flat
-
-- location:
-    git: https://github.com/well-typed/binary-serialise-cbor
-    commit: bfbbc3cc741ffa8a6ad3a23ae77f004e8c0e3620
-  extra-dep: true
-
 flags:
-  binary-serialise-cbor:
-    newtime15: true
+   serialise:
+     newtime15: true
 
 extra-deps:
 - packman-0.3.0
 - binary-0.8.5.1
 - cereal-0.5.4.0
-- flat-0.2.2
-- store-0.4.2
-- store-core-0.4
+- flat-0.3
+- store-0.4.3.1
+- store-core-0.4.1
+- serialise-0.1.0.0
+- cborg-0.1.1.0
 - th-utilities-0.2.0.1
 - datasets-0.2.1
 - criterion-1.1.4.0