Use sorting network sort in agg

multiparty · Oct 18, 2018 · 92c9f47 · 92c9f47
1 parent 7e610ac
commit 92c9f47
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/conclave/codegen/templates/sharemind/protocol.tmpl b/conclave/codegen/templates/sharemind/protocol.tmpl
@@ -152,7 +152,7 @@ D uint32[[2]] aggregateSumLeaky(D uint32[[2]] rows, uint keyCol, uint valCol) {
     input[:,0] = rows[:,keyCol];
     input[:,1] = rows[:,valCol];
 
-    D uint32 [[2]] sorted = sort(input, (uint)0);
+    D uint32 [[2]] sorted = sortingNetworkSort(input, (uint)0);
     D uint32 [[2]] result(nrows,ncols + 1);
     result[:,0] = sorted[:,0];
     result[:,1] = sorted[:,1];

diff --git a/tests/codegen/sharemind_expected/base b/tests/codegen/sharemind_expected/base
@@ -152,7 +152,7 @@ D uint32[[2]] aggregateSumLeaky(D uint32[[2]] rows, uint keyCol, uint valCol) {
     input[:,0] = rows[:,keyCol];
     input[:,1] = rows[:,valCol];
 
-    D uint32 [[2]] sorted = sort(input, (uint)0);
+    D uint32 [[2]] sorted = sortingNetworkSort(input, (uint)0);
     D uint32 [[2]] result(nrows,ncols + 1);
     result[:,0] = sorted[:,0];
     result[:,1] = sorted[:,1];