Fixed some warnings, updated CHANGES for new lol-cpp and lol-apps ver…

…sions, and tweaked URLs in cabal files
cpeikert · Feb 23, 2017 · 4b58242 · 4b58242
1 parent c4d80ae
commit 4b58242
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 17 deletions.
diff --git a/lol-apps/CHANGES.md b/lol-apps/CHANGES.md
@@ -1,6 +1,10 @@
 Changelog for lol project
 ================================
 
+0.2.0.1
+----
+ * Fixed compile error in KHPRFTests.
+
 0.2.0.0
 ----
  * Added [BPF14] key-homomorphic PRF.

diff --git a/lol-apps/benchmarks/SHEBenches.hs b/lol-apps/benchmarks/SHEBenches.hs
@@ -28,8 +28,7 @@ module SHEBenches (sheBenches, decBenches, rescaleBenches, tunnelBenches) where
 import Crypto.Lol.Benchmarks
 
 import Control.Applicative
-import Control.Monad.Random
-import Control.Monad.State
+import Control.Monad.Random hiding (lift)
 import Crypto.Lol.Utils.ShowType
 import Crypto.Random.DRBG
 

diff --git a/lol-apps/lol-apps.cabal b/lol-apps/lol-apps.cabal
@@ -5,8 +5,8 @@ name:                lol-apps
 -- PVP summary:      +-+------- breaking API changes
 --                   | | +----- non-breaking API additions
 --                   | | | +--- code changes with no API change
-version:             0.2.0.0
-synopsis:            Lattice-based cryptographic applications using Lol.
+version:             0.2.0.1
+synopsis:            Lattice-based cryptographic applications using <https://hackage.haskell.org/package/lol lol>.
 homepage:            https://github.com/cpeikert/Lol
 Bug-Reports:         https://github.com/cpeikert/Lol/issues
 license:             GPL-2
@@ -21,7 +21,7 @@ extra-source-files:  README, CHANGES.md, SHE.proto, HomomPRF.proto
 cabal-version:       >= 1.10
 description:
     This library contains example cryptographic applications built using
-    <https://hackage.haskell.org/package/lol Λ ∘ λ>  (Lol),
+    <https://hackage.haskell.org/package/lol lol>,
     a general-purpose library for ring-based lattice cryptography.
 
 source-repository head
@@ -119,7 +119,7 @@ Benchmark bench-apps
 
 --  if flag(llvm)
 --    ghc-options: -fllvm -optlo-O3
-  ghc-options: -threaded -rtsopts
+  ghc-options: -threaded -rtsopts -O2
 --  ghc-options: -O2 -Odph -funbox-strict-fields -fwarn-dodgy-imports -rtsopts
 --  ghc-options: -fno-liberate-case -funfolding-use-threshold1000 -funfolding-keeness-factor1000
 
@@ -150,7 +150,7 @@ executable homomprf
   ghc-options: -main-is HomomPRFMain
   other-modules: HomomPRFParams
 
-  ghc-options: -threaded -rtsopts
+  ghc-options: -threaded -rtsopts -O2
 
   build-depends:
     arithmoi < 0.5,
@@ -173,7 +173,7 @@ executable khprf
   main-is: KHPRFMain.hs
   ghc-options: -main-is KHPRFMain
 
-  ghc-options: -threaded -rtsopts
+  ghc-options: -threaded -rtsopts -O2
 
   build-depends:
     arithmoi < 0.5,
@@ -192,7 +192,7 @@ executable symmshe
   main-is:          SHEMain.hs
   ghc-options: -main-is SHEMain
 
-  ghc-options: -threaded -rtsopts
+  ghc-options: -threaded -rtsopts -O2
 
   build-depends:
     arithmoi < 0.5,

diff --git a/lol-benches/lol-benches.cabal b/lol-benches/lol-benches.cabal
@@ -6,7 +6,7 @@ name:                lol-benches
 --                   | | +----- non-breaking API additions
 --                   | | | +--- code changes with no API change
 version:             0.0.0.3
