sweep of various EventLoop updates from main back into 21.2
The main thing we want here are the grid driver updates, but I figured it is easier/better to sweep everything that has been done so that I don't have to deal with merge conflicts. I left out one or two MRs that relied on code only present in main, and had to disable one newly introduced test for an experimental feature as it was having issues, and remove the new TEfficiency
code for AthAnalysis.
Please note: Since this is a sweep aimed at making both branches consistent again, please restrict the review to things that really need to be fixed. Coding improvements ought to go into main and then be swept again.
List of commits swept:
Merge request reports
Activity
This merge request affects 10 packages:
- Control/AthToolSupport/AsgTools
- Control/AthenaBaseComps
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoop
- PhysicsAnalysis/D3PDTools/EventLoopAlgs
- PhysicsAnalysis/D3PDTools/EventLoopGrid
- PhysicsAnalysis/D3PDTools/EventLoopTest
- PhysicsAnalysis/D3PDTools/MultiDraw
- PhysicsAnalysis/D3PDTools/RootCoreUtils
- PhysicsAnalysis/D3PDTools/SampleHandler
Affected files list will not be printed in this case
Adding @gemmeren ,@maszyman ,@krumnack ,@ssnyder as watchers
added 21.2 Analysis Core analysis-review-required review-pending-level-1 labels
This merge request affects 10 packages:
- Control/AthToolSupport/AsgTools
- Control/AthenaBaseComps
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoop
- PhysicsAnalysis/D3PDTools/EventLoopAlgs
- PhysicsAnalysis/D3PDTools/EventLoopGrid
- PhysicsAnalysis/D3PDTools/EventLoopTest
- PhysicsAnalysis/D3PDTools/MultiDraw
- PhysicsAnalysis/D3PDTools/RootCoreUtils
- PhysicsAnalysis/D3PDTools/SampleHandler
Affected files list will not be printed in this case
Adding @gemmeren ,@maszyman ,@krumnack ,@ssnyder as watchers
CI Result FAILURE (hash 62ca3e06)AthDerivation externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
AthDerivation: number of compilation errors 1, warnings 59
For experts only: Jenkins output [CI-MERGE-REQUEST-GCC62-CC7 2304] CI Result FAILURE (hash 62ca3e06)AnalysisBase AthAnalysis externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 1, warnings 240
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 78218]added review-user-action-required label and removed review-pending-level-1 label
added 16 commits
- 62ca3e06...da699800 - 6 earlier commits
- 6e415934 - Update to batch driver to use CMAKE env variables
- ce73a420 - provide a default bevavior if GridWorker is run on unknown datasets
- d7ed9ef7 - allow enabling EventLoop grid error reporting outside of GridDriver/PrunDriver
- 2be01902 - resolve cppcheck defects; strange use of unique_ptr
- c68ce92d - remove GridDriver from release
- e8b1de42 - switch DuplicateChecker always to use unique submitDir
- ab7477c9 - fix to the fix of the DuplicateChecker
- 24564f36 - separate out input file handling into separate modules
- 830ad53a - ensure the leak-check test always uses a unique directory
- f76fe819 - emergency fix for the errors introduced by DirectInputModule
Toggle commit listThis merge request affects 9 packages:
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoop
- PhysicsAnalysis/D3PDTools/EventLoopAlgs
- PhysicsAnalysis/D3PDTools/EventLoopGrid
- PhysicsAnalysis/D3PDTools/EventLoopTest
- PhysicsAnalysis/D3PDTools/MultiDraw
- PhysicsAnalysis/D3PDTools/RootCoreUtils
- PhysicsAnalysis/D3PDTools/SampleHandler
Affected files list will not be printed in this case
added review-pending-level-1 label and removed review-user-action-required label
This merge request affects 9 packages:
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoop
- PhysicsAnalysis/D3PDTools/EventLoopAlgs
- PhysicsAnalysis/D3PDTools/EventLoopGrid
- PhysicsAnalysis/D3PDTools/EventLoopTest
- PhysicsAnalysis/D3PDTools/MultiDraw
- PhysicsAnalysis/D3PDTools/RootCoreUtils
- PhysicsAnalysis/D3PDTools/SampleHandler
Affected files list will not be printed in this case
mentioned in merge request !61525 (merged)
mentioned in merge request !60987 (merged)
CI Result FAILURE (hash f76fe819)AthDerivation externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
AthDerivation: number of compilation errors 1, warnings 59
For experts only: Jenkins output [CI-MERGE-REQUEST-GCC62-CC7 2305] CI Result SUCCESS (hash f76fe819)AnalysisBase AthAnalysis externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 78240]added 27 commits
- f76fe819...818e8eb7 - 17 earlier commits
- 4fe8fec5 - Update to batch driver to use CMAKE env variables
- fe7e6362 - provide a default bevavior if GridWorker is run on unknown datasets
- e1ef5b8a - allow enabling EventLoop grid error reporting outside of GridDriver/PrunDriver
- 3551b8a1 - resolve cppcheck defects; strange use of unique_ptr
- 283920d7 - remove GridDriver from release
- 3360b4d3 - switch DuplicateChecker always to use unique submitDir
- f0da53f3 - fix to the fix of the DuplicateChecker
- 7acfe1bd - separate out input file handling into separate modules
- 5ab4d1dc - ensure the leak-check test always uses a unique directory
- c133e5e5 - emergency fix for the errors introduced by DirectInputModule
Toggle commit listThis merge request affects 9 packages:
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoop
- PhysicsAnalysis/D3PDTools/EventLoopAlgs
- PhysicsAnalysis/D3PDTools/EventLoopGrid
- PhysicsAnalysis/D3PDTools/EventLoopTest
- PhysicsAnalysis/D3PDTools/MultiDraw
- PhysicsAnalysis/D3PDTools/RootCoreUtils
- PhysicsAnalysis/D3PDTools/SampleHandler
Affected files list will not be printed in this case
This merge request affects 9 packages:
- Control/AthToolSupport/AsgTools
- PhysicsAnalysis/D3PDTools/AnaAlgorithm
- PhysicsAnalysis/D3PDTools/EventLoop
- PhysicsAnalysis/D3PDTools/EventLoopAlgs
- PhysicsAnalysis/D3PDTools/EventLoopGrid
- PhysicsAnalysis/D3PDTools/EventLoopTest
- PhysicsAnalysis/D3PDTools/MultiDraw
- PhysicsAnalysis/D3PDTools/RootCoreUtils
- PhysicsAnalysis/D3PDTools/SampleHandler
Affected files list will not be printed in this case
CI Result SUCCESS (hash c133e5e5)AnalysisBase AthAnalysis externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
AnalysisBase: number of compilation errors 0, warnings 1
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 78248] CI Result SUCCESS (hash c133e5e5)AthDerivation externals cmake make tests Full details available on this CI monitor view. Check the JIRA CI status board for known problems
AthDerivation: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-GCC62-CC7 2306]added review-approved label and removed review-pending-level-1 label
added analysis-review-approved label and removed analysis-review-required label
mentioned in commit ceefaac5
added sweep:ignore label