Merging CMSSW_16_1 into CMSSW_16_1_EVOLUTION_X #49910
Merged
+227
−369
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ew of depreciation of several Phase2 scenarios
These provide class forwarding support for classes which will move to a new namespace but have a using directive allowing the use of the old name.
If forward declaration still needed, include approprate Fwd file.
Add additional forwarding files for DataFormats
Run the ONNX test on GPU only if CUDA is available
Phase2-hgx364Y2a Update several test scripts in Validation/HGCalValidation/script in view of depreciation of several Phase2 scenarios
Speeded up the initial read of EventAuxiliary field for a file with 2.5M tiny events from 6.6 hours to about a second.
Set `rntupleStreamerMode` attribute for all remaining `PortableHost*` data products
Speed up reading `*Auxiliary` fields in RNTupleTempSource
Contributor
|
cms-bot internal usage |
Contributor
|
please test as this PR is just to resolve the merge conflicts so I will merge it once there are no build issues |
Contributor
|
type evo |
Contributor
|
-code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-49910/47651
Code check has found code style and quality issues which could be resolved by applying following patch(s)
|
Contributor
Author
|
@smuzaffar do you want me to apply the code change? The change is NOT in one of the files that had the merge conflict so it would be creating a difference between CMSSW_16_X and CMSSW_16_EVOLUTION_X. |
Contributor
|
@Dr15Jones , looks like the new line in the file with code format issue was added in the merge conflicts commit (c2280d8), so I would suggest to fix it. |
Dr15Jones
force-pushed
the
CMSSW_16_1_EVOLUTION_X
branch
from
c2280d8 to
922b18e
Compare
cmsbuild
added
tests-pending
code-checks-pending
and removed
tests-started
code-checks-rejected
labels
Contributor
|
+code-checks Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-49910/47655
|
Contributor
|
please build |
Contributor
|
A new Pull Request was created by @Dr15Jones for CMSSW_16_1_EVOLUTION_X. It involves the following packages:
@Alejandro1400, @Dr15Jones, @JanChyczynski, @Martin-Grunewald, @Moanwar, @alja, @arunhep, @atpathak, @battibass, @civanch, @cmsbuild, @ctarricone, @ftorrresd, @fwyzard, @gabrielmscampos, @hjkwon260, @jfernan2, @kpedro88, @makortel, @mandrenguyen, @mdhildreth, @mmusich, @nothingface0, @perrotta, @rseidita, @smuzaffar, @srimanob, @tvami, @valsdav, @y19y19 can you please review it and eventually sign? Thanks. cms-bot commands are listed here |
Contributor
Contributor
|
looks good. I am merging it as this is just to resolve the merge conflicts for the forward porting from master to EVO branch |
smuzaffar
merged commit 924422d
into
cms-sw:CMSSW_16_1_EVOLUTION_X
4 of 5 checks passed
Contributor
|
+core (just as a formality) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR description:
Updated EVOLUTION_X to include recent changes to CMSSW_16_1_X branch. This required dealing with merge conflicts.
PR validation: