github/MP-SPDZ
1
1
Fork 0
mirror of https://github.com/data61/MP-SPDZ.git synced 2026-01-10 05:57:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge-induced issues

Browse Source
This commit is contained in:
Vincent Ehrmanntraut
2024-12-12 09:33:52 +01:00
parent 60d481dc4e
commit d3baedd3b3
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Programs/Source/test_permute.mpc
View File

@@ -140,7 +140,6 @@ def test_permute_matrix(timer_base: int, value_type=sint) -> None:
p1 = sint.get_secure_shuffle(5)
p2 = sint.get_secure_shuffle(5)
start_timer(timer_base + 1)
m1.secure_permute(p1, n_parallel=1)
stop_timer(timer_base + 1)
@@ -164,13 +163,13 @@ def test_permute_matrix(timer_base: int, value_type=sint) -> None:
print_ln("%s", row)
test_permuted_matrix(m2, p2)
# test_allocator()
# test_case([5,10], 10)
# test_case([5, 10, 15, 20], 20)
# test_case([4,8,16], 30)
# test_case([5], 40)
#
# test_parallel_permutation_equals_sequential_permutation([5,10],50)
#
# test_permute_matrix(60)
# test_permute_matrix(70, value_type=sfix)
test_allocator()
test_case([5,10], 10)
test_case([5, 10, 15, 20], 20)
test_case([4,8,16], 30)
test_case([5], 40)
test_parallel_permutation_equals_sequential_permutation([5,10],50)
test_permute_matrix(60)
test_permute_matrix(70, value_type=sfix)

1
Programs/Source/test_print.mpc Normal file
View File

@@ -0,0 +1 @@
print_ln("%s", cfix(0))

4
Protocols/Rep3Shuffler.hpp
View File

@@ -59,7 +59,7 @@ void Rep3Shuffler<T>::apply(StackedVector<T>& a, size_t n, int unit_size,
}
template<class T>
void Rep3Shuffler<T>::applyMultiple(vector<T>& a, vector<size_t>& sizes, vector<size_t>& destinations, vector<size_t>& sources,
void Rep3Shuffler<T>::applyMultiple(StackedVector<T>& a, vector<size_t>& sizes, vector<size_t>& destinations, vector<size_t>& sources,
vector<size_t>& unit_sizes, vector<size_t>& handles, vector<bool>& reverses, store_type& store) {
vector<shuffle_type> shuffles;
for (size_t &handle : handles) {
@@ -71,7 +71,7 @@ void Rep3Shuffler<T>::applyMultiple(vector<T>& a, vector<size_t>& sizes, vector<
}
template<class T>
void Rep3Shuffler<T>::applyMultiple(vector<T> &a, vector<size_t> &sizes, vector<size_t> &destinations,
void Rep3Shuffler<T>::applyMultiple(StackedVector<T> &a, vector<size_t> &sizes, vector<size_t> &destinations,
vector<size_t> &sources, vector<size_t> &unit_sizes, vector<shuffle_type> &shuffles, vector<bool> &reverses)
{
const auto n_shuffles = sizes.size();

4
Protocols/SecureShuffle.h
View File

@@ -79,8 +79,8 @@ private:
void pre(StackedVector<T>& a, size_t n, size_t input_base);
void post(StackedVector<T>& a, size_t n, size_t input_base);
vector<array<int, 5>> waksman_round_init(StackedVector<T>& toShuffle, size_t shuffle_unit_size, int depth, vector<vector<T>>& iter_waksman_config, bool inwards, bool reverse);
void waksman_round_finish(StackedVector<T>& toShuffle, size_t unit_size, vector<array<int, 5>> indices);
vector<array<int, 5>> waksman_round_init(vector<T>& toShuffle, size_t shuffle_unit_size, int depth, vector<vector<T>>& iter_waksman_config, bool inwards, bool reverse);
void waksman_round_finish(vector<T>& toShuffle, size_t unit_size, vector<array<int, 5>> indices);
public:
map<long, long> stats;