Skip to content
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.

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

#410: Dependent Epochs rewritten #2204

Open
wants to merge 20 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ccd5afd
#410: epoch: change unused InsertEpoch to DependentEpoch
lifflander Jun 17, 2019
b393469
#410: epoch: add function to bit-combine epoch category bits
lifflander Jun 19, 2019
9a1efe8
#410: termination: add isDep check
lifflander Sep 28, 2023
72fbfec
#410: term: implement dependent epochs
lifflander Jun 20, 2019
5cd8599
#410: test: add release dependent epoch test
lifflander Jun 20, 2019
10147f4
#410: reduce: fix warning
lifflander Oct 12, 2023
1db25fa
#410: epoch: add test, move pending epochs to scheduler
lifflander Oct 12, 2023
a9816c6
#410: epoch: rework deps, objgroup dep epochs, scheduler buffers
lifflander Oct 16, 2023
4de8a74
#410: objgroup: implement objgroup proxy functions for dependent epochs
lifflander Oct 17, 2023
bfdc3f4
#410: collection: add dependent epochs to collections, system message…
lifflander Oct 18, 2023
3c1ac7f
#410: test: add new test for dep epochs and collections
lifflander Aug 16, 2019
cdf69ab
#410: collection: add missing header include
lifflander Oct 18, 2023
9764708
#410: tests: cleanup tests, fix name collison
lifflander Oct 18, 2023
a974aba
#410: tests: fix license
lifflander Oct 18, 2023
3e76af5
#410: tests: fix some small compilation errors
lifflander Oct 18, 2023
3d2b117
#410: collection: switch broadcast after system broadcast to user msg
lifflander Oct 18, 2023
f746269
#410: collection: fix missing system message designation
lifflander Oct 19, 2023
cb2b519
#410: tests: rewrite dep epoch test to fix logic error
lifflander Oct 19, 2023
4b3a9c6
#410: termination: remove unneeded code, cleanup scheduler
lifflander Oct 31, 2023
48f7a8c
#410: termination: cleanup more code---remove unecessary condition
lifflander Oct 31, 2023
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
Prev Previous commit
Next Next commit
#410: tests: fix some small compilation errors
lifflander committed Oct 18, 2023

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit 3e76af52c3c20f22fdb38f2836e5c722e64d6c8b
10 changes: 4 additions & 6 deletions tests/unit/termination/test_term_dep_epoch_collection.cc
Original file line number Diff line number Diff line change
@@ -76,15 +76,13 @@ struct TestDepColl : vt::Collection<TestDepColl,vt::Index1D> {
void check(int k, int r) {
auto const num_nodes = vt::theContext()->getNumNodes();
EXPECT_EQ(num_non_dep, 1);
EXPECT_EQ(num_dep, num_nodes * msg->k);
EXPECT_EQ(num_dep, num_nodes * k);
}

int num_dep = 0;
int num_non_dep = 0;
};

using TestMsg = typename TestDepColl::TestMsg;

TEST_F(TestTermDepEpochCollection, test_term_dep_epoch_collection) {
auto const& this_node = theContext()->getNode();
auto const& num_nodes = theContext()->getNumNodes();
@@ -96,7 +94,7 @@ TEST_F(TestTermDepEpochCollection, test_term_dep_epoch_collection) {
auto proxy = vt::theCollection()->constructCollective<TestDepColl>(range);
vt::theCollective()->barrier();

auto epoch = vt::theTerm()->makeEpochCollectiveDep();
auto epoch = vt::theTerm()->makeEpochCollective(term::ParentEpochCapture{}, true);
vt::theMsg()->pushEpoch(epoch);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since dependent epochs make this pattern necessary, a returning equivalent of vt::runInEpoch<Collective/Rooted> would be a nice helper for users.

if (bcast) {
for (int i = 0; i < k; i++) {
@@ -116,14 +114,14 @@ TEST_F(TestTermDepEpochCollection, test_term_dep_epoch_collection) {
}

chain->nextStep([=](vt::Index1D idx) {
auto msg = vt::makeMessage<TestMsg>();
auto msg = vt::makeMessage<vt::Message>();
return vt::messaging::PendingSend(msg, [=](MsgSharedPtr<vt::BaseMsgType>){
proxy[idx].send<&TestDepColl::nonDepHandler>();
});
});

chain->nextStep([=](vt::Index1D idx) {
auto msg = vt::makeMessage<TestMsg>();
auto msg = vt::makeMessage<vt::Message>();
return vt::messaging::PendingSend(msg, [=](MsgSharedPtr<vt::BaseMsgType>){
fmt::print("release: {}\n", idx);
proxy[idx].release(epoch);