Skip to content

DPL: cleanup creation of DataProcessorInfo #14096

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

Merged
ktf merged 1 commit into from
Mar 22, 2025
Merged

DPL: cleanup creation of DataProcessorInfo #14096

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
1 change: 0 additions & 1 deletion Framework/Core/test/test_DataAllocator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ DataProcessorSpec getSourceSpec()
{
static_assert(enable_root_serialization<o2::test::Polymorphic>::value, "enable_root_serialization<o2::test::Polymorphic> must be true");
auto processingFct = [](ProcessingContext& pc) {
static int counter = 0;
o2::test::TriviallyCopyable a(42, 23, 0xdead);
o2::test::Polymorphic b(0xbeef);
std::vector<o2::test::Polymorphic> c{{0xaffe}, {0xd00f}};
Expand Down
31 changes: 15 additions & 16 deletions Framework/Core/test/test_DeviceSpecHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include "Framework/DriverConfig.h"
#include "../src/DeviceSpecHelpers.h"
#include <catch_amalgamated.hpp>
#include <algorithm>
#include <sstream>
#include <cstring>
#include <vector>
Expand Down Expand Up @@ -67,10 +66,10 @@ void check(const std::vector<std::string>& arguments,
std::vector<DataProcessorInfo> dataProcessorInfos;
for (auto& [name, _] : matrix) {
dataProcessorInfos.push_back(DataProcessorInfo{
name,
"executable-name",
arguments,
workflowOptions,
.name = name,
.executable = "executable-name",
.cmdLineArgs = arguments,
.workflowOptions = workflowOptions,
});
}
DriverConfig driverConfig{};
Expand Down Expand Up @@ -184,38 +183,38 @@ TEST_CASE("CheckOptionReworking")
{
{
std::vector<DataProcessorInfo> infos = {
{{}, {}, {"--driver-client-backend", "foo"}},
{.cmdLineArgs = {"--driver-client-backend", "foo"}},
{}};
DeviceSpecHelpers::reworkHomogeneousOption(infos, "--driver-client-backend", "stdout://");
REQUIRE(infos[0].cmdLineArgs[1] == "foo");
REQUIRE(infos[1].cmdLineArgs[1] == "foo");
}
{
std::vector<DataProcessorInfo> infos = {
{{}, {}, {"--driver-client-backend", "foo"}},
{{}, {}, {"--driver-client-backend", "bar"}}};
{.cmdLineArgs = {"--driver-client-backend", "foo"}},
{.cmdLineArgs = {"--driver-client-backend", "bar"}}};
REQUIRE_THROWS_AS(DeviceSpecHelpers::reworkHomogeneousOption(infos, "--driver-client-backend", "stdout://"), o2::framework::RuntimeErrorRef);
}
{
std::vector<DataProcessorInfo> infos = {
{{}, {}, {"--driver-client-backend", "foo"}},
{{}, {}, {"--driver-client-backend", "foo"}}};
{.cmdLineArgs = {"--driver-client-backend", "foo"}},
{.cmdLineArgs = {"--driver-client-backend", "foo"}}};
DeviceSpecHelpers::reworkHomogeneousOption(infos, "--driver-client-backend", "stdout://");
REQUIRE(infos[0].cmdLineArgs[1] == "foo");
REQUIRE(infos[1].cmdLineArgs[1] == "foo");
}
{
std::vector<DataProcessorInfo> infos = {
{{}, {}, {"foo", "bar"}},
{{}, {}, {"fnjcnak", "foo"}}};
{.cmdLineArgs = {"foo", "bar"}},
{.cmdLineArgs = {"fnjcnak", "foo"}}};
DeviceSpecHelpers::reworkHomogeneousOption(infos, "--driver-client-backend", "stdout://");
REQUIRE(infos[0].cmdLineArgs[3] == "stdout://");
REQUIRE(infos[1].cmdLineArgs[3] == "stdout://");
}
{
std::vector<DataProcessorInfo> infos = {
{{}, {}, {"foo", "bar", "--driver-client-backend", "bar"}},
{{}, {}, {"fnjcnak", "foo"}}};
{.cmdLineArgs = {"foo", "bar", "--driver-client-backend", "bar"}},
{.cmdLineArgs = {"fnjcnak", "foo"}}};
DeviceSpecHelpers::reworkHomogeneousOption(infos, "--driver-client-backend", "stdout://");
REQUIRE(infos[0].cmdLineArgs[3] == "bar");
REQUIRE(infos[1].cmdLineArgs[3] == "bar");
Expand Down Expand Up @@ -277,8 +276,8 @@ TEST_CASE("CheckIntegerReworking")
}
{
std::vector<DataProcessorInfo> infos = {
{{}, {}, {"foo", "bar", "--readers", "3"}},
{{}, {}, {"--readers", "2"}}};
{.cmdLineArgs = {"foo", "bar", "--readers", "3"}},
{.cmdLineArgs = {"--readers", "2"}}};
DeviceSpecHelpers::reworkIntegerOption(
infos, "--readers", []() { return 1; }, 1, [](long long x, long long y) { return x > y ? x : y; });
REQUIRE(infos[0].cmdLineArgs.size() == 4);
Expand Down
16 changes: 8 additions & 8 deletions Framework/Core/test/test_FrameworkDataFlowToDDS.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ TEST_CASE("TestDDS")

