Skip to content
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

Delete function warnAboutLegacyModules (no longer needed) #44254

Merged
merged 1 commit into from
Feb 29, 2024
Merged

Delete function warnAboutLegacyModules (no longer needed) #44254

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 FWCore/Framework/interface/EventProcessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@ namespace edm {

void throwAboutModulesRequiringLuminosityBlockSynchronization() const;
void warnAboutModulesRequiringRunSynchronization() const;
void warnAboutLegacyModules() const;

bool needToCallNext() const { return needToCallNext_; }
void setNeedToCallNext(bool val) { needToCallNext_ = val; }
Expand Down
2 changes: 1 addition & 1 deletion FWCore/Framework/interface/maker/Worker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ namespace edm {
public:
enum State { Ready, Pass, Fail, Exception };
enum Types { kAnalyzer, kFilter, kProducer, kOutputModule };
enum ConcurrencyTypes { kGlobal, kLimited, kOne, kStream, kLegacy };
enum ConcurrencyTypes { kGlobal, kLimited, kOne, kStream };
struct TaskQueueAdaptor {
SerialTaskQueueChain* serial_ = nullptr;
LimitedTaskQueue* limited_ = nullptr;
Expand Down
16 changes: 0 additions & 16 deletions FWCore/Framework/src/EventProcessor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,6 @@ namespace edm {
if (preallocations_.numberOfRuns() > 1) {
warnAboutModulesRequiringRunSynchronization();
}
warnAboutLegacyModules();

//NOTE: This implementation assumes 'Job' means one call
// the EventProcessor::run
Expand Down Expand Up @@ -2498,19 +2497,4 @@ namespace edm {
}
}
}

void EventProcessor::warnAboutLegacyModules() const {
std::unique_ptr<LogSystem> s;
for (auto worker : schedule_->allWorkers()) {
if (worker->moduleConcurrencyType() == Worker::kLegacy) {
if (not s) {
s = std::make_unique<LogSystem>("LegacyModules");
(*s) << "The following legacy modules are configured. Support for legacy modules\n"
"is going to end soon. These modules need to be converted to have type\n"
"edm::global, edm::stream, edm::one, or in rare cases edm::limited.";
}
(*s) << "\n " << worker->description()->moduleName() << " " << worker->description()->moduleLabel();
}
}
}
} // namespace edm