Remove the configuration of the legacy CUDA workflows

CalibTracker/Configuration/python/Reconstruction_cff.py

@@ -7,7 +7,7 @@
 from RecoLocalTracker.SiStripZeroSuppression.SiStripZeroSuppression_cfi import *
 from RecoLocalTracker.SiStripClusterizer.SiStripClusterizer_cfi import *
 recolocal = cms.Sequence(siPixelDigis + siPixelClustersPreSplitting + siStripDigis + siStripZeroSuppression + siStripClusters)
-siPixelDigis.cpu.InputLabel = 'rawDataCollector'
+siPixelDigis.InputLabel = 'rawDataCollector'
 
 # tracking
 from RecoVertex.BeamSpotProducer.BeamSpot_cff import *

Calibration/LumiAlCaRecoProducers/python/ALCARECOLumiPixels_cff.py

@@ -9,12 +9,12 @@
 )
 
 from EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi import siPixelDigis
-siPixelDigisForLumi = siPixelDigis.cpu.clone(
+siPixelDigisForLumi = siPixelDigis.clone(
     InputLabel = "hltFEDSelectorLumiPixels"
 )
 
 from RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizerPreSplitting_cfi import siPixelClustersPreSplitting
-siPixelClustersForLumi = siPixelClustersPreSplitting.cpu.clone(
+siPixelClustersForLumi = siPixelClustersPreSplitting.clone(
     src = "siPixelDigisForLumi"
 )
 

Configuration/StandardSequences/python/RawToDigi_Repacked_cff.py

@@ -2,7 +2,6 @@
 
 from Configuration.StandardSequences.RawToDigi_cff import *
 
-from Configuration.ProcessModifiers.gpu_cff import gpu
 from Configuration.ProcessModifiers.alpaka_cff import alpaka
 
 scalersRawToDigi.scalersInputTag = 'rawDataRepacker'
@@ -11,11 +10,10 @@
 gctDigis.inputLabel = 'rawDataRepacker'
 gtDigis.DaqGtInputTag = 'rawDataRepacker'
 gtEvmDigis.EvmGtInputTag = 'rawDataRepacker'
-siPixelDigis.cpu.InputLabel = 'rawDataRepacker'
+siPixelDigis.InputLabel = 'rawDataRepacker'
 siStripDigis.ProductLabel = 'rawDataRepacker'
-ecalDigisCPU.InputLabel = 'rawDataRepacker'
-gpu.toModify(ecalDigisGPU, InputLabel = 'rawDataRepacker')
-alpaka.toModify(ecalDigisPortable, InputLabel = 'rawDataRepacker')
+ecalDigis.InputLabel = 'rawDataRepacker'
+ecalDigisPortable.InputLabel = 'rawDataRepacker'
 ecalPreshowerDigis.sourceTag = 'rawDataRepacker'
 hcalDigis.InputLabel = 'rawDataRepacker'
 muonCSCDigis.InputObjects = 'rawDataRepacker'

Configuration/StandardSequences/python/RawToDigi_cff.py

@@ -1,5 +1,4 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.ProcessModifiers.gpu_cff import gpu
 
 # This object is used to selectively make changes for different running
 # scenarios. In this case it makes changes for Run 2.
@@ -73,14 +72,12 @@
 RawToDigiTask_hcalOnly = cms.Task(hcalDigis)
 RawToDigi_hcalOnly = cms.Sequence(RawToDigiTask_hcalOnly)
 
-from Configuration.ProcessModifiers.gpu_cff import gpu
 from Configuration.ProcessModifiers.alpaka_cff import alpaka
 
 scalersRawToDigi.scalersInputTag = 'rawDataCollector'
-siPixelDigis.cpu.InputLabel = 'rawDataCollector'
-ecalDigisCPU.InputLabel = 'rawDataCollector'
-gpu.toModify(ecalDigisGPU, InputLabel = 'rawDataCollector')
-alpaka.toModify(ecalDigisPortable, InputLabel = 'rawDataCollector')
+siPixelDigis.InputLabel = 'rawDataCollector'
+ecalDigis.InputLabel = 'rawDataCollector'
+ecalDigisPortable.InputLabel = 'rawDataCollector'
 ecalPreshowerDigis.sourceTag = 'rawDataCollector'
 hcalDigis.InputLabel = 'rawDataCollector'
 muonCSCDigis.InputObjects = 'rawDataCollector'

Configuration/StandardSequences/python/Services_cff.py

@@ -9,15 +9,14 @@
 from DQMServices.Core.DQMStore_cfi import *
 
 # load ProcessAccelerators (that set the e.g. the necessary CUDA
-# stuff) when the "gpu" or "pixelNtupletFit" modifiers are enabled
+# stuff) when the "pixelNtupletFit" or "alpaka" modifiers are enabled
 def _addProcessAccelerators(process):
     process.load("Configuration.StandardSequences.Accelerators_cff")
 
-from Configuration.ProcessModifiers.gpu_cff import gpu
 from Configuration.ProcessModifiers.pixelNtupletFit_cff import pixelNtupletFit
 from Configuration.ProcessModifiers.alpaka_cff import alpaka
 
-modifyConfigurationStandardSequencesServicesAddProcessAccelerators_ = (gpu | pixelNtupletFit | alpaka).makeProcessModifier(_addProcessAccelerators)
+modifyConfigurationStandardSequencesServicesAddProcessAccelerators_ = (pixelNtupletFit | alpaka).makeProcessModifier(_addProcessAccelerators)
 
 # load TritonService when SONIC workflow is enabled
 def _addTritonService(process):

Configuration/StandardSequences/python/SimL1EmulatorRepack_GCTGT_cff.py

@@ -26,14 +26,12 @@
 ## run the L1 emulator
 ##
 
-from Configuration.ProcessModifiers.gpu_cff import gpu
 from Configuration.ProcessModifiers.alpaka_cff import alpaka
 
 from L1Trigger.L1TCalorimeter.L1TCaloStage1_PPFromRaw_cff import *
-from EventFilter.EcalRawToDigi.ecalDigis_cff import ecalDigisCPU, ecalDigisGPU, ecalDigisPortable
-ecalDigisCPU.InputLabel = cms.InputTag('rawDataCollector', processName=cms.InputTag.skipCurrentProcess())
-gpu.toModify(ecalDigisGPU, InputLabel = cms.InputTag('rawDataCollector', processName=cms.InputTag.skipCurrentProcess()))
-alpaka.toModify(ecalDigisPortable, InputLabel = cms.InputTag('rawDataCollector', processName=cms.InputTag.skipCurrentProcess()))
+from EventFilter.EcalRawToDigi.ecalDigis_cff import ecalDigis, ecalDigisPortable
+ecalDigis.InputLabel = cms.InputTag('rawDataCollector', processName=cms.InputTag.skipCurrentProcess())
+ecalDigisPortable.InputLabel = cms.InputTag('rawDataCollector', processName=cms.InputTag.skipCurrentProcess())
 hcalDigis.InputLabel = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess())
 simHcalTriggerPrimitiveDigis.InputTagFEDRaw = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess())
 

