Skip to content

Commit 4b58242

Browse files
committed
Fixed some warnings, updated CHANGES for new lol-cpp and lol-apps versions, and tweaked URLs in cabal files
1 parent c4d80ae commit 4b58242

File tree

9 files changed

+24
-17
lines changed

9 files changed

+24
-17
lines changed

lol-apps/CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Changelog for lol project
22
================================
33

4+
0.2.0.1
5+
----
6+
* Fixed compile error in KHPRFTests.
7+
48
0.2.0.0
59
----
610
* Added [BPF14] key-homomorphic PRF.

lol-apps/benchmarks/SHEBenches.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ module SHEBenches (sheBenches, decBenches, rescaleBenches, tunnelBenches) where
2828
import Crypto.Lol.Benchmarks
2929

3030
import Control.Applicative
31-
import Control.Monad.Random
32-
import Control.Monad.State
31+
import Control.Monad.Random hiding (lift)
3332
import Crypto.Lol.Utils.ShowType
3433
import Crypto.Random.DRBG
3534

lol-apps/lol-apps.cabal

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ name: lol-apps
55
-- PVP summary: +-+------- breaking API changes
66
-- | | +----- non-breaking API additions
77
-- | | | +--- code changes with no API change
8-
version: 0.2.0.0
9-
synopsis: Lattice-based cryptographic applications using Lol.
8+
version: 0.2.0.1
9+
synopsis: Lattice-based cryptographic applications using <https://hackage.haskell.org/package/lol lol>.
1010
homepage: https://github.com/cpeikert/Lol
1111
Bug-Reports: https://github.com/cpeikert/Lol/issues
1212
license: GPL-2
@@ -21,7 +21,7 @@ extra-source-files: README, CHANGES.md, SHE.proto, HomomPRF.proto
2121
cabal-version: >= 1.10
2222
description:
2323
This library contains example cryptographic applications built using
24-
<https://hackage.haskell.org/package/lol Λ ∘ λ> (Lol),
24+
<https://hackage.haskell.org/package/lol lol>,
2525
a general-purpose library for ring-based lattice cryptography.
2626

2727
source-repository head
@@ -119,7 +119,7 @@ Benchmark bench-apps
119119

120120
-- if flag(llvm)
121121
-- ghc-options: -fllvm -optlo-O3
122-
ghc-options: -threaded -rtsopts
122+
ghc-options: -threaded -rtsopts -O2
123123
-- ghc-options: -O2 -Odph -funbox-strict-fields -fwarn-dodgy-imports -rtsopts
124124
-- ghc-options: -fno-liberate-case -funfolding-use-threshold1000 -funfolding-keeness-factor1000
125125

@@ -150,7 +150,7 @@ executable homomprf
150150
ghc-options: -main-is HomomPRFMain
151151
other-modules: HomomPRFParams
152152

153-
ghc-options: -threaded -rtsopts
153+
ghc-options: -threaded -rtsopts -O2
154154

155155
build-depends:
156156
arithmoi < 0.5,
@@ -173,7 +173,7 @@ executable khprf
173173
main-is: KHPRFMain.hs
174174
ghc-options: -main-is KHPRFMain
175175

176-
ghc-options: -threaded -rtsopts
176+
ghc-options: -threaded -rtsopts -O2
177177

178178
build-depends:
179179
arithmoi < 0.5,
@@ -192,7 +192,7 @@ executable symmshe
192192
main-is: SHEMain.hs
193193
ghc-options: -main-is SHEMain
194194

195-
ghc-options: -threaded -rtsopts
195+
ghc-options: -threaded -rtsopts -O2
196196

197197
build-depends:
198198
arithmoi < 0.5,

