Skip to content

DPL: fix OutputSpec metadata ignored in workflow deserialization #15204

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

DPL: fix OutputSpec metadata ignored in workflow deserialization #15204

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
5 changes: 3 additions & 2 deletions Framework/Core/src/WorkflowSerializationHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,10 +430,11 @@ struct WorkflowImporter : public rapidjson::BaseReaderHandler<rapidjson::UTF8<>,
inputMatcherNodes.push_back(std::move(node));
} else if (in(State::IN_OUTPUT)) {
if (outputHasSubSpec) {
dataProcessors.back().outputs.push_back(OutputSpec({binding}, origin, description, subspec, lifetime));
dataProcessors.back().outputs.push_back(OutputSpec({binding}, origin, description, subspec, lifetime, outputOptions));
} else {
dataProcessors.back().outputs.push_back(OutputSpec({binding}, {origin, description}, lifetime));
dataProcessors.back().outputs.push_back(OutputSpec({binding}, {origin, description}, lifetime, outputOptions));
}
outputOptions.clear();
outputHasSubSpec = false;
} else if (in(State::IN_OPTION)) {
std::unique_ptr<ConfigParamSpec> opt{nullptr};
Expand Down
33 changes: 33 additions & 0 deletions Framework/Core/test/test_WorkflowSerialization.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,36 @@ TEST_CASE("TestVerifyWildcard")
// also check if the conversion to ConcreteDataMatcher is working at import
// REQUIRE(std::get_if<ConcreteDataTypeMatcher>(&w1[0].inputs[0].matcher) != nullptr);;
}

TEST_CASE("TestInputOutputSpecMetadata")
{
WorkflowSpec wso{
DataProcessorSpec{
.name = "S1",
.outputs = {OutputSpec{OutputLabel{"o1"}, o2::header::DataOrigin{"TST"}, "OUTPUT1", 0, Lifetime::Timeframe, {{"param1", VariantType::Bool, true, ConfigParamSpec::HelpString{"\"\""}}, {"param2", VariantType::Bool, true, ConfigParamSpec::HelpString{"\"\""}}}},
OutputSpec{OutputLabel{"o2"}, o2::header::DataOrigin{"TST"}, "OUTPUT2"}}}};

std::vector<DataProcessorInfo> dataProcessorInfoOut{
{.name = "S1", .executable = "test_Framework_test_SerializationWorkflow"},
};

CommandInfo commandInfoOut{"o2-dpl-workflow -b"};

std::vector<DataProcessorInfo> dataProcessorInfoIn{};
CommandInfo commandInfoIn;

std::ostringstream firstDump;
WorkflowSerializationHelpers::dump(firstDump, wso, dataProcessorInfoOut, commandInfoOut);
std::istringstream is;
is.str(firstDump.str());

WorkflowSpec wsi;
WorkflowSerializationHelpers::import(is, wsi, dataProcessorInfoIn, commandInfoIn);

REQUIRE(wsi[0].outputs[0].metadata.size() == 2);
REQUIRE(wsi[0].outputs[1].metadata.size() == 0);
REQUIRE(wso[0].outputs[0].metadata.size() == wsi[0].outputs[0].metadata.size());
REQUIRE(wso[0].outputs[1].metadata.size() == wsi[0].outputs[1].metadata.size());
REQUIRE(wso[0].outputs[0].metadata[0] == wsi[0].outputs[0].metadata[0]);
REQUIRE(wso[0].outputs[0].metadata[1] == wsi[0].outputs[0].metadata[1]);
}
Loading