DQM/EcalMonitorTasks/python/EcalMonitorTask_cff.py

@@ -1,16 +1,3 @@
 import FWCore.ParameterSet.Config as cms
 
 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.gpuValidationEcal_cff import gpuValidationEcal
-from DQM.EcalMonitorTasks.ecalGpuTask_cfi import ecalGpuTask
-
-gpuValidationEcal.toModify(ecalGpuTask.params, runGpuTask = True)
-gpuValidationEcal.toModify(ecalMonitorTask.workers, func = lambda workers: workers.append("GpuTask"))
-gpuValidationEcal.toModify(ecalMonitorTask, workerParameters = dict(GpuTask = ecalGpuTask))
-
-# 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
-from Configuration.ProcessModifiers.gpu_cff import gpu
-gpu.toModify(ecalMonitorTask.skipCollections, func = lambda skipCollections: skipCollections.append("EcalRawData"))

DQM/HcalTasks/python/OfflineSourceSequence_pp.py

@@ -10,17 +10,17 @@
 from DQM.HcalTasks.RawTask_cfi import rawTask
 from DQM.HcalTasks.TPTask_cfi import tpTask
 from DQM.HcalTasks.RecHitTask_cfi import recHitTask, recHitPreRecoTask
-from DQM.HcalTasks.hcalGPUComparisonTask_cfi import hcalGPUComparisonTask
+from DQM.HcalTasks.hcalGPUComparisonTask_cfi import hcalGPUComparisonTask as _hcalGPUComparisonTask
 
 #   set processing type to Offine
 digiTask.ptype = 1
 tpTask.ptype = 1
 recHitTask.ptype = 1
 rawTask.ptype = 1
 recHitPreRecoTask.ptype = 1
