Skip to content

ECAL GPU vs. CPU validation configuration changes #49965

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

Open
thomreis wants to merge 4 commits into
base: master
Choose a base branch
from
+69 −9
Open

ECAL GPU vs. CPU validation configuration changes #49965

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8952297
Change HLT GPUvsCPU ECAL DQM plot directory to HLT/HeterogeneousCompa…
thomreis Jan 28, 2026
b58036b
Change alpakaValidationEcal behaviour to validate Alpaka serial vs. A…
thomreis Jan 28, 2026
09ff21c
Fix failing test and add function to change paths.
thomreis Jan 30, 2026
98e461d
Fix path.
thomreis Jan 30, 2026
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
4 changes: 4 additions & 0 deletions DQM/EcalMonitorTasks/python/EcalMonitorTask_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
alpakaValidationEcal.toModify(ecalGpuTask.params, runGpuTask = True)
alpakaValidationEcal.toModify(ecalMonitorTask.workers, func = lambda workers: workers.append("GpuTask"))
alpakaValidationEcal.toModify(ecalMonitorTask, workerParameters = dict(GpuTask = ecalGpuTask))
alpakaValidationEcal.toModify(ecalDQMCollectionTags, EBCpuDigi = "ecalDigisSerialSync:ebDigis")
alpakaValidationEcal.toModify(ecalDQMCollectionTags, EECpuDigi = "ecalDigisSerialSync:eeDigis")
alpakaValidationEcal.toModify(ecalDQMCollectionTags, EBCpuUncalibRecHit = "ecalMultiFitUncalibRecHitSerialSync:EcalUncalibRecHitsEB")
alpakaValidationEcal.toModify(ecalDQMCollectionTags, EECpuUncalibRecHit = "ecalMultiFitUncalibRecHitSerialSync:EcalUncalibRecHitsEE")

# Skip consuming and running over the EcalRawData collection for all GPU WFs
# This is to be used as long as the GPU unpacker unpacks a dummy EcalRawData collection
Expand Down
48 changes: 48 additions & 0 deletions DQMOffline/Trigger/python/HeterogeneousMonitoring_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,58 @@
from DQM.EcalMonitorTasks.EcalMonitorTask_cfi import *
from DQM.EcalMonitorTasks.ecalGpuTask_cfi import ecalGpuTask as _ecalGpuTask

_hltdir = 'HLT/HeterogeneousComparison/'

