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.

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

Fix indentation in EDAlias python dump #33449

Merged
merged 1 commit into from Apr 18, 2021

Conversation

fwyzard
Copy link
Contributor

@fwyzard fwyzard commented Apr 16, 2021

PR description:

Fix the indentation of the closing parenthesis in the python dump of an EDAlias.
The change is apparent only when the EDAlias is itself indented, for example when it is embedded in a SwitchProducer.

Here is an example of the dump before the fix:

process.pixelTracks = SwitchProducerCUDA(
    cpu = cms.EDProducer("PixelTrackProducer",
        Cleaner = cms.string('pixelTrackCleanerBySharedHits'),
        Filter = cms.InputTag("pixelTrackFilterByKinematics"),
        Fitter = cms.InputTag("pixelFitterByHelixProjections"),
        SeedingHitSets = cms.InputTag("pixelTracksHitQuadruplets"),
        mightGet = cms.optional.untracked.vstring,
        passLabel = cms.string('pixelTracks')
    ),
    cuda = cms.EDAlias(
        pixelTrackFromSoA = cms.VPSet(
            cms.PSet(
                type = cms.string('recoTracks')
            ),
            cms.PSet(
                type = cms.string('recoTrackExtras')
            ),
            cms.PSet(
                type = cms.string('TrackingRecHitsOwned')
            )
        )
)
)

And here is the same after the fix:

process.pixelTracks = SwitchProducerCUDA(
    cpu = cms.EDProducer("PixelTrackProducer",
        Cleaner = cms.string('pixelTrackCleanerBySharedHits'),
        Filter = cms.InputTag("pixelTrackFilterByKinematics"),
        Fitter = cms.InputTag("pixelFitterByHelixProjections"),
        SeedingHitSets = cms.InputTag("pixelTracksHitQuadruplets"),
        mightGet = cms.optional.untracked.vstring,
        passLabel = cms.string('pixelTracks')
    ),
    cuda = cms.EDAlias(
        pixelTrackFromSoA = cms.VPSet(
            cms.PSet(
                type = cms.string('recoTracks')
            ),
            cms.PSet(
                type = cms.string('recoTrackExtras')
            ),
            cms.PSet(
                type = cms.string('TrackingRecHitsOwned')
            )
        )
    )
)

PR validation:

None.

@fwyzard
Copy link
Contributor Author

fwyzard commented Apr 16, 2021

please test

@fwyzard
Copy link
Contributor Author

fwyzard commented Apr 16, 2021

type bugfix

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33449/22137

  • This PR adds an extra 24KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @fwyzard (Andrea Bocci) for master.

It involves the following packages:

FWCore/ParameterSet

@makortel, @smuzaffar, @Dr15Jones can you please review it and eventually sign? Thanks.
@makortel, @wddgit this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

-1

Failed Tests: UnitTests
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-6407a9/14269/summary.html
COMMIT: d39c484
CMSSW: CMSSW_12_0_X_2021-04-15-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/33449/14269/install.sh to create a dev area with all the needed externals and cmssw changes.

Unit Tests

I found errors in the following unit tests:

---> test TestFWCoreParameterSetDriver had ERRORS

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 7 differences found in the comparisons
  • DQMHistoTests: Total files compared: 38
  • DQMHistoTests: Total histograms compared: 2864426
  • DQMHistoTests: Total failures: 12
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 2864391
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.004 KiB( 37 files compared)
  • DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
  • Checked 160 log files, 37 edm output root files, 38 DQM output files
  • TriggerResults: no differences found

@fwyzard
Copy link
Contributor Author

fwyzard commented Apr 16, 2021

please test

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33449/22153

  • This PR adds an extra 32KB to repository

@cmsbuild
Copy link
Contributor

Pull request #33449 was updated. @makortel, @smuzaffar, @Dr15Jones can you please check and sign again.

@fwyzard
Copy link
Contributor Author

fwyzard commented Apr 17, 2021

please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-6407a9/14297/summary.html
COMMIT: 46f36ec
CMSSW: CMSSW_12_0_X_2021-04-16-2300/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/33449/14297/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 38
  • DQMHistoTests: Total histograms compared: 2877046
  • DQMHistoTests: Total failures: 7
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2877017
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 37 files compared)
  • Checked 160 log files, 37 edm output root files, 38 DQM output files
  • TriggerResults: no differences found

@makortel
Copy link
Contributor

+1

Thanks!

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @silviodonato, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

@qliphy
Copy link
Contributor

qliphy commented Apr 18, 2021

+1

@cmsbuild cmsbuild merged commit efc2bf8 into cms-sw:master Apr 18, 2021
@fwyzard fwyzard deleted the Fix_EDAlias_indentation branch August 18, 2021 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants