Fixed import errors and input errors in fixtures.py.

benchmark/test_benchmark_comparisons.py

@@ -0,0 +1,64 @@
+from pytest import mark
+
+from honeybadgermpc.progs.fixedpoint import FixedPoint
+from honeybadgermpc.progs.mixins.share_arithmetic import (
+    BeaverMultiply,
+    BeaverMultiplyArrays,
+    DivideShareArrays,
+    DivideShares,
+    InvertShare,
+    InvertShareArray,
+)
+from honeybadgermpc.progs.mixins.share_comparison import Equality
+
+MIXINS = [
+    BeaverMultiply(),
+    BeaverMultiplyArrays(),
+    InvertShare(),
+    InvertShareArray(),
+    DivideShares(),
+    DivideShareArrays(),
+    Equality(),
+]
+
+TEST_PREPROCESSING = ["rands", "triples", "zeros", "cubes", "bits"]
+
+ALL_BIT_NUMBERS = [int(f"0b{'1' * i}", 2) for i in [1, 64, 128, 256]]
+
+n, t = 4, 1
+k = 50000
+COUNT_MAX = 2
+
+
+def run_benchmark(
+    runner, prog, n=n, t=t, preprocessing=TEST_PREPROCESSING, k=k, mixins=MIXINS
+):
+    runner(prog, n, t, preprocessing, k, mixins)
+
+
+@mark.parametrize("comparator", ALL_BIT_NUMBERS)
+def test_benchmark_fixedpoint_lt(benchmark_runner, comparator):
+    async def _prog(context):
+        base = FixedPoint(
+            context,
+            6846412461894745224441235558443359243034138132682534265960483512729196124138,
+        )
+        result = await base.lt(FixedPoint(context, comparator))
+        await result.open()
+
+    run_benchmark(benchmark_runner, _prog)
+
+
+@mark.parametrize("comparator", ALL_BIT_NUMBERS)
+def test_benchmark_share_eq(benchmark_runner, comparator):
+    equality = Equality()
+
+    async def _prog(context):
+        base = context.Share(
+            6846412461894745224441235558443359243034138132682534265960483512729196124138
+        )
+        comp = context.Share(comparator)
+        result = await equality(context, base, comp)
+        await result.open()
+
+    run_benchmark(benchmark_runner, _prog)

benchmark/test_benchmark_jubjub.py

@@ -7,11 +7,10 @@
     BeaverMultiplyArrays,
     DivideShareArrays,
     DivideShares,
-    Equality,
     InvertShare,
     InvertShareArray,
 )
-
+from honeybadgermpc.progs.mixins.share_comparison import Equality
 
 MIXINS = [
     BeaverMultiply(),

benchmark/test_benchmark_mimc.py

@@ -9,10 +9,10 @@
     BeaverMultiplyArrays,
     DivideShareArrays,
     DivideShares,
-    Equality,
     InvertShare,
     InvertShareArray,
 )
+from honeybadgermpc.progs.mixins.share_comparison import Equality
 
 CONFIG = {
     BeaverMultiply.name: BeaverMultiply(),

benchmark/test_benchmark_polynomial.py

@@ -2,7 +2,7 @@
 
 from pytest import mark
 
-from honeybadgermpc.ntl.helpers import fft_interpolate, lagrange_interpolate
+from honeybadgermpc.ntl import fft_interpolate, lagrange_interpolate
 from honeybadgermpc.polynomial import get_omega
 
 cache = {}

benchmark/test_benchmark_share_mult.py

@@ -0,0 +1,50 @@
+from pytest import mark
+
+from honeybadgermpc.progs.mixins.share_arithmetic import (
+    BeaverMultiply,
+    BeaverMultiplyArrays,
+    DivideShareArrays,
+    DivideShares,
+    InvertShare,
+    InvertShareArray,
+)
+from honeybadgermpc.progs.mixins.share_comparison import Equality
+
+MIXINS = [
+    BeaverMultiply(),
+    BeaverMultiplyArrays(),
+    InvertShare(),
+    InvertShareArray(),
+    DivideShares(),
+    DivideShareArrays(),
+    Equality(),
+]
+
+TEST_PREPROCESSING = ["rands", "triples", "zeros", "cubes", "bits"]
+
+ALL_BIT_NUMBERS = [int(f"0b{'1' * i}", 2) for i in [1, 64, 128, 256]]
+
+n, t = 4, 1
+k = 50000
+COUNT_MAX = 2
+
+
+def run_benchmark(
+    runner, prog, n=n, t=t, preprocessing=TEST_PREPROCESSING, k=k, mixins=MIXINS
+):
+    runner(prog, n, t, preprocessing, k, mixins)
+
+
+@mark.parametrize("multiplier", ALL_BIT_NUMBERS)
+def test_benchmark_beaver_mul_shares(benchmark_runner, multiplier):
+    multiply = BeaverMultiply()
+
+    async def _prog(context):
+        base = context.Share(
+            6846412461894745224441235558443359243034138132682534265960483512729196124138
+        )
+        mult = context.Share(multiplier)
+        result = await multiply(context, base, mult)
+        await result.open()
+
+    run_benchmark(benchmark_runner, _prog)

docker-compose.yml

@@ -27,5 +27,5 @@ services:
       - ./pairing/benches:/usr/src/HoneyBadgerMPC/pairing/benches
       - ./pairing/Cargo.toml:/usr/src/HoneyBadgerMPC/pairing/Cargo.toml
       - ./pairing/setup.py:/usr/src/HoneyBadgerMPC/pairing/setup.py
-      - /usr/src/HoneyBadgerMPC/honeybadgermpc/ntl  # Directory _not_ mounted from host
+        #      - /usr/src/HoneyBadgerMPC/honeybadgermpc/ntl  # Directory _not_ mounted from host
     command: pytest -v --cov=honeybadgermpc

tests/fixtures.py

@@ -194,11 +194,8 @@ async def _test_runner(prog, n=4, t=1, to_generate=[], k=1000, mixins=[]):
 
 @fixture
 def benchmark_runner(benchmark):
-    from honeybadgermpc.preprocessing import PreProcessedElements
-
     def _benchmark_runner(prog, n=4, t=1, to_generate=[], k=1000, mixins=[]):
-        pp_elements = PreProcessedElements()
-        _preprocess(pp_elements, n, t, k, to_generate)
+        _preprocess(n, t, k, to_generate)
 
         config = _build_config(mixins)
         program_runner = TaskProgramRunner(n, t, config)
@@ -208,6 +205,6 @@ def _benchmark_runner(prog, n=4, t=1, to_generate=[], k=1000, mixins=[]):
         def _work():
             loop.run_until_complete(program_runner.join())
 
-        benchmark(_work)
+        benchmark.pedantic(_work, iterations=100, rounds=10, warmup_rounds=10)
 
     return _benchmark_runner