Skip to content

Make Worker only if module uses the transition #51634

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
cmsbuild merged 1 commit into from
Aug 6, 2026
Merged

Make Worker only if module uses the transition #51634

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
14 changes: 7 additions & 7 deletions FWCore/Framework/interface/StreamSchedule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,18 +227,17 @@ namespace edm {

/// returns the collection of pointers to workers
AllWorkers const& allWorkersRuns() const { return workerManagerRuns_.allWorkers(); }
AllWorkers const& allWorkersLumisAndEvents() const { return workerManagerLumisAndEvents_.allWorkers(); }
AllWorkers const& allWorkersLumis() const { return workerManagerLumis_.allWorkers(); }
AllWorkers const& allWorkersEvents() const { return workerManagerEvents_.allWorkers(); }

AllWorkers const& unscheduledWorkersLumisAndEvents() const {
return workerManagerLumisAndEvents_.unscheduledWorkers();
}
AllWorkers const& unscheduledWorkersEvents() const { return workerManagerEvents_.unscheduledWorkers(); }
unsigned int numberOfUnscheduledModules() const { return number_of_unscheduled_modules_; }

StreamContext const& context() const { return streamContext_; }

private:
/// returns the action table
ExceptionToActionTable const& actionTable() const { return workerManagerLumisAndEvents_.actionTable(); }
ExceptionToActionTable const& actionTable() const { return workerManagerEvents_.actionTable(); }

void resetAll();

Expand Down Expand Up @@ -267,7 +266,8 @@ namespace edm {

std::vector<unsigned int> moduleBeginStreamFailed_;
WorkerManager workerManagerRuns_;
WorkerManager workerManagerLumisAndEvents_;
WorkerManager workerManagerLumis_;
WorkerManager workerManagerEvents_;
std::shared_ptr<ActivityRegistry> actReg_; // We do not use propagate_const because the registry itself is mutable.

edm::propagate_const<TrigResPtr> results_;
Expand Down Expand Up @@ -341,7 +341,7 @@ namespace edm {
// Caught exception is propagated via WaitingTaskHolder
WorkerManager* workerManager = &workerManagerRuns_;
if (T::branchType_ == InLumi) {
workerManager = &workerManagerLumisAndEvents_;
workerManager = &workerManagerLumis_;
}
CMS_SA_ALLOW try {
preScheduleSignal<T>(&streamContext_);
Expand Down
2 changes: 1 addition & 1 deletion FWCore/Framework/src/Schedule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ namespace edm {
// At this point all ProductDescriptions are created. Mark now the
// ones of unscheduled workers to be on-demand.
{
auto const& unsched = streamSchedules_[0]->unscheduledWorkersLumisAndEvents();
auto const& unsched = streamSchedules_[0]->unscheduledWorkersEvents();
if (not unsched.empty()) {
std::set<std::string> unscheduledModules;
std::transform(unsched.begin(),
Expand Down
53 changes: 32 additions & 21 deletions FWCore/Framework/src/StreamSchedule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ namespace edm {
StreamID streamID,
ProcessContext const* processContext)
: workerManagerRuns_(modReg, areg, actions),
workerManagerLumisAndEvents_(modReg, areg, actions),
workerManagerLumis_(modReg, areg, actions),
workerManagerEvents_(modReg, areg, actions),
actReg_(areg),
results_(std::make_shared<HLTGlobalStatus>(paths.size())),
results_inserter_(),
Expand All @@ -178,7 +179,7 @@ namespace edm {
if (hasPath) {
// the results inserter stands alone
inserter->setTrigResultForStream(streamID.value(), results());
results_inserter_ = workerManagerLumisAndEvents_.getWorkerForModule(*inserter);
results_inserter_ = workerManagerEvents_.getWorkerForModule(*inserter);
}

// fill normal endpaths
Expand All @@ -190,11 +191,16 @@ namespace edm {
}

for (auto const* module : unscheduledModules) {
workerManagerLumisAndEvents_.addToUnscheduledWorkers(*module);
workerManagerEvents_.addToUnscheduledWorkers(*module);
}

for (auto const& worker : allWorkersLumisAndEvents()) {
(void)workerManagerRuns_.getWorkerForModule(*worker->description());
for (auto const& worker : allWorkersEvents()) {
if (worker->wantsStreamLuminosityBlocks()) {
(void)workerManagerLumis_.getWorkerForModule(*worker->description());
}
if (worker->wantsStreamRuns()) {
(void)workerManagerRuns_.getWorkerForModule(*worker->description());
}
}

} // StreamSchedule::StreamSchedule
Expand Down Expand Up @@ -239,7 +245,7 @@ namespace edm {
}

std::unordered_set<std::string> modulesToExclude(modulesToSkip.begin(), modulesToSkip.end());
for (auto w : allWorkersLumisAndEvents()) {
for (auto w : allWorkersEvents()) {
if (modulesToExclude.end() != modulesToExclude.find(w->description()->moduleLabel())) {
continue;
}
Expand Down Expand Up @@ -416,7 +422,7 @@ namespace edm {
PathWorkers tmpworkers;
tmpworkers.reserve(iPath.size());
for (auto const& module : iPath) {
tmpworkers.emplace_back(workerManagerLumisAndEvents_.getWorkerForModule(*module.description_),
tmpworkers.emplace_back(workerManagerEvents_.getWorkerForModule(*module.description_),
module.action_,
module.placeInPath_,
module.runConcurrently_);
Expand All @@ -425,7 +431,7 @@ namespace edm {
}

void StreamSchedule::fillTrigPath(PathInfo const& iPath, int bitpos, TrigResPtr trptr) {
auto workerPtr = workerManagerLumisAndEvents_.getWorkerForModule(*iPath.inserter_);
auto workerPtr = workerManagerEvents_.getWorkerForModule(*iPath.inserter_);
pathStatusInserterWorkers_.emplace_back(workerPtr);
if (iPath.modules_.empty()) {
empty_trig_paths_.push_back(bitpos);
Expand All @@ -440,7 +446,7 @@ namespace edm {
void StreamSchedule::fillEndPath(EndPathInfo const& iEndPath, int bitpos) {
Worker* workerPtr = nullptr;
if (iEndPath.inserter_) {
workerPtr = workerManagerLumisAndEvents_.getWorkerForModule(*iEndPath.inserter_);
workerPtr = workerManagerEvents_.getWorkerForModule(*iEndPath.inserter_);
endPathStatusInserterWorkers_.emplace_back(workerPtr);
}
if (iEndPath.modules_.empty()) {
Expand Down Expand Up @@ -530,8 +536,13 @@ namespace edm {
break;
}
}

for (auto const& worker : allWorkersLumisAndEvents()) {
for (auto const& worker : allWorkersEvents()) {
if (worker->description()->moduleLabel() == iLabel) {
iMod->replaceModuleFor(worker);
break;
}
}
for (auto const& worker : allWorkersLumis()) {
if (worker->description()->moduleLabel() == iLabel) {
iMod->replaceModuleFor(worker);
break;
Expand All @@ -541,14 +552,15 @@ namespace edm {

void StreamSchedule::deleteModule(std::string const& iLabel) {
workerManagerRuns_.deleteModuleIfExists(iLabel);
workerManagerLumisAndEvents_.deleteModuleIfExists(iLabel);
workerManagerLumis_.deleteModuleIfExists(iLabel);
workerManagerEvents_.deleteModuleIfExists(iLabel);
}

std::vector<ModuleDescription const*> StreamSchedule::getAllModuleDescriptions() const {
std::vector<ModuleDescription const*> result;
result.reserve(allWorkersLumisAndEvents().size());
result.reserve(allWorkersEvents().size());

for (auto const& worker : allWorkersLumisAndEvents()) {
for (auto const& worker : allWorkersEvents()) {
ModuleDescription const* p = worker->description();
result.push_back(p);
}
Expand Down Expand Up @@ -576,8 +588,8 @@ namespace edm {
// Data dependencies need to be set up before marking empty
// (End)Paths complete in case something consumes the status of
// the empty (EndPath)
workerManagerLumisAndEvents_.setupResolvers(ep);
workerManagerLumisAndEvents_.setupOnDemandSystem(info);
workerManagerEvents_.setupResolvers(ep);
workerManagerEvents_.setupOnDemandSystem(info);

HLTPathStatus hltPathStatus(hlt::Pass, 0);
for (int empty_trig_path : empty_trig_paths_) {
Expand Down Expand Up @@ -659,9 +671,8 @@ namespace edm {
}

ParentContext parentContext(&streamContext_);
workerManagerLumisAndEvents_
.processAccumulatorsAsync<OccurrenceTraits<EventPrincipal, TransitionActionStreamBegin>>(
hAllPathsDone, info, serviceToken, streamID_, parentContext, &streamContext_);
workerManagerEvents_.processAccumulatorsAsync<OccurrenceTraits<EventPrincipal, TransitionActionStreamBegin>>(
hAllPathsDone, info, serviceToken, streamID_, parentContext, &streamContext_);
} catch (...) {
iTask.doneWaiting(std::current_exception());
}
Expand Down Expand Up @@ -885,15 +896,15 @@ namespace edm {

fill_summary(trig_paths_, rep.trigPathSummaries, &fillPathSummary);
fill_summary(end_paths_, rep.endPathSummaries, &fillPathSummary);
fill_summary(allWorkersLumisAndEvents(), rep.workerSummaries, &fillWorkerSummary);
fill_summary(allWorkersEvents(), rep.workerSummaries, &fillWorkerSummary);
}

void StreamSchedule::clearCounters() {
using std::placeholders::_1;
total_events_ = total_passed_ = 0;
for_all(trig_paths_, std::bind(&Path::clearCounters, _1));
for_all(end_paths_, std::bind(&Path::clearCounters, _1));
for_all(allWorkersLumisAndEvents(), std::bind(&Worker::clearCounters, _1));
for_all(allWorkersEvents(), std::bind(&Worker::clearCounters, _1));
}

void StreamSchedule::resetAll() { results_->reset(); }
Expand Down