Repository navigation
#2524: Start integrating the new loc repo with VT replacing the location coordinator - #2525
antoinemeyer5 wants to merge 16 commits into
Conversation
|
diff --git a/src/vt/topos/location/location.h b/src/vt/topos/location/location.h
index 706eba2d0..cdea71683 100644
--- a/src/vt/topos/location/location.h
+++ b/src/vt/topos/location/location.h
@@ -151,12 +151,11 @@ struct EntityLocationCoord {
explicit EntityLocationCoord(
bool in_anytime_migration, bool in_keep_cache_updated,
std::size_t in_max_cache_size = ::loc::default_max_cache_size
- ) : resolver_comm_(this),
+ )
+ : resolver_comm_(this),
anytime_migration_(in_anytime_migration),
keep_cache_updated_(in_keep_cache_updated),
- max_cache_size_(in_max_cache_size)
- { }
-
+ max_cache_size_(in_max_cache_size) { }
virtual ~EntityLocationCoord() {}
diff --git a/src/vt/topos/location/location.impl.h b/src/vt/topos/location/location.impl.h
index 0d78792c4..790307130 100644
--- a/src/vt/topos/location/location.impl.h
+++ b/src/vt/topos/location/location.impl.h
@@ -68,9 +68,8 @@ int LocCommunicator<EntityID>::getRank() const {
template <typename EntityID>
template <typename Instance>
-auto LocCommunicator<EntityID>::registerInstanceCollective(Instance* instance)
- -> HandleType<Instance>
-{
+auto LocCommunicator<EntityID>::registerInstanceCollective(Instance* instance
+) -> HandleType<Instance> {
static_assert(std::is_same_v<Instance, typename OwnerType::ResolverType>);
vtAssert(owner_ != nullptr, "loc communicator must have an owner");
vtAssert(instance != nullptr, "loc coordinator must be valid");
@@ -80,15 +79,14 @@ auto LocCommunicator<EntityID>::registerInstanceCollective(Instance* instance)
template <typename EntityID>
template <auto Handler, typename... Args>
void LocCommunicator<EntityID>::send(
- ::loc::NodeType node, objgroup::proxy::Proxy<OwnerType> handle,
- Args&&... args
+ ::loc::NodeType node, objgroup::proxy::Proxy<OwnerType> handle, Args&&... args
) {
using Owner = OwnerType;
- handle[node].template send<
- &Owner::template locControlHandler<Handler, std::decay_t<Args>...>
- >(
- MsgProps().asLocationMsg(), std::forward<Args>(args)...
- );
+ handle[node]
+ .template send<
+ &Owner::template locControlHandler<Handler, std::decay_t<Args>...>>(
+ MsgProps().asLocationMsg(), std::forward<Args>(args)...
+ );
}
template <typename EntityID>
@@ -596,8 +594,7 @@ void EntityLocationCoord<EntityID>::routeMsg(
template <typename EntityID>
void EntityLocationCoord<EntityID>::printCurrentCache() const {
vt_debug_print(
- normal, location,
- "EntityLocationCoord: cache is managed by DARMA/loc\n"
+ normal, location, "EntityLocationCoord: cache is managed by DARMA/loc\n"
);
}
diff --git a/src/vt/topos/location/location_common.h b/src/vt/topos/location/location_common.h
index 8642860f5..b09af14ea 100644
--- a/src/vt/topos/location/location_common.h
+++ b/src/vt/topos/location/location_common.h
@@ -54,7 +54,7 @@ namespace vt { namespace location {
using NodeActionType = std::function<void(NodeType)>;
using ExistsNodeActionType = std::function<void(bool, NodeType)>;
-using LocMsgActionType = std::function<void(BaseMessage * )>;
+using LocMsgActionType = std::function<void(BaseMessage*)>;
static constexpr ByteType const small_msg_max_size = 256;
}} // end namespace vt::location
diff --git a/src/vt/vrt/collection/balance/lb_invoke/lb_manager.cc b/src/vt/vrt/collection/balance/lb_invoke/lb_manager.cc
index 769583ac8..65804beb1 100644
--- a/src/vt/vrt/collection/balance/lb_invoke/lb_manager.cc
+++ b/src/vt/vrt/collection/balance/lb_invoke/lb_manager.cc
@@ -508,7 +508,6 @@ struct GatherTVInfo {
}
};
-
static void collectTVData(GatherTVInfo& gather) {
using tv::utility::ParseRender;
ParseRender pr{theConfig()->vt_tv_config_file};
diff --git a/tests/unit/lb/test_temperedlb.cc b/tests/unit/lb/test_temperedlb.cc
index e76b15311..c4bfa9034 100644
--- a/tests/unit/lb/test_temperedlb.cc
+++ b/tests/unit/lb/test_temperedlb.cc
@@ -64,12 +64,9 @@ std::string writeTemperedLBConfig(
// These tests assert exact solutions, so use synchronous informs and avoid
// random propagation or transfer choices producing a different optimum.
cfg_file_ << "0 TemperedLB converge_tolerance=0.001 iters=10 trials=3 "
- "inform=SyncInform ordering=ElmID deterministic=true transfer=" <<
- transfer_strategy <<
- " alpha=" << alpha <<
- " beta=" << beta <<
- " gamma=" << gamma <<
- " delta=" << delta;
+ "inform=SyncInform ordering=ElmID deterministic=true transfer="
+ << transfer_strategy << " alpha=" << alpha << " beta=" << beta
+ << " gamma=" << gamma << " delta=" << delta;
if (transfer_strategy == "SwapClusters") {
cfg_file_ << " memory_threshold=" << memory_threshold;
}
diff --git a/tests/unit/utils/test_demangler_utils.nompi.cc b/tests/unit/utils/test_demangler_utils.nompi.cc
index b599a0f8f..7e44af47b 100644
--- a/tests/unit/utils/test_demangler_utils.nompi.cc
+++ b/tests/unit/utils/test_demangler_utils.nompi.cc
@@ -99,18 +99,18 @@ struct TestDemanglerUtils : TestHarness {
using TE = vt::util::demangle::TemplateExtract;
TEST_F(TestDemanglerUtils, test_getVoidFuncStrArgs) {
- std::array<std::pair<std::string, std::string>, 10> const data = {{
- {"", ""},
- {"not-starting-void", "not-starting-void"},
- {"void(with-extra-at)end", "void(with-extra-at)end"},
- {"void ()", ""},
- {"void (foo)", "foo"},
- {"void(foo)", "foo"},
- {"void (dontcare-unbalanced))", "dontcare-unbalanced)"},
- {"void (fn())", "fn()"},
- {"void (fn(a))", "fn(a)"},
- {"void (fn(*)(a,b,c,d))", "fn(*)(a,b,c,d)"}
- }};
+ std::array<std::pair<std::string, std::string>, 10> const data = {
+ {{"", ""},
+ {"not-starting-void", "not-starting-void"},
+ {"void(with-extra-at)end", "void(with-extra-at)end"},
+ {"void ()", ""},
+ {"void (foo)", "foo"},
+ {"void(foo)", "foo"},
+ {"void (dontcare-unbalanced))", "dontcare-unbalanced)"},
+ {"void (fn())", "fn()"},
+ {"void (fn(a))", "fn(a)"},
+ {"void (fn(*)(a,b,c,d))", "fn(*)(a,b,c,d)"}}
+ };
for (auto const& [given, expected] : data) {
EXPECT_EQ(TE::getVoidFuncStrArgs(given), expected);
@@ -118,14 +118,14 @@ TEST_F(TestDemanglerUtils, test_getVoidFuncStrArgs) {
}
TEST_F(TestDemanglerUtils, test_getNamespace) {
- std::array<std::pair<std::string, std::string>, 6> const data = {{
- {"", ""},
- {"aa", ""},
- {"aa::bb", "aa"},
- {"&aa::bb", "aa"},
- {"aa::dd<bb::cc<r>>::bare", "aa::dd<bb::cc<r>>"},
- {"aa<a>::dd<d>::bare<e>", "aa<a>::dd<d>"}
- }};
+ std::array<std::pair<std::string, std::string>, 6> const data = {
+ {{"", ""},
+ {"aa", ""},
+ {"aa::bb", "aa"},
+ {"&aa::bb", "aa"},
+ {"aa::dd<bb::cc<r>>::bare", "aa::dd<bb::cc<r>>"},
+ {"aa<a>::dd<d>::bare<e>", "aa<a>::dd<d>"}}
+ };
for (auto const& [given, expected] : data) {
EXPECT_EQ(TE::getNamespace(given), expected);
@@ -133,13 +133,13 @@ TEST_F(TestDemanglerUtils, test_getNamespace) {
}
TEST_F(TestDemanglerUtils, test_getBarename) {
- std::array<std::pair<std::string, std::string>, 5> const data = {{
- {"", ""},
- {"aa", "aa"},
- {"aa::bb", "bb"},
- {"aa::dd<bb::cc<r>>::bare", "bare"},
- {"aa<a>::dd<d>::bare<e>", "bare<e>"}
- }};
+ std::array<std::pair<std::string, std::string>, 5> const data = {
+ {{"", ""},
+ {"aa", "aa"},
+ {"aa::bb", "bb"},
+ {"aa::dd<bb::cc<r>>::bare", "bare"},
+ {"aa<a>::dd<d>::bare<e>", "bare<e>"}}
+ };
for (auto const& [given, expected] : data) {
EXPECT_EQ(TE::getBarename(given), expected);
@@ -158,16 +158,16 @@ void someFunc_2(A, B) { }
} // namespace helpers
TEST_F(TestDemanglerUtils, test_lastNamedPfType) {
- std::array<std::pair<std::string, std::string>, 8> const data = {{
- {"", ""},
- {std::string{__PRETTY_FUNCTION__}, std::string{}},
- TestFunctor<helpers::someFunc_0>{}(),
- TestFunctor<helpers::someFunc_1>{}(),
- TestFunctor<helpers::someFunc_2<int, float>>{}(),
- SecondTestFunctor<int, float, helpers::someFunc_0>{}(),
- SecondTestFunctor<double, char, helpers::someFunc_1>{}(),
- SecondTestFunctor<unsigned, int, helpers::someFunc_2<int, float>>{}()
- }};
+ std::array<std::pair<std::string, std::string>, 8> const data = {
+ {{"", ""},
+ {std::string{__PRETTY_FUNCTION__}, std::string{}},
+ TestFunctor<helpers::someFunc_0>{}(),
+ TestFunctor<helpers::someFunc_1>{}(),
+ TestFunctor<helpers::someFunc_2<int, float>>{}(),
+ SecondTestFunctor<int, float, helpers::someFunc_0>{}(),
+ SecondTestFunctor<double, char, helpers::someFunc_1>{}(),
+ SecondTestFunctor<unsigned, int, helpers::someFunc_2<int, float>>{}()}
+ };
for (auto const& [spf, expected] : data) {
EXPECT_EQ(TE::lastNamedPfType(spf, "PF_VALUE_NAME"), expected)
|
Up to standards ✅🟢 Issues
|
| Metric | Results |
|---|---|
| Complexity | -40 |
| Duplication | 0 |
NEW Get contextual insights on your PRs based on Codacy's metrics, along with PR and Jira context, without leaving GitHub. Enable AI reviewer
TIP This summary will be updated as you push new changes.
Pipelines resultsvt-build-amd64-alpine-3-16-clang-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-20-04-gcc-10-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-24-04-clang-18-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-24-04-clang-17-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-24-04-gcc-14-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-20-04-gcc-10-openmpi-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-22-04-clang-13-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-24-04-clang-16-zoltan-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-24-04-clang-16-vtk-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-22-04-clang-12-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-22-04-clang-14-cpp Build for 61dd1a0 (2026-08-26 14:45:51 UTC) vt-build-amd64-ubuntu-24-04-icpx-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-22-04-clang-15-cpp-cxx20 Build for 61dd1a0 (2026-08-26 14:45:51 UTC) vt-build-amd64-ubuntu-22-04-gcc-11-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-24-04-gcc-13-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-24-04-gcc-14-cpp-docs Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-24-04-gcc-13-cuda-12-9-0-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-20-04-gcc-10-openmpi-cpp-spack Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-22-04-clang-15-cpp-shared-ext-lib Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-22-04-clang-13-cpp-fcontext Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-22-04-clang-15-cpp-debug Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-22-04-clang-14-cpp-trace-debug Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-22-04-clang-14-cpp-ubsan Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-22-04-gcc-12-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-22-04-gcc-12-vtk-cpp Build for aece52a (2026-10-13 17:17:21 UTC) vt-build-amd64-ubuntu-20-04-gcc-10-ldms-cpp Build for aece52a (2026-10-13 17:17:21 UTC) |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #2525 +/- ##
===========================================
+ Coverage 88.51% 88.71% +0.20%
===========================================
Files 728 720 -8
Lines 31028 30821 -207
===========================================
- Hits 27463 27343 -120
+ Misses 3565 3478 -87
🚀 New features to boost your workflow:
|
Why removing thoses checks?
|
Fix with merge
|
|
Can you avoid putting merge commits on branch from develop? Instead you should just rebase on develop. Can you rewrite the history to do so? Thanks! |
2707dcd to
40d8ee6
Compare
|
Need DARMA-tasking/workflows#51 from |
|
Remove fix for Spack from this PR and put it in the one linked to the issue #2532 |
|
Need to merge #2535 before to fix Spack issue |
dbb0096 to
75dea17
Compare
feef9a8 to
33f7b68
Compare
2 participants
Fixes #2524