-hcalGPUComparisonTask.ptype = 1
 
-hcalAlpakaComparisonTask = hcalGPUComparisonTask.clone()
+hcalAlpakaComparisonTask = _hcalGPUComparisonTask.clone()
+hcalAlpakaComparisonTask.ptype = 1
 
 #   set the label for Emulator TP Task
 tpTask.tagEmul = "valHcalTriggerPrimitiveDigis"
@@ -36,46 +36,24 @@
     recHitPreRecoTask +
     rawTask )
 
-hcalOnlyOfflineSourceSequenceGPU = cms.Sequence(
-    digiTask +
-    recHitTask +
-    rawTask +
-    hcalGPUComparisonTask
-)
 hcalOnlyOfflineSourceSequenceAlpaka = cms.Sequence(
     digiTask +
     recHitTask +
     rawTask +
     hcalAlpakaComparisonTask
 )
 
-
-from Configuration.ProcessModifiers.gpuValidationHcal_cff import gpuValidationHcal
-gpuValidationHcal.toReplaceWith(hcalOnlyOfflineSourceSequence, hcalOnlyOfflineSourceSequenceGPU)
-
 from Configuration.Eras.Modifier_run2_HCAL_2018_cff import run2_HCAL_2018
-run2_HCAL_2018.toModify(hcalGPUComparisonTask,
-    tagHBHE_ref = "hbheprereco@cpu",
-    tagHBHE_target = "hbheprereco@cuda"
-)
 run2_HCAL_2018.toModify(recHitTask,
     tagHBHE = "hbheprereco"
 )
 
 from Configuration.Eras.Modifier_run3_HB_cff import run3_HB
 from Configuration.ProcessModifiers.alpaka_cff import alpaka
 ### reverting the reco tag setting that inherited from run2
-run3_HB.toModify(hcalGPUComparisonTask,
-    tagHBHE_ref = "hbhereco@cpu",
-    tagHBHE_target = "hbhereco@cuda"
-)
 run3_HB.toModify(recHitTask,
     tagHBHE = "hbhereco"
 )
