Skip to content

DPL: fix missing return true in ToologyPolicy #14488

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 3 commits into from
Jul 8, 2025
Merged

DPL: fix missing return true in ToologyPolicy #14488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d7c376
DPL: improve debug information in case of circular dependencies.
ktf Jul 8, 2025
2bdc665
DPL: remove duplicate branch.
ktf Jul 8, 2025
cc740fd
DPL: fix missing return true in ToologyPolicy
ktf Jul 8, 2025
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: 1 addition & 4 deletions Framework/Core/src/TopologyPolicy.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,6 @@ bool sporadicDataDeps(DataProcessorSpec const& a, DataProcessorSpec const& b)
if (isAWithSporadicInput && isBWithSporadicInput) {
return false;
}
// If a has sporadic inputs
if (isAWithSporadicInput && isBWithSporadicInput) {
return false;
}

// We have a with sporadic inputs. We sort it later, unless there was already some actual
// dependency between A and B.
Expand Down Expand Up @@ -200,6 +196,7 @@ bool expendableDataDeps(DataProcessorSpec const& a, DataProcessorSpec const& b)
if (sporadic) {
O2_SIGNPOST_END(topology, sid, "expendableDataDeps", "%s is expendable. No inverse dependency from %s to %s. However the former has an occasioanl input => true.",
a.name.c_str(), b.name.c_str(), a.name.c_str());
return true;
}
O2_SIGNPOST_END(topology, sid, "expendableDataDeps", "%s is expendable. No inverse dependency from %s to %s => false.",
a.name.c_str(), b.name.c_str(), a.name.c_str());
Expand Down
24 changes: 21 additions & 3 deletions Framework/Core/src/runDataProcessing.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2835,6 +2835,20 @@ std::unique_ptr<o2::framework::ServiceRegistry> createRegistry()
return std::make_unique<o2::framework::ServiceRegistry>();
}

void describeDataProcessorSpec(std::ostream& stream, DataProcessorSpec const& spec)
{
stream << spec.name;
if (!spec.labels.empty()) {
stream << "(";
bool first = false;
for (auto& label : spec.labels) {
stream << (first ? "" : ",") << label.value;
first = true;
}
stream << ")";
}
}

// This is a toy executor for the workflow spec
// What it needs to do is:
//
Expand Down Expand Up @@ -3059,18 +3073,22 @@ int doMain(int argc, char** argv, o2::framework::WorkflowSpec const& workflow,
edges.emplace_back(i, j);
if (both) {
std::ostringstream str;
describeDataProcessorSpec(str, physicalWorkflow[i]);
str << " has circular dependency with ";
describeDataProcessorSpec(str, physicalWorkflow[j]);
str << ":\n";
for (auto x : {i, j}) {
str << physicalWorkflow[x].name << ":\n";
str << "inputs:\n";
for (auto& input : physicalWorkflow[x].inputs) {
str << "- " << input << "\n";
str << "- " << input << " " << (int)input.lifetime << "\n";
}
str << "outputs:\n";
for (auto& output : physicalWorkflow[x].outputs) {
str << "- " << output << "\n";
str << "- " << output << " " << (int)output.lifetime << "\n";
}
}
throw std::runtime_error(physicalWorkflow[i].name + " has circular dependency with " + physicalWorkflow[j].name + ":\n" + str.str());
throw std::runtime_error(str.str());
}
}
}
Expand Down