/rev/eaf317ca1b80
changeset: 1284:eaf317ca1b80
user: Janus Dam Nielsen <[email protected]>
date: Fri Oct 16 15:59:05 2009 +0200
summary: Added triple_gen as operation.
diffstat:
apps/benchmark.py | 3 ++-
apps/benchmark_classes.py | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diffs (34 lines):
diff -r 9043758a351a -r eaf317ca1b80 apps/benchmark.py
--- a/apps/benchmark.py Fri Oct 16 15:58:49 2009 +0200
+++ b/apps/benchmark.py Fri Oct 16 15:59:05 2009 +0200
@@ -88,7 +88,8 @@
operations = {"mul" : ("mul", [], BinaryOperation),
"compToft05": ("ge", [ComparisonToft05Mixin], BinaryOperation),
"compToft07": ("ge", [ComparisonToft07Mixin], BinaryOperation),
- "eq" : ("eq", [ProbabilisticEqualityMixin],
BinaryOperation)}
+ "eq" : ("eq", [ProbabilisticEqualityMixin],
BinaryOperation),
+ "triple_gen": ("triple_gen", [], NullaryOperation)}
runtimes = {"PassiveRuntime": PassiveRuntime,
"PaillierRuntime": PaillierRuntime,
diff -r 9043758a351a -r eaf317ca1b80 apps/benchmark_classes.py
--- a/apps/benchmark_classes.py Fri Oct 16 15:58:49 2009 +0200
+++ b/apps/benchmark_classes.py Fri Oct 16 15:59:05 2009 +0200
@@ -20,6 +20,8 @@
from pprint import pformat
+from twisted.internet.defer import gatherResults
+
from viff.runtime import gather_shares
from viff.util import rand
@@ -114,7 +116,7 @@
c_shares.append(self.do_operation())
print "."
- done = gather_shares(c_shares)
+ done = gatherResults(c_shares)
done.addCallback(record_stop, "parallel test", self.count)
def f(x):
needed_data = self.rt._needed_data
_______________________________________________
viff-commits mailing list
[email protected]
http://lists.viff.dk/listinfo.cgi/viff-commits-viff.dk
