From 33736e9b407f41a3fcbdbe10d1c2a4691b3b718c Mon Sep 17 00:00:00 2001 From: Alejandro Sanchez Date: Thu, 17 Feb 2022 16:43:50 +0100 Subject: [PATCH] replace gpuValidation modifier with modifier chain and create ECAL specific modifier --- .../ProcessModifiers/python/gpuValidationEcal_cff.py | 5 +++++ .../ProcessModifiers/python/gpuValidation_cff.py | 10 ++++++++-- DQM/EcalMonitorTasks/python/EcalMonitorTask_cff.py | 8 ++++---- 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 Configuration/ProcessModifiers/python/gpuValidationEcal_cff.py diff --git a/Configuration/ProcessModifiers/python/gpuValidationEcal_cff.py b/Configuration/ProcessModifiers/python/gpuValidationEcal_cff.py new file mode 100644 index 0000000000000..dfe5aeed6e52a --- /dev/null +++ b/Configuration/ProcessModifiers/python/gpuValidationEcal_cff.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +# This modifier is for turning on gpu validation modules for ECAL DQM + +gpuValidationEcal = cms.Modifier() diff --git a/Configuration/ProcessModifiers/python/gpuValidation_cff.py b/Configuration/ProcessModifiers/python/gpuValidation_cff.py index c28dc68a5dcb3..2d3e42af5dea8 100644 --- a/Configuration/ProcessModifiers/python/gpuValidation_cff.py +++ b/Configuration/ProcessModifiers/python/gpuValidation_cff.py @@ -1,5 +1,11 @@ import FWCore.ParameterSet.Config as cms -# This modifier is for turning on gpu validation DQM modules +from Configuration.ProcessModifiers.gpu_cff import * +from Configuration.ProcessModifiers.gpuValidationEcal_cff import * -gpuValidation = cms.Modifier() +# This modifier chain is for turning on DQM modules used for gpu validation + +gpuValidation = cms.ModifierChain( + gpu, + gpuValidationEcal +) diff --git a/DQM/EcalMonitorTasks/python/EcalMonitorTask_cff.py b/DQM/EcalMonitorTasks/python/EcalMonitorTask_cff.py index a061d35dfdf3f..51689e7a8dfa1 100644 --- a/DQM/EcalMonitorTasks/python/EcalMonitorTask_cff.py +++ b/DQM/EcalMonitorTasks/python/EcalMonitorTask_cff.py @@ -3,9 +3,9 @@ from DQM.EcalMonitorTasks.EcalMonitorTask_cfi import * # Customization to run the CPU vs GPU comparison task if the job runs on a GPU enabled machine -from Configuration.ProcessModifiers.gpuValidation_cff import gpuValidation +from Configuration.ProcessModifiers.gpuValidationEcal_cff import gpuValidationEcal from DQM.EcalMonitorTasks.GpuTask_cfi import ecalGpuTask -gpuValidation.toModify(ecalGpuTask.params, runGpuTask = cms.untracked.bool(True)) -gpuValidation.toModify(ecalMonitorTask.workers, func = lambda workers: workers.append("GpuTask")) -gpuValidation.toModify(ecalMonitorTask, workerParameters = dict(GpuTask = ecalGpuTask)) +gpuValidationEcal.toModify(ecalGpuTask.params, runGpuTask = cms.untracked.bool(True)) +gpuValidationEcal.toModify(ecalMonitorTask.workers, func = lambda workers: workers.append("GpuTask")) +gpuValidationEcal.toModify(ecalMonitorTask, workerParameters = dict(GpuTask = ecalGpuTask))