Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-17 10:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

PMIx plugin: Add barriers and fix lookup of multiple keys

Browse Source
This commit is contained in:
Dennis Klein
2019-10-07 12:31:22 +02:00
committed by Dennis Klein
parent e1134321dd
commit caeee626a3
1 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
fairmq/plugins/PMIx/PMIxPlugin.cxx
View File

@@ -1,5 +1,5 @@
/******************************************************************************** /********************************************************************************
* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* * * *
* This software is distributed under the terms of the * * This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, * * GNU Lesser General Public Licence (LGPL) version 3, *
@@ -8,7 +8,6 @@
#include "PMIxPlugin.h" #include "PMIxPlugin.h"
#include <boost/algorithm/string/join.hpp>
#include <fairmq/Tools.h> #include <fairmq/Tools.h>
#include <stdexcept> #include <stdexcept>
@@ -27,14 +26,28 @@ PMIxPlugin::PMIxPlugin(const std::string& name,
: Plugin(name, version, maintainer, homepage, pluginServices) : Plugin(name, version, maintainer, homepage, pluginServices)
, fPid(getpid()) , fPid(getpid())
{ {
Init();
SetProperty<std::string>("id", std::string(fProc.nspace) + "_" + std::to_string(fProc.rank));
Fence();
SubscribeToDeviceStateChange([&](DeviceState newState) { SubscribeToDeviceStateChange([&](DeviceState newState) {
switch (newState) { switch (newState) {
case DeviceState::Connecting: case DeviceState::Idle:
Init(); Fence();
break;
case DeviceState::Bound:
Publish(); Publish();
Fence(); Fence();
break;
case DeviceState::Connecting:
Lookup(); Lookup();
break; break;
case DeviceState::DeviceReady:
Fence();
break;
case DeviceState::Ready:
Fence();
break;
case DeviceState::Exiting: case DeviceState::Exiting:
UnsubscribeFromDeviceStateChange(); UnsubscribeFromDeviceStateChange();
break; break;
@@ -101,44 +114,43 @@ auto PMIxPlugin::Fence() -> void
all.rank = pmix::rank::wildcard; all.rank = pmix::rank::wildcard;
pmix::fence({all}); pmix::fence({all});
LOG(debug) << PMIxClient() << "pmix::fence() OK";
} }
auto PMIxPlugin::Lookup() -> void auto PMIxPlugin::Lookup() -> void
{ {
auto channels(GetChannelInfo()); auto channels(GetChannelInfo());
std::vector<pmix::pdata> pdata;
for (const auto& c : channels) { for (const auto& c : channels) {
std::string methodKey{"chans." + c.first + "." + std::to_string(c.second - 1) + ".method"}; std::string methodKey{"chans." + c.first + "." + std::to_string(c.second - 1) + ".method"};
if (GetProperty<std::string>(methodKey) == "connect") { if (GetProperty<std::string>(methodKey) == "connect") {
for (int i = 0; i < c.second; ++i) { for (int i = 0; i < c.second; ++i) {
std::vector<pmix::pdata> pdata;
std::string addressKey{"chans." + c.first + "." + std::to_string(i) + ".address"}; std::string addressKey{"chans." + c.first + "." + std::to_string(i) + ".address"};
pdata.emplace_back(); pdata.emplace_back();
pdata.back().set_key(addressKey); pdata.back().set_key(addressKey);
} std::vector<pmix::info> info;
} info.emplace_back(PMIX_WAIT, static_cast<int>(pdata.size()));
}
if (pdata.size() > 0) { if (pdata.size() > 0) {
pmix::lookup(pdata); pmix::lookup(pdata, info);
LOG(debug) << PMIxClient() << "pmix::lookup() OK"; LOG(debug) << PMIxClient() << "pmix::lookup() OK";
} }
LOG(info) << pdata.size();
for (const auto& p : pdata) { for (const auto& p : pdata) {
if (p.value.type == PMIX_UNDEF) { if (p.value.type == PMIX_UNDEF) {
LOG(debug) << PMIxClient() << "pmix::lookup() not found: key=" << p.key; LOG(debug) << PMIxClient() << "pmix::lookup() not found: key=" << p.key;
} else if (p.value.type == PMIX_STRING) { } else if (p.value.type == PMIX_STRING) {
LOG(debug) << PMIxClient() << " pmix::lookup() found: key=" << p.key << ",value=" << p.value.data.string; LOG(debug) << PMIxClient() << "pmix::lookup() found:"
<< " key=" << p.key << ",value=" << p.value.data.string;
SetProperty<std::string>(p.key, p.value.data.string); SetProperty<std::string>(p.key, p.value.data.string);
LOG(info) << GetProperty<std::string>(p.key);
} else { } else {
LOG(debug) << PMIxClient() << " pmix::lookup() wrong type returned: key=" << p.key << ",type=" << p.value.type; LOG(debug) << PMIxClient() << "pmix::lookup() wrong type returned: "
<< "key=" << p.key << ",type=" << p.value.type;
}
}
}
} }
} }
LOG(info) << pdata.size();
} }
} /* namespace plugins */ } /* namespace plugins */