lol-benches/lol-benches.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: lol-benches
66
-- | | +----- non-breaking API additions
77
-- | | | +--- code changes with no API change
88
version: 0.0.0.3
9-
synopsis: A library for benchmarking <https://hackage.haskell.org/package/lol Λ ∘ λ>.
9+
synopsis: A library for benchmarking <https://hackage.haskell.org/package/lol lol>.
1010
homepage: https://github.com/cpeikert/Lol
1111
Bug-Reports: https://github.com/cpeikert/Lol/issues
1212
license: GPL-2
@@ -20,7 +20,7 @@ build-type: Simple
2020
extra-source-files: README, CHANGES.md
2121
cabal-version: >= 1.10
2222
description:
23-
This library contains code to benchmark <https://hackage.haskell.org/package/lol Λ ∘ λ (Lol)>.
23+
This library contains code to benchmark <https://hackage.haskell.org/package/lol lol>.
2424
It is designed so that third-party tensors can be easily benchmarked using the same framework.
2525
For examples of how to use this library, see the benchmarks for
2626
<https://hackage.haskell.org/package/lol-cpp lol-cpp>.

lol-cpp/CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Changelog for lol-cpp project
22
================================
33

4+
0.0.0.2
5+
----
6+
* Removed unnecessary dependency on 'repa'.
7+
48
0.0.0.1
59
----
610
* Initial split from lol package. Now requires GHC >= 8.0.

lol-cpp/lol-cpp.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ name: lol-cpp
55
-- PVP summary: +-+------- breaking API changes
66
-- | | +----- non-breaking API additions
77
-- | | | +--- code changes with no API change
8-
version: 0.0.0.1
9-
synopsis: A fast C++ backend for <https://hackage.haskell.org/package/lol Λ ∘ λ>.
8+
version: 0.0.0.2
9+
synopsis: A fast C++ backend for <https://hackage.haskell.org/package/lol lol>.
1010
homepage: https://github.com/cpeikert/Lol
1111
Bug-Reports: https://github.com/cpeikert/Lol/issues
1212
license: GPL-2

lol-repa/lol-repa.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: lol-repa
66
-- | | +----- non-breaking API additions
77
-- | | | +--- code changes with no API change
88
version: 0.0.0.1
9-
synopsis: A repa backend for <https://hackage.haskell.org/package/lol Λ ∘ λ>.
9+
synopsis: A repa backend for <https://hackage.haskell.org/package/lol lol>.
1010
homepage: https://github.com/cpeikert/Lol
1111
Bug-Reports: https://github.com/cpeikert/Lol/issues
1212
license: GPL-2

lol-tests/lol-tests.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: lol-tests
66
-- | | +----- non-breaking API additions
77
-- | | | +--- code changes with no API change
88
version: 0.0.0.1
9-
synopsis: A library for testing <https://hackage.haskell.org/package/lol Λ ∘ λ>.
9+
synopsis: A library for testing <https://hackage.haskell.org/package/lol lol>.
1010
homepage: https://github.com/cpeikert/Lol
1111
Bug-Reports: https://github.com/cpeikert/Lol/issues
1212
license: GPL-2
@@ -20,7 +20,7 @@ build-type: Simple
2020
extra-source-files: README, CHANGES.md
2121
cabal-version: >= 1.10
2222
description:
23-
This library contains code to test <https://hackage.haskell.org/package/lol Λ ∘ λ (Lol)>.
23+
This library contains code to test <https://hackage.haskell.org/package/lol lol>.
2424
It is designed so that third-party tensors can be easily tested using the same framework.
2525
For examples of how to use this library, see the tests for
2626
<https://hackage.haskell.org/package/lol-cpp lol-cpp>.

lol/Crypto/Lol/Cyclotomic/UCyc.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ import Control.Applicative as A
7979
import Control.Arrow
8080
import Control.DeepSeq
8181
import Control.Monad.Identity (Identity(..))
82-
import Control.Monad.Random hiding (lift)
82+
import Control.Monad.Random hiding (lift, ap)
8383
import Data.Foldable as F
8484
import Data.Maybe
8585
import Data.Traversable

0 commit comments

Comments
 (0)