-synopsis:            A library for benchmarking <https://hackage.haskell.org/package/lol Λ ∘ λ>.
+synopsis:            A library for benchmarking <https://hackage.haskell.org/package/lol lol>.
 homepage:            https://github.com/cpeikert/Lol
 Bug-Reports:         https://github.com/cpeikert/Lol/issues
 license:             GPL-2
@@ -20,7 +20,7 @@ build-type:          Simple
 extra-source-files:  README, CHANGES.md
 cabal-version:       >= 1.10
 description:
-    This library contains code to benchmark <https://hackage.haskell.org/package/lol Λ ∘ λ (Lol)>.
+    This library contains code to benchmark <https://hackage.haskell.org/package/lol lol>.
     It is designed so that third-party tensors can be easily benchmarked using the same framework.
     For examples of how to use this library, see the benchmarks for
     <https://hackage.haskell.org/package/lol-cpp lol-cpp>.

diff --git a/lol-cpp/CHANGES.md b/lol-cpp/CHANGES.md
@@ -1,6 +1,10 @@
 Changelog for lol-cpp project
 ================================
 
+0.0.0.2
+----
+ * Removed unnecessary dependency on 'repa'.
+
 0.0.0.1
 ----
  * Initial split from lol package. Now requires GHC >= 8.0.
diff --git a/lol-cpp/lol-cpp.cabal b/lol-cpp/lol-cpp.cabal
@@ -5,8 +5,8 @@ name:                lol-cpp
 -- PVP summary:      +-+------- breaking API changes
 --                   | | +----- non-breaking API additions
 --                   | | | +--- code changes with no API change
-version:             0.0.0.1
-synopsis:            A fast C++ backend for <https://hackage.haskell.org/package/lol Λ ∘ λ>.
+version:             0.0.0.2
+synopsis:            A fast C++ backend for <https://hackage.haskell.org/package/lol lol>.
 homepage:            https://github.com/cpeikert/Lol
 Bug-Reports:         https://github.com/cpeikert/Lol/issues
 license:             GPL-2

diff --git a/lol-repa/lol-repa.cabal b/lol-repa/lol-repa.cabal
@@ -6,7 +6,7 @@ name:                lol-repa
 --                   | | +----- non-breaking API additions
 --                   | | | +--- code changes with no API change
 version:             0.0.0.1
-synopsis:            A repa backend for <https://hackage.haskell.org/package/lol Λ ∘ λ>.
+synopsis:            A repa backend for <https://hackage.haskell.org/package/lol lol>.
 homepage:            https://github.com/cpeikert/Lol
 Bug-Reports:         https://github.com/cpeikert/Lol/issues
 license:             GPL-2

diff --git a/lol-tests/lol-tests.cabal b/lol-tests/lol-tests.cabal
@@ -6,7 +6,7 @@ name:                lol-tests
 --                   | | +----- non-breaking API additions
 --                   | | | +--- code changes with no API change
 version:             0.0.0.1
-synopsis:            A library for testing <https://hackage.haskell.org/package/lol Λ ∘ λ>.
+synopsis:            A library for testing <https://hackage.haskell.org/package/lol lol>.
 homepage:            https://github.com/cpeikert/Lol
 Bug-Reports:         https://github.com/cpeikert/Lol/issues
 license:             GPL-2
@@ -20,7 +20,7 @@ build-type:          Simple
 extra-source-files:  README, CHANGES.md
 cabal-version:       >= 1.10
 description:
-    This library contains code to test <https://hackage.haskell.org/package/lol Λ ∘ λ (Lol)>.
+    This library contains code to test <https://hackage.haskell.org/package/lol lol>.
     It is designed so that third-party tensors can be easily tested using the same framework.
     For examples of how to use this library, see the tests for
     <https://hackage.haskell.org/package/lol-cpp lol-cpp>.

diff --git a/lol/Crypto/Lol/Cyclotomic/UCyc.hs b/lol/Crypto/Lol/Cyclotomic/UCyc.hs
@@ -79,7 +79,7 @@ import Control.Applicative    as A
 import Control.Arrow
 import Control.DeepSeq
 import Control.Monad.Identity (Identity(..))
-import Control.Monad.Random hiding (lift)
+import Control.Monad.Random hiding (lift, ap)
 import Data.Foldable          as F
 import Data.Maybe
 import Data.Traversable