Migrate direct users of CUDAService to ProcessAcceleratorCUDA

cms-sw · Jan 12, 2022 · 98596a8 · 98596a8
1 parent 29129e5
commit 98596a8
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 20 deletions.
diff --git a/HLTrigger/Configuration/python/customizeHLTforPatatrack.py b/HLTrigger/Configuration/python/customizeHLTforPatatrack.py
@@ -23,9 +23,7 @@ def customiseCommon(process):
 
     # Services
 
-    process.load("HeterogeneousCore.CUDAServices.CUDAService_cfi")
-    if 'MessageLogger' in process.__dict__:
-        process.MessageLogger.CUDAService = cms.untracked.PSet()
+    process.load("HeterogeneousCore.CUDACore.ProcessAcceleratorCUDA_cfi")
 
     # NVProfilerService is broken in CMSSW 12.0.x and later
     #process.load("HeterogeneousCore.CUDAServices.NVProfilerService_cfi")

diff --git a/RecoLocalCalo/EcalRecProducers/test/ecalRawDecodingAndMultifit.py b/RecoLocalCalo/EcalRecProducers/test/ecalRawDecodingAndMultifit.py
@@ -6,7 +6,7 @@
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
-process.load('HeterogeneousCore.CUDAServices.CUDAService_cfi')
+process.load('HeterogeneousCore.CUDACore.ProcessAcceleratorCUDA_cfi')
 process.load('Configuration.StandardSequences.GeometryRecoDB_cff')
 process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff')
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
@@ -167,6 +167,3 @@
     SkipEvent = cms.untracked.vstring('ProductNotFound'),
     wantSummary = cms.untracked.bool(True)
 )
-
-# report CUDAService messages
-process.MessageLogger.categories.append("CUDAService")
diff --git a/RecoLocalCalo/EcalRecProducers/test/testEcalRechitProducer_cfg.py b/RecoLocalCalo/EcalRecProducers/test/testEcalRechitProducer_cfg.py
@@ -7,7 +7,7 @@
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
-process.load('HeterogeneousCore.CUDAServices.CUDAService_cfi')
+process.load('HeterogeneousCore.CUDACore.ProcessAcceleratorCUDA_cfi')
 process.load('Configuration.StandardSequences.GeometryRecoDB_cff')
 process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff')
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')

diff --git a/RecoLocalCalo/EcalRecProducers/test/testEcalUncalibRechitProducer_cfg.py b/RecoLocalCalo/EcalRecProducers/test/testEcalUncalibRechitProducer_cfg.py
@@ -8,7 +8,7 @@
 process.load('Configuration.StandardSequences.Services_cff')
 #process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
 process.load('FWCore.MessageService.MessageLogger_cfi')
-process.load('HeterogeneousCore.CUDAServices.CUDAService_cfi')
+process.load('HeterogeneousCore.CUDACore.ProcessAcceleratorCUDA_cfi')
 #process.load('Configuration.EventContent.EventContent_cff')
 process.load('Configuration.StandardSequences.GeometryRecoDB_cff')
 process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff')
@@ -225,8 +225,3 @@
     SkipEvent = cms.untracked.vstring('ProductNotFound'),
     wantSummary = cms.untracked.bool(True)
 )
-
-# report CUDAService messages
-process.MessageLogger.categories.append("CUDAService")
-
-
diff --git a/RecoLocalCalo/HGCalRecProducers/test/HeterogeneousHGCalRecHit_cfg.py b/RecoLocalCalo/HGCalRecProducers/test/HeterogeneousHGCalRecHit_cfg.py
@@ -44,7 +44,7 @@ def getHeterogeneousRecHitsSource(pu):
 #process.load('Configuration.EventContent.EventContent_cff')
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
 process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff')
-process.load('HeterogeneousCore.CUDAServices.CUDAService_cfi')
+process.load('HeterogeneousCore.CUDACore.ProcessAcceleratorCUDA_cfi')
 process.load('RecoLocalCalo.HGCalRecProducers.HGCalRecHit_cfi')
 process.load('SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi')
 

diff --git a/RecoLocalCalo/HGCalRecProducers/test/HeterogeneousRecHitsTiming_cfg.py b/RecoLocalCalo/HGCalRecProducers/test/HeterogeneousRecHitsTiming_cfg.py
@@ -15,7 +15,7 @@
 process.load('Configuration.StandardSequences.MagneticField_cff')
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
 process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff')
-process.load('HeterogeneousCore.CUDAServices.CUDAService_cfi')
+process.load('HeterogeneousCore.CUDACore.ProcessAcceleratorCUDA_cfi')
 process.load('RecoLocalCalo.HGCalRecProducers.HGCalRecHit_cfi')
 process.load('SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi')
 process.load( "HLTrigger.Timer.FastTimerService_cfi" )

diff --git a/RecoLocalCalo/HcalRecProducers/test/make_GPUvsCPU_HCAL_rechits.py b/RecoLocalCalo/HcalRecProducers/test/make_GPUvsCPU_HCAL_rechits.py
@@ -7,7 +7,7 @@
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
-process.load('HeterogeneousCore.CUDAServices.CUDAService_cfi')
+process.load('HeterogeneousCore.CUDACore.ProcessAcceleratorCUDA_cfi')
 
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
 from Configuration.AlCa.GlobalTag import GlobalTag
@@ -146,6 +146,4 @@
     wantSummary = cms.untracked.bool(True)
 )
 
-# report CUDAService messages
 process.MessageLogger.cerr.FwkReport.reportEvery = 100
-process.MessageLogger.CUDAService = cms.untracked.PSet()
diff --git a/Validation/HGCalValidation/test/HeterogeneousHGCalRecHitsValidator_cfg.py b/Validation/HGCalValidation/test/HeterogeneousHGCalRecHitsValidator_cfg.py
@@ -42,7 +42,7 @@ def getHeterogeneousRecHitsSource(pu):
 #process.load('Configuration.EventContent.EventContent_cff')
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
 process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff')
-process.load('HeterogeneousCore.CUDAServices.CUDAService_cfi')
+process.load('HeterogeneousCore.CUDACore.ProcessAcceleratorCUDA_cfi')
 process.load('RecoLocalCalo.HGCalRecProducers.HGCalRecHit_cfi')
 process.load('SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi')