Skip to content

Remove un-commented rows and fix ambiguous method call #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UnsavedWings wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove un-commented rows and fix ambiguous method call #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bench/micro/micro_boolean_addition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ int main(int argc, char** argv) {
double elapsed;
gettimeofday(&begin, 0);

BSharedVector<int> c_1 = orq::ripple_carry_adder(a, b);
BSharedVector<int> c_1 = orq::operators::ripple_carry_adder(a, b);

// stop timer
gettimeofday(&end, 0);
Expand All @@ -34,7 +34,7 @@ int main(int argc, char** argv) {

gettimeofday(&begin, 0);

BSharedVector<int> c_2 = orq::parallel_prefix_adder(a, b);
BSharedVector<int> c_2 = orq::operators::parallel_prefix_adder(a, b);

gettimeofday(&end, 0);
seconds = end.tv_sec - begin.tv_sec;
Expand Down
2 changes: 0 additions & 2 deletions bench/micro/micro_ccs_radix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ using namespace COMPILED_MPC_PROTOCOL_NAMESPACE;
#define MAX_ROW_EXPONENT 20

int main(int argc, char** argv) {
[executable - threads_num - p_factor -
// batch_size]
orq_init(argc, argv);
auto pID = runTime->getPartyID();
int test_size = 1 << 20;
Expand Down
2 changes: 0 additions & 2 deletions bench/micro/micro_sorting_rs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ using T = int32_t;
#endif

int main(int argc, char** argv) {
[executable - threads_num - p_factor -
// batch_size]
orq_init(argc, argv);
auto pID = runTime->getPartyID();
int test_size = 1 << 20;
Expand Down
14 changes: 7 additions & 7 deletions examples/ex5_join.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ int main(int argc, char **argv) {
Joined.addColumn("Count");

auto StudentCount = Joined.deepcopy();
StudentCount.sort({ENC_TABLE_VALID, "[StudentID]"});
StudentCount.sort(std::vector<std::string>{ENC_TABLE_VALID, "[StudentID]"});
StudentCount.distinct({"[StudentID]"});
// Count the students
StudentCount.aggregate({ENC_TABLE_VALID}, {{"Count", "Count", count<A>}});
Expand Down Expand Up @@ -151,7 +151,7 @@ int main(int argc, char **argv) {
{
auto Joined = Attendees.left_outer_join(Classes, {"[StudentID]"});

Joined.sort({ENC_TABLE_VALID, "[StudentID]"});
Joined.sort(std::vector<std::string>{ENC_TABLE_VALID, "[StudentID]"});
Joined.distinct({"[StudentID]"});

auto opened = Joined.open_with_schema().first;
Expand All @@ -170,7 +170,7 @@ int main(int argc, char **argv) {
auto Joined = Attendees.right_outer_join(Classes, {"[StudentID]"});

// distinct requires a sort first
Joined.sort({ENC_TABLE_VALID, "[StudentID]"});
Joined.sort(std::vector<std::string>{ENC_TABLE_VALID, "[StudentID]"});
Joined.distinct({"[StudentID]"});

auto opened = Joined.open_with_schema().first;
Expand All @@ -187,7 +187,7 @@ int main(int argc, char **argv) {
{
auto Joined = Attendees.full_outer_join(Classes, {"[StudentID]"});

Joined.sort({ENC_TABLE_VALID, "[StudentID]"});
Joined.sort(std::vector<std::string>{ENC_TABLE_VALID, "[StudentID]"});
Joined.distinct({"[StudentID]"});

auto opened = Joined.open_with_schema().first;
Expand All @@ -208,7 +208,7 @@ int main(int argc, char **argv) {
{
auto Joined = Classes.anti_join(Attendees, {"[StudentID]"});

Joined.sort({ENC_TABLE_VALID, "[StudentID]"});
Joined.sort(std::vector<std::string>{ENC_TABLE_VALID, "[StudentID]"});
Joined.distinct({"[StudentID]"});

auto opened = Joined.open_with_schema().first;
Expand All @@ -230,10 +230,10 @@ int main(int argc, char **argv) {
{
auto Joined = Classes.semi_join(Attendees, {"[StudentID]"});

Joined.sort({ENC_TABLE_VALID, "[CourseID]"});
Joined.sort(std::vector<std::string>{ENC_TABLE_VALID, "[CourseID]"});
Joined.distinct({"[CourseID]"});

Classes.sort({ENC_TABLE_VALID, "[CourseID]"});
Classes.sort(std::vector<std::string>{ENC_TABLE_VALID, "[CourseID]"});
Classes.distinct({"[CourseID]"});
auto c_count = Classes.open_with_schema().first[0].size();

Expand Down