-(alpaka & run3_HB).toModify(hcalGPUComparisonTask,
-    tagHBHE_ref = "hbherecoSerial",
-    tagHBHE_target = "hbhereco"
-)
 run3_HB.toModify(hcalAlpakaComparisonTask,
     tagHBHE_ref = "hbherecoLegacy",
     tagHBHE_target = "hbhereco"

DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py

@@ -307,7 +307,7 @@
 process.castorDigis.InputLabel           = rawDataInputTag
 process.csctfDigis.producer              = rawDataInputTag 
 process.dttfDigis.DTTF_FED_Source        = rawDataInputTag
-process.ecalDigisCPU.InputLabel          = rawDataInputTag
+process.ecalDigis.InputLabel             = rawDataInputTag
 process.ecalPreshowerDigis.sourceTag     = rawDataInputTag
 process.gctDigis.inputLabel              = rawDataInputTag
 process.gtDigis.DaqGtInputTag            = rawDataInputTag
@@ -316,7 +316,7 @@
 process.muonDTDigis.inputLabel           = rawDataInputTag
 process.muonRPCDigis.InputLabel          = rawDataInputTag
 process.scalersRawToDigi.scalersInputTag = rawDataInputTag
-process.siPixelDigis.cpu.InputLabel      = rawDataInputTag
+process.siPixelDigis.InputLabel          = rawDataInputTag
 process.siStripDigis.ProductLabel        = rawDataInputTag
 process.tcdsDigis.InputLabel             = rawDataInputTag
 

DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py

@@ -118,10 +118,11 @@
 else:
     rawDataInputTag = "rawDataCollector"
 
-""" process.castorDigis.InputLabel           = rawDataInputTag
+"""
+process.castorDigis.InputLabel           = rawDataInputTag
 process.csctfDigis.producer              = rawDataInputTag 
 process.dttfDigis.DTTF_FED_Source        = rawDataInputTag
-process.ecalDigisCPU.InputLabel          = rawDataInputTag
+process.ecalDigis.InputLabel             = rawDataInputTag
 process.ecalPreshowerDigis.sourceTag     = rawDataInputTag
 process.gctDigis.inputLabel              = rawDataInputTag
 process.gtDigis.DaqGtInputTag            = rawDataInputTag
@@ -132,7 +133,7 @@
 process.scalersRawToDigi.scalersInputTag = rawDataInputTag
 process.siPixelDigis.InputLabel          = rawDataInputTag
 process.siStripDigis.ProductLabel        = rawDataInputTag
- """
+"""
 process.dqmFakeBeamMonitor.OnlineMode = True
 process.dqmFakeBeamMonitor.recordName = BSOnlineRecordName
 

DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py

@@ -121,7 +121,7 @@
     process.castorDigis.InputLabel           = "rawDataCollector"
     process.csctfDigis.producer              = "rawDataCollector"
     process.dttfDigis.DTTF_FED_Source        = "rawDataCollector"
-    process.ecalDigisCPU.InputLabel          = "rawDataCollector"
+    process.ecalDigis.InputLabel             = "rawDataCollector"
     process.ecalPreshowerDigis.sourceTag     = "rawDataCollector"
     process.gctDigis.inputLabel              = "rawDataCollector"
     process.gtDigis.DaqGtInputTag            = "rawDataCollector"
@@ -130,7 +130,7 @@
     process.muonDTDigis.inputLabel           = "rawDataCollector"
     process.muonRPCDigis.InputLabel          = "rawDataCollector"
     process.scalersRawToDigi.scalersInputTag = "rawDataCollector"
-    process.siPixelDigis.cpu.InputLabel      = "rawDataCollector"
+    process.siPixelDigis.InputLabel          = "rawDataCollector"
     process.siStripDigis.ProductLabel        = "rawDataCollector"
 
 
@@ -174,7 +174,7 @@
     process.castorDigis.InputLabel           = "rawDataRepacker"
     process.csctfDigis.producer              = "rawDataRepacker"
     process.dttfDigis.DTTF_FED_Source        = "rawDataRepacker"
-    process.ecalDigisCPU.InputLabel          = "rawDataRepacker"
+    process.ecalDigis.InputLabel             = "rawDataRepacker"
     process.ecalPreshowerDigis.sourceTag     = "rawDataRepacker"
     process.gctDigis.inputLabel              = "rawDataRepacker"
     process.gtDigis.DaqGtInputTag            = "rawDataRepacker"
@@ -183,7 +183,7 @@
     process.muonDTDigis.inputLabel           = "rawDataRepacker"
     process.muonRPCDigis.InputLabel          = "rawDataRepacker"
     process.scalersRawToDigi.scalersInputTag = "rawDataRepacker"
-    process.siPixelDigis.cpu.InputLabel      = "rawDataRepacker"
+    process.siPixelDigis.InputLabel          = "rawDataRepacker"
     process.siStripDigis.ProductLabel        = "rawDataRepacker"
 
 

DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py

@@ -180,7 +180,7 @@
 process.castorDigis.InputLabel = "rawDataCollector"
 process.csctfDigis.producer = "rawDataCollector"
 process.dttfDigis.DTTF_FED_Source = "rawDataCollector"
-process.ecalDigisCPU.InputLabel = "rawDataCollector"
+process.ecalDigis.InputLabel = "rawDataCollector"
 process.ecalPreshowerDigis.sourceTag = "rawDataCollector"
 process.gctDigis.inputLabel = "rawDataCollector"
 process.gtDigis.DaqGtInputTag = "rawDataCollector"
@@ -190,7 +190,7 @@
 process.muonDTDigis.inputLabel = "rawDataCollector"
 process.muonRPCDigis.InputLabel = "rawDataCollector"
 process.scalersRawToDigi.scalersInputTag = "rawDataCollector"
-process.siPixelDigis.cpu.InputLabel = "rawDataCollector"
+process.siPixelDigis.InputLabel = "rawDataCollector"
 process.siStripDigis.ProductLabel = "rawDataCollector"
 process.cscMonitor.FEDRawDataCollectionTag = "rawDataCollector"
 process.dqmCSCClient.InputObjects = "rawDataCollector"
@@ -205,7 +205,7 @@
     process.castorDigis.InputLabel = "rawDataRepacker"
     process.csctfDigis.producer = "rawDataRepacker"
     process.dttfDigis.DTTF_FED_Source = "rawDataRepacker"
-    process.ecalDigisCPU.InputLabel = "rawDataRepacker"
+    process.ecalDigis.InputLabel = "rawDataRepacker"
     process.ecalPreshowerDigis.sourceTag = "rawDataRepacker"
     process.gctDigis.inputLabel = "rawDataRepacker"
     process.gtDigis.DaqGtInputTag = "rawDataRepacker"
@@ -215,7 +215,7 @@
     process.muonDTDigis.inputLabel = "rawDataRepacker"
     process.muonRPCDigis.InputLabel = "rawDataRepacker"
     process.scalersRawToDigi.scalersInputTag = "rawDataRepacker"
-    process.siPixelDigis.cpu.InputLabel = "rawDataRepacker"
+    process.siPixelDigis.InputLabel = "rawDataRepacker"
     process.siStripDigis.ProductLabel = "rawDataRepacker"
     process.cscMonitor.FEDRawDataCollectionTag = "rawDataRepacker"
     process.dqmCSCClient.InputObjects = "rawDataRepacker"

DQM/Integration/python/clients/ecal_dqm_sourceclient-live_cfg.py

@@ -193,7 +193,7 @@
     process.ecalMonitorTask.workerParameters.PresampleTask.params.doPulseMaxCheck = False 
 elif runTypeName == 'hi_run':
     process.ecalMonitorTask.collectionTags.Source = "rawDataRepacker"
-    process.ecalDigisCPU.InputLabel = 'rawDataRepacker'
+    process.ecalDigis.InputLabel = 'rawDataRepacker'
 elif runTypeName == 'hpu_run':
     if not unitTest:
         process.source.SelectEvents = cms.untracked.vstring("*")

DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py

@@ -49,7 +49,7 @@
 # Pixel sequence:
 process.load('Configuration.StandardSequences.MagneticField_cff')
 process.load('EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi')
-process.siPixelDigis.cpu.IncludeErrors = True
+process.siPixelDigis.IncludeErrors = True
 process.load('DQM.SiPixelMonitorRawData.SiPixelMonitorHLT_cfi')
 process.SiPixelHLTSource.saveFile = False
 process.SiPixelHLTSource.slowDown = False
@@ -95,7 +95,7 @@
 # Setting raw data collection label for all subsytem modules, depending on run type:
 if (process.runType.getRunType() == process.runType.hi_run):
     process.l1tStage2Fed.rawTag = 'rawDataRepacker'
-    process.siPixelDigis.cpu.InputLabel = 'rawDataRepacker'
+    process.siPixelDigis.InputLabel = 'rawDataRepacker'
     process.SiPixelHLTSource.RawInput = 'rawDataRepacker'
     process.siStripFEDCheck.RawDataTag = 'rawDataRepacker'
     process.esRawToDigi.sourceTag = 'rawDataRepacker'
@@ -109,7 +109,7 @@
     process.cscDQMEvF.InputObjects = 'rawDataRepacker'
 else:
     process.l1tStage2Fed.rawTag = 'rawDataCollector'
-    process.siPixelDigis.cpu.InputLabel = 'rawDataCollector'
+    process.siPixelDigis.InputLabel = 'rawDataCollector'
     process.SiPixelHLTSource.RawInput = 'rawDataCollector'
     process.siStripFEDCheck.RawDataTag = 'rawDataCollector'
     process.esRawToDigi.sourceTag = 'rawDataCollector'