hltEcalGpuTask = _ecalGpuTask.clone(
params = _ecalGpuTask.params.clone(
runGpuTask = True,
enableRecHit = False
),
MEs = _ecalGpuTask.MEs.clone(
DigiCpu = _ecalGpuTask.MEs.DigiCpu.clone(path = _hltdir + '%(subdet)s/Digis/%(prefix)sGT digi nDigis cpu'),
DigiCpuAmplitude = _ecalGpuTask.MEs.DigiCpuAmplitude.clone(path = _hltdir + '%(subdet)s/Digis/%(prefix)sGT digi amplitude sample %(sample)s cpu'),
DigiGpu = _ecalGpuTask.MEs.DigiGpu.clone(path = _hltdir + '%(subdet)s/Digis/%(prefix)sGT digi nDigis gpu'),
DigiGpuAmplitude = _ecalGpuTask.MEs.DigiGpuAmplitude.clone(path = _hltdir + '%(subdet)s/Digis/%(prefix)sGT digi amplitude sample %(sample)s gpu'),
DigiGpuCpu = _ecalGpuTask.MEs.DigiGpuCpu.clone(path = _hltdir + '%(subdet)s/Digis/%(prefix)sGT digi nDigis gpu-cpu diff'),
DigiGpuCpuAmplitude = _ecalGpuTask.MEs.DigiGpuCpuAmplitude.clone(path = _hltdir + '%(subdet)s/Digis/%(prefix)sGT digi amplitude sample %(sample)s gpu-cpu diff'),
Digi2D = _ecalGpuTask.MEs.Digi2D.clone(path = _hltdir + '%(subdet)s/Digis/%(prefix)sGT digi nDigis gpu-cpu map2D'),
Digi2DAmplitude = _ecalGpuTask.MEs.Digi2DAmplitude.clone(path = _hltdir + '%(subdet)s/Digis/%(prefix)sGT digi amplitude sample %(sample)s gpu-cpu map2D'),
UncalibCpu = _ecalGpuTask.MEs.UncalibCpu.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit nHits cpu'),
UncalibCpuAmp = _ecalGpuTask.MEs.UncalibCpuAmp.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit amplitude cpu'),
UncalibCpuAmpError = _ecalGpuTask.MEs.UncalibCpuAmpError.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit amplitudeError cpu'),
UncalibCpuPedestal = _ecalGpuTask.MEs.UncalibCpuPedestal.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit pedestal cpu'),
UncalibCpuJitter = _ecalGpuTask.MEs.UncalibCpuJitter.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit jitter cpu'),
UncalibCpuJitterError = _ecalGpuTask.MEs.UncalibCpuJitterError.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit jitterError cpu'),
UncalibCpuChi2 = _ecalGpuTask.MEs.UncalibCpuChi2.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit chi2 cpu'),
UncalibCpuOOTAmp = _ecalGpuTask.MEs.UncalibCpuOOTAmp.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit OOT amplitude %(OOTAmp)s cpu'),
UncalibCpuFlags = _ecalGpuTask.MEs.UncalibCpuFlags.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit flags cpu'),
UncalibGpu = _ecalGpuTask.MEs.UncalibGpu.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit nHits gpu'),
UncalibGpuAmp = _ecalGpuTask.MEs.UncalibGpuAmp.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit amplitude gpu'),
UncalibGpuAmpError = _ecalGpuTask.MEs.UncalibGpuAmpError.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit amplitudeError gpu'),
UncalibGpuPedestal = _ecalGpuTask.MEs.UncalibGpuPedestal.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit pedestal gpu'),
UncalibGpuJitter = _ecalGpuTask.MEs.UncalibGpuJitter.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit jitter gpu'),
UncalibGpuJitterError = _ecalGpuTask.MEs.UncalibGpuJitterError.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit jitterError gpu'),
UncalibGpuChi2 = _ecalGpuTask.MEs.UncalibGpuChi2.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit chi2 gpu'),
UncalibGpuOOTAmp = _ecalGpuTask.MEs.UncalibGpuOOTAmp.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit OOT amplitude %(OOTAmp)s gpu'),
UncalibGpuFlags = _ecalGpuTask.MEs.UncalibGpuFlags.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit flags gpu'),
UncalibGpuCpu = _ecalGpuTask.MEs.UncalibGpuCpu.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit nHits gpu-cpu diff'),
UncalibGpuCpuAmp = _ecalGpuTask.MEs.UncalibGpuCpuAmp.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit amplitude gpu-cpu diff'),
UncalibGpuCpuAmpError = _ecalGpuTask.MEs.UncalibGpuCpuAmpError.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit amplitudeError gpu-cpu diff'),
UncalibGpuCpuPedestal = _ecalGpuTask.MEs.UncalibGpuCpuPedestal.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit pedestal gpu-cpu diff'),
UncalibGpuCpuJitter = _ecalGpuTask.MEs.UncalibGpuCpuJitter.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit jitter gpu-cpu diff'),
UncalibGpuCpuJitterError = _ecalGpuTask.MEs.UncalibGpuCpuJitterError.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit jitterError gpu-cpu diff'),
UncalibGpuCpuChi2 = _ecalGpuTask.MEs.UncalibGpuCpuChi2.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit chi2 gpu-cpu diff'),
UncalibGpuCpuOOTAmp = _ecalGpuTask.MEs.UncalibGpuCpuOOTAmp.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit OOT amplitude %(OOTAmp)s gpu-cpu diff'),
UncalibGpuCpuFlags = _ecalGpuTask.MEs.UncalibGpuCpuFlags.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit flags gpu-cpu diff'),
Uncalib2D = _ecalGpuTask.MEs.Uncalib2D.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit nHits gpu-cpu map2D'),
Uncalib2DAmp = _ecalGpuTask.MEs.Uncalib2DAmp.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit amplitude gpu-cpu map2D'),
Uncalib2DAmpError = _ecalGpuTask.MEs.Uncalib2DAmpError.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit amplitudeError gpu-cpu map2D'),
Uncalib2DPedestal = _ecalGpuTask.MEs.Uncalib2DPedestal.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit pedestal gpu-cpu map2D'),
Uncalib2DJitter = _ecalGpuTask.MEs.Uncalib2DJitter.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit jitter gpu-cpu map2D'),
Uncalib2DJitterError = _ecalGpuTask.MEs.Uncalib2DJitterError.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit jitterError gpu-cpu map2D'),
Uncalib2DChi2 = _ecalGpuTask.MEs.Uncalib2DChi2.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit chi2 gpu-cpu map2D'),
Uncalib2DOOTAmp = _ecalGpuTask.MEs.Uncalib2DOOTAmp.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit OOT amplitude %(OOTAmp)s gpu-cpu map2D'),
Uncalib2DFlags = _ecalGpuTask.MEs.Uncalib2DFlags.clone(path = _hltdir + '%(subdet)s/UncalibRecHits/%(prefix)sGT uncalib rec hit flags gpu-cpu map2D')
Copy link
Contributor

@mmusich mmusich Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what if new plots are added in the cloned PSet? Should this be made automatic?

Copy link
Contributor Author

@thomreis thomreis Jan 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If new plots are added they will be going to the default path. But since all variables of the data formats are covered already I do not see why new plots should be added.

But if you have a suggestion to make the changes automatic (add _hltdir and remove %(prefix)sGpuTask/) that would surely be an improvement.

Copy link
Contributor

@mmusich mmusich Jan 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to work:

_hltdir = 'HLT/HeterogeneousComparison/'
_remove = '%(prefix)sGpuTask/'

def cloneMEsWithPathFix(srcMEs, prefix):
    clones = {}
    for name, me in srcMEs.parameters_().items():
        if hasattr(me, 'path'):
            old = me.path.value()
            # remove the unwanted component if present                                                                                                                                                      
            new = old.replace(_remove, '')
            # prepend the HLT directory if not already there                                                                                                                                                
            new = prefix + new
            clones[name] = me.clone(path = new)
        else:
            clones[name] = me.clone()
    return clones

hltEcalGpuTask = _ecalGpuTask.clone(
    params = _ecalGpuTask.params.clone(
        runGpuTask = True,
        enableRecHit = False
    ),
    MEs = cloneMEsWithPathFix(_ecalGpuTask.MEs, _hltdir)
)

By the way I noticed that in your earlier implementation the ones that start with RecHit2DChi2 are not touched. Is it done purposefully?

Copy link
Contributor Author

@thomreis thomreis Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks I'll put that in.
I did not change the RecHit monitoring paths because they are switched off with enableRecHit = False.

)
)

