Skip to content

DPL: streamline option building #15320

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
ktf wants to merge 1 commit into
base: dev
Choose a base branch
from
+61 −44
Open

DPL: streamline option building #15320

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
104 changes: 61 additions & 43 deletions Framework/Core/src/DeviceSpecHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,53 +1596,71 @@ void DeviceSpecHelpers::prepareArguments(bool defaultQuiet, bool defaultStopped,
}
};

for (const auto varit : varmap) {
for (const auto& varit : varmap) {
// find the option belonging to key, add if the option has been parsed
// and is not defaulted
const auto* description = odesc.find_nothrow(varit.first, false);
if (description && varmap.count(varit.first)) {
// check the semantics of the value
auto semantic = description->semantic();
const char* optarg = "";
if (semantic) {
// the value semantics allows different properties like
// multitoken, zero_token and composing
// currently only the simple case is supported
assert(semantic->min_tokens() <= 1);
// assert(semantic->max_tokens() && semantic->min_tokens());
if (semantic->min_tokens() > 0) {
std::string stringRep;
if (auto v = boost::any_cast<std::string>(&varit.second.value())) {
stringRep = *v;
} else if (auto v = boost::any_cast<EarlyForwardPolicy>(&varit.second.value())) {
std::stringstream tmp;
tmp << *v;
stringRep = fmt::format("{}", tmp.str());
}
if (varit.first == "channel-config") {
// FIXME: the parameter to channel-config can be a list of configurations separated
// by semicolon. The individual configurations will be separated and added individually.
// The device arguments can then contaoin multiple channel-config entries, but only
// one for the last configuration is added to control.options
processRawChannelConfig(stringRep);
optarg = tmpArgs.back().c_str();
} else {
std::string key(fmt::format("--{}", varit.first));
if (stringRep.length() == 0) {
// in order to identify options without parameter we add a string
// with one blank for the 'blank' parameter, it is filtered out
// further down and a zero-length string is added to argument list
stringRep = " ";
}
updateDeviceArguments(key, stringRep);
optarg = uniqueDeviceArgs[key].c_str();
}
} else if (semantic->min_tokens() == 0 && varit.second.as<bool>()) {
updateDeviceArguments(fmt::format("--{}", varit.first), "");
if (description == nullptr || varmap.count(varit.first) == 0) {
continue;
}

if ((varit.first == "ccdb-fetchers" || varit.first == "spawners") && varit.second.defaulted()) {
continue;
}

// check the semantics of the value
auto semantic = description->semantic();
const char* optarg = "";
if (!semantic) {
control.options.insert(std::make_pair(varit.first, optarg));
continue;
}

if (semantic->min_tokens() == 0 && varit.second.as<bool>()) {
updateDeviceArguments(fmt::format("--{}", varit.first), "");
control.options.insert(std::make_pair(varit.first, optarg));
continue;
}

// the value semantics allows different properties like
// multitoken, zero_token and composing
// currently only the simple case is supported
assert(semantic->min_tokens() <= 1);
// assert(semantic->max_tokens() && semantic->min_tokens());
if (semantic->min_tokens() == 0) {
control.options.insert(std::make_pair(varit.first, optarg));
continue;
}

if (semantic->min_tokens() > 0) {
std::string stringRep;
if (auto v = boost::any_cast<std::string>(&varit.second.value())) {
stringRep = *v;
} else if (auto v = boost::any_cast<EarlyForwardPolicy>(&varit.second.value())) {
std::stringstream tmp;
tmp << *v;
stringRep = fmt::format("{}", tmp.str());
}
if (varit.first == "channel-config") {
// FIXME: the parameter to channel-config can be a list of configurations separated
// by semicolon. The individual configurations will be separated and added individually.
// The device arguments can then contaoin multiple channel-config entries, but only
// one for the last configuration is added to control.options
processRawChannelConfig(stringRep);
optarg = tmpArgs.back().c_str();
} else {
std::string key(fmt::format("--{}", varit.first));
if (stringRep.length() == 0) {
// in order to identify options without parameter we add a string
// with one blank for the 'blank' parameter, it is filtered out
// further down and a zero-length string is added to argument list
stringRep = " ";
}
updateDeviceArguments(key, stringRep);
optarg = uniqueDeviceArgs[key].c_str();
}
control.options.insert(std::make_pair(varit.first, optarg));
}
control.options.insert(std::make_pair(varit.first, optarg));
}
};

Expand All @@ -1653,11 +1671,11 @@ void DeviceSpecHelpers::prepareArguments(bool defaultQuiet, bool defaultStopped,

// Add the channel configuration
for (auto& channel : spec.outputChannels) {
tmpArgs.emplace_back(std::string("--channel-config"));
tmpArgs.emplace_back("--channel-config");
tmpArgs.emplace_back(outputChannel2String(channel));
}
for (auto& channel : spec.inputChannels) {
tmpArgs.emplace_back(std::string("--channel-config"));
tmpArgs.emplace_back("--channel-config");
tmpArgs.emplace_back(inputChannel2String(channel));
}

Expand Down
1 change: 0 additions & 1 deletion Framework/Core/src/runDataProcessing.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2055,7 +2055,6 @@ int runStateMachine(DataProcessorSpecs const& workflow,
"--driver-client-backend",
"--fairmq-ipc-prefix",
"--readers",
"--ccdb-fetchers",
"--resources-monitoring",
"--resources-monitoring-file",
"--resources-monitoring-dump-interval",
Expand Down