Skip to content

Commit 5468ed5

Browse files
makortelmakortel
committed
Add Process name, reduced configuration ID, and ParameterSet ID to the JobReport
Main motivation is to give CRAB a more stable way to retrieve the ParameterSetID than edmProvDump.
1 parent 8f4b703 commit 5468ed5

20 files changed

+117
-11
lines changed

‎FWCore/Framework/src/EventProcessor.cc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,15 @@ namespace edm {
534534
processConfiguration_ = items.processConfiguration();
535535
processContext_.setProcessConfiguration(processConfiguration_.get());
536536

537+
{
538+
edm::Service<edm::JobReport> jr;
539+
if (jr.isAvailable()) {
540+
ProcessConfiguration reduced = *processConfiguration_;
541+
reduced.reduce();
542+
jr->reportProcess(reduced.processName(), reduced.id(), reduced.parameterSetID());
543+
}
544+
}
545+
537546
FDEBUG(2) << parameterSet << std::endl;
538547

539548
principalCache_.setNumberOfConcurrentPrincipals(preallocations_);

‎FWCore/MessageLogger/interface/JobReport.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ Changes Log 1: 2009/01/14 10:29:00, Natalia Garcia Nebot
8282
*/
8383

8484
#include "DataFormats/Provenance/interface/RunLumiEventNumber.h"
85+
#include "DataFormats/Provenance/interface/ParameterSetID.h"
86+
#include "DataFormats/Provenance/interface/ProcessConfigurationID.h"
8587
#include "FWCore/Utilities/interface/InputType.h"
8688
#include "FWCore/Utilities/interface/get_underlying_safe.h"
8789

@@ -177,8 +179,10 @@ namespace edm {
177179
};
178180

179181
struct JobReportImpl {
180-
JobReportImpl& operator=(JobReportImpl const&) = delete;
181182
JobReportImpl(JobReportImpl const&) = delete;
183+
JobReportImpl& operator=(JobReportImpl const&) = delete;
184+
JobReportImpl(JobReportImpl&&) = delete;
185+
JobReportImpl& operator=(JobReportImpl&&) = delete;
182186

183187
InputFile& getInputFileForToken(InputType inputType, Token t);
184188
OutputFile& getOutputFileForToken(Token t);
@@ -269,6 +273,9 @@ namespace edm {
269273

270274
~JobReport();
271275

276+
// Insert information about the process
277+
void reportProcess(std::string_view processName, ProcessConfigurationID reducedProcessID, ParameterSetID psetID);
278+
272279
/// Report that an input file has been opened.
273280
/// The returned Token should be used for later identification
274281
/// of this file.

‎FWCore/MessageLogger/src/JobReport.cc‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,19 @@ namespace edm {
351351
temporarilyCloseXML();
352352
}
353353

354+
void JobReport::reportProcess(std::string_view processName,
355+
ProcessConfigurationID reducedProcessID,
356+
ParameterSetID psetID) {
357+
if (impl_->ost_) {
358+
*(impl_->ost_) << "\n<Process>\n";
359+
*(impl_->ost_) << " <Name>" << processName << "</Name>\n";
360+
*(impl_->ost_) << " <ReducedConfigurationID>" << reducedProcessID << "</ReducedConfigurationID>\n";
361+
*(impl_->ost_) << " <ParameterSetID>" << psetID << "</ParameterSetID>\n";
362+
*(impl_->ost_) << "</Process>\n";
363+
}
364+
temporarilyCloseXML();
365+
}
366+
354367
JobReport::Token JobReport::inputFileOpened(std::string const& physicalFileName,
355368
std::string const& logicalFileName,
356369
std::string const& catalog,

‎FWCore/MessageService/test/filter-timestamps.sed‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
s/ [0-9]?[0-9]-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-2[0-9][0-9][0-9] [0-9]?[0-9]:[0-9][0-9]:[0-9][0-9](\.[0-9][0-9][0-9])? [A-Z]?[A-Z][A-Z][A-Z]( |\t|-|$)/ {Timestamp} /
2+
s|<ReducedConfigurationID>.*?</ReducedConfigurationID>|<ReducedConfigurationID>{Value}</ReducedConfigurationID>|
3+
s|<ParameterSetID>.*?</ParameterSetID>|<ParameterSetID>{Value}</ParameterSetID>|

‎FWCore/MessageService/test/u1.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ status=0
88
rm -f u1_errors.log u1_warnings.log u1_infos.log u1_debugs.log u1_default.log u1_job_report.mxml
99

1010
cmsRun -j u1_job_report.mxml ${SCRAM_TEST_PATH}/u1_cfg.py || exit $?
11+
edmFjrDump u1_job_report.mxml
1112

1213
for file in u1_errors.log u1_warnings.log u1_infos.log u1_debugs.log u1_default.log u1_job_report.mxml
1314
do

‎FWCore/MessageService/test/unit_test_outputs/FrameworkJobReport.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
<FrameworkJobReport>
2+
3+
<Process>
4+
<Name>TEST</Name>
5+
<ReducedConfigurationID>{Value}</ReducedConfigurationID>
6+
<ParameterSetID>{Value}</ParameterSetID>
7+
</Process>
28
<!-- -->
39
</FrameworkJobReport>

‎FWCore/MessageService/test/unit_test_outputs/job_report.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
<FrameworkJobReport>
2+
3+
<Process>
4+
<Name>TEST</Name>
5+
<ReducedConfigurationID>{Value}</ReducedConfigurationID>
6+
<ParameterSetID>{Value}</ParameterSetID>
7+
</Process>
28
<!-- -->
39
</FrameworkJobReport>

‎FWCore/MessageService/test/unit_test_outputs/u10_job_report.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
<FrameworkJobReport>
2+
3+
<Process>
4+
<Name>TEST</Name>
5+
<ReducedConfigurationID>{Value}</ReducedConfigurationID>
6+
<ParameterSetID>{Value}</ParameterSetID>
7+
</Process>
28
<!-- -->
39
</FrameworkJobReport>

‎FWCore/MessageService/test/unit_test_outputs/u14_job_report.mxml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
<FrameworkJobReport>
2+
3+
<Process>
4+
<Name>TEST</Name>
5+
<ReducedConfigurationID>{Value}</ReducedConfigurationID>
6+
<ParameterSetID>{Value}</ParameterSetID>
7+
</Process>
28
<!-- -->
39
</FrameworkJobReport>

‎FWCore/MessageService/test/unit_test_outputs/u16_job_report.mmxml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
<FrameworkJobReport>
2+
3+
<Process>
4+
<Name>TEST</Name>
5+
<ReducedConfigurationID>{Value}</ReducedConfigurationID>
6+
<ParameterSetID>{Value}</ParameterSetID>
7+
</Process>
28
<!-- -->
39
</FrameworkJobReport>

0 commit comments

Comments
 (0)