Expand Down
18 changes: 15 additions & 3 deletions EventFilter/EcalRawToDigi/python/ecalDigis_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,21 @@

alpaka.toReplaceWith(ecalDigisTask, ecalDigisTask_alpaka)

# for alpaka validation compare the legacy CPU module with the alpaka module
from Configuration.ProcessModifiers.alpakaValidationEcal_cff import alpakaValidationEcal
# for GPU validation compare the legacy CPU module with the alpaka module
from Configuration.ProcessModifiers.gpuValidationEcal_cff import gpuValidationEcal
_ecalDigisTaskValidation = ecalDigisTask_alpaka.copy()
_ecalDigisTaskValidation.add(ecalDigisLegacy)
alpakaValidationEcal.toReplaceWith(ecalDigisTask, _ecalDigisTaskValidation)
gpuValidationEcal.toReplaceWith(ecalDigisTask, _ecalDigisTaskValidation)

# for alpaka validation compare alpaka serial with alpaka
from Configuration.ProcessModifiers.alpakaValidationEcal_cff import alpakaValidationEcal
from HeterogeneousCore.AlpakaCore.functions import makeSerialClone
ecalDigisPortableSerialSync = makeSerialClone(ecalDigisPortable)
ecalDigisSerialSync = _ecalDigisFromPortable.clone(
digisInLabelEB = 'ecalDigisPortableSerialSync:ebDigis',
digisInLabelEE = 'ecalDigisPortableSerialSync:eeDigis'
)
_ecalDigisTaskValidation = ecalDigisTask_alpaka.copy()
_ecalDigisTaskValidation.add(ecalDigisPortableSerialSync)
_ecalDigisTaskValidation.add(ecalDigisSerialSync)
alpakaValidationEcal.toReplaceWith(ecalDigisTask, _ecalDigisTaskValidation)
17 changes: 15 additions & 2 deletions RecoLocalCalo/EcalRecProducers/python/ecalMultiFitUncalibRecHit_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,21 @@
ecalMultiFitUncalibRecHit,
))

# for alpaka validation compare the legacy CPU module with the alpaka module
from Configuration.ProcessModifiers.alpakaValidationEcal_cff import alpakaValidationEcal
# for GPU validation compare the legacy CPU module with the alpaka module
from Configuration.ProcessModifiers.gpuValidationEcal_cff import gpuValidationEcal
_ecalMultiFitUncalibRecHitTaskValidation = ecalMultiFitUncalibRecHitTask.copy()
_ecalMultiFitUncalibRecHitTaskValidation.add(ecalMultiFitUncalibRecHitLegacy)
gpuValidationEcal.toReplaceWith(ecalMultiFitUncalibRecHitTask, _ecalMultiFitUncalibRecHitTaskValidation)

# for alpaka validation compare alpaka serial with alpaka
from Configuration.ProcessModifiers.alpakaValidationEcal_cff import alpakaValidationEcal
from HeterogeneousCore.AlpakaCore.functions import makeSerialClone
ecalMultiFitUncalibRecHitPortableSerialSync = makeSerialClone(ecalMultiFitUncalibRecHitPortable)
ecalMultiFitUncalibRecHitSerialSync = ecalMultiFitUncalibRecHit.clone(
inputCollectionEB = 'ecalMultiFitUncalibRecHitPortableSerialSync:EcalUncalibRecHitsEB',
inputCollectionEE = 'ecalMultiFitUncalibRecHitPortableSerialSync:EcalUncalibRecHitsEE'
)
_ecalMultiFitUncalibRecHitTaskValidation = ecalMultiFitUncalibRecHitTask.copy()
_ecalMultiFitUncalibRecHitTaskValidation.add(ecalMultiFitUncalibRecHitPortableSerialSync)
_ecalMultiFitUncalibRecHitTaskValidation.add(ecalMultiFitUncalibRecHitSerialSync)
alpakaValidationEcal.toReplaceWith(ecalMultiFitUncalibRecHitTask, _ecalMultiFitUncalibRecHitTaskValidation)
17 changes: 15 additions & 2 deletions RecoLocalCalo/EcalRecProducers/python/ecalRecHit_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,23 @@
ecalRecHit,
))

# for alpaka validation compare the legacy CPU module with the alpaka module
from Configuration.ProcessModifiers.alpakaValidationEcal_cff import alpakaValidationEcal
# for gpu validation compare the legacy CPU module with the alpaka module
from Configuration.ProcessModifiers.gpuValidationEcal_cff import gpuValidationEcal
_ecalCalibratedRecHitTaskValidation = ecalCalibratedRecHitTask.copy()
_ecalCalibratedRecHitTaskValidation.add()
gpuValidationEcal.toReplaceWith(ecalCalibratedRecHitTask, _ecalCalibratedRecHitTaskValidation)

# for alpaka validation compare alpaka serial with alpaka
from Configuration.ProcessModifiers.alpakaValidationEcal_cff import alpakaValidationEcal
from HeterogeneousCore.AlpakaCore.functions import makeSerialClone
ecalRecHitPortableSerialSync = makeSerialClone(ecalRecHitPortable)
ecalRecHitSerialSync = _ecalRecHitSoAToLegacy.clone(
inputCollectionEB = 'ecalRecHitPortableSerialSync:EcalRecHitsEB',
inputCollectionEE = 'ecalRecHitPortableSerialSync:EcalRecHitsEE',
)
_ecalCalibratedRecHitTaskValidation = ecalCalibratedRecHitTask.copy()
_ecalCalibratedRecHitTaskValidation.add(ecalRecHitPortableSerialSync)
_ecalCalibratedRecHitTaskValidation.add(ecalRecHitSerialSync)
alpakaValidationEcal.toReplaceWith(ecalCalibratedRecHitTask, _ecalCalibratedRecHitTaskValidation)

from Configuration.Eras.Modifier_phase2_ecal_devel_cff import phase2_ecal_devel
Expand Down