std::vector<DataProcessorInfo> dataProcessorInfos = {
{
{"A", "bcsadc/foo", {}, workflowOptions},
{"B", "foo", {}, workflowOptions},
{"C", "foo", {}, workflowOptions},
{"D", "foo", {}, workflowOptions},
{.name = "A", .executable = "bcsadc/foo", .workflowOptions = workflowOptions},
{.name = "B", .executable = "foo", .workflowOptions = workflowOptions},
{.name = "C", .executable = "foo", .workflowOptions = workflowOptions},
{.name = "D", .executable = "foo", .workflowOptions = workflowOptions},
}};
DriverConfig driverConfig = {
.batch = true,
Expand Down Expand Up @@ -406,10 +406,10 @@ TEST_CASE("TestDDSExpendable")

std::vector<DataProcessorInfo> dataProcessorInfos = {
{
{"A", "bcsadc/foo", {}, workflowOptions},
{"B", "foo", {}, workflowOptions},
{"C", "foo", {}, workflowOptions},
{"D", "foo", {}, workflowOptions},
{.name = "A", .executable = "bcsadc/foo", .workflowOptions = workflowOptions},
{.name = "B", .executable = "foo", .workflowOptions = workflowOptions},
{.name = "C", .executable = "foo", .workflowOptions = workflowOptions},
{.name = "D", .executable = "foo", .workflowOptions = workflowOptions},
}};
DriverConfig driverConfig = {
.batch = true,
Expand Down
8 changes: 4 additions & 4 deletions Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,10 +561,10 @@ TEST_CASE("TestO2ControlDump")

std::vector<DataProcessorInfo> dataProcessorInfos = {
{
{"A", "bcsadc/foo", {}, workflowOptions},
{"B", "foo", {}, workflowOptions},
{"C", "foo", {}, workflowOptions},
{"D", "foo", {}, workflowOptions},
{.name = "A", .executable = "bcsadc/foo", .workflowOptions = workflowOptions},
{.name = "B", .executable = "foo", .workflowOptions = workflowOptions},
{.name = "C", .executable = "foo", .workflowOptions = workflowOptions},
{.name = "D", .executable = "foo", .workflowOptions = workflowOptions},
}};

DriverConfig driverConfig{
Expand Down
10 changes: 5 additions & 5 deletions Framework/Core/test/test_WorkflowSerialization.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ TEST_CASE("TestVerifyWorkflowSerialization")
{{"key1", "v\"al'1"}, {"", "val2"}, {"key3", ""}, {"", ""}}}};

std::vector<DataProcessorInfo> dataProcessorInfoOut{
{"A", "test_Framework_test_SerializationWorkflow", {"foo"}, {ConfigParamSpec{"aBool", VariantType::Bool, true, {"A Bool"}}}},
{"B", "test_Framework_test_SerializationWorkflow", {"b-bar", "bfoof", "fbdbfaso"}},
{"C", "test_Framework_test_SerializationWorkflow", {}},
{"D", "test_Framework_test_SerializationWorkflow", {}},
{.name = "A", .executable = "test_Framework_test_SerializationWorkflow", .cmdLineArgs = {"foo"}, .workflowOptions = {ConfigParamSpec{"aBool", VariantType::Bool, true, {"A Bool"}}}},
{.name = "B", .executable = "test_Framework_test_SerializationWorkflow", .cmdLineArgs = {"b-bar", "bfoof", "fbdbfaso"}},
{.name = "C", .executable = "test_Framework_test_SerializationWorkflow"},
{.name = "D", .executable = "test_Framework_test_SerializationWorkflow"},
};

CommandInfo commandInfoOut{"o2-dpl-workflow -b --option 1 --option 2"};
Expand Down Expand Up @@ -94,7 +94,7 @@ TEST_CASE("TestVerifyWildcard")
}};

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

CommandInfo commandInfoOut{"o2-dpl-workflow -b --option 1 --option 2"};
Expand Down