From 80a7513671b1873cdfde69051774a0ddb177d701 Mon Sep 17 00:00:00 2001 From: Matti Kortelainen Date: Sat, 8 Jan 2022 00:46:31 +0100 Subject: [PATCH] Migrate direct users of CUDAService to ProcessAcceleratorCUDA --- HLTrigger/Configuration/python/customizeHLTforPatatrack.py | 4 +--- .../EcalRecProducers/test/ecalRawDecodingAndMultifit.py | 5 +---- .../EcalRecProducers/test/testEcalRechitProducer_cfg.py | 2 +- .../test/testEcalUncalibRechitProducer_cfg.py | 7 +------ .../HGCalRecProducers/test/HeterogeneousHGCalRecHit_cfg.py | 2 +- .../test/HeterogeneousRecHitsTiming_cfg.py | 2 +- .../HcalRecProducers/test/make_GPUvsCPU_HCAL_rechits.py | 4 +--- .../test/HeterogeneousHGCalRecHitsValidator_cfg.py | 2 +- 8 files changed, 8 insertions(+), 20 deletions(-) diff --git a/HLTrigger/Configuration/python/customizeHLTforPatatrack.py b/HLTrigger/Configuration/python/customizeHLTforPatatrack.py index e7ebcee70b161..4fbfb1352034a 100644 --- 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 index a3d04e836f020..1bfa8c8c6dc73 100644 --- 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 index 192eb1fd2cb90..768b7fc5096bc 100644 --- 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 index 5684e30e330b8..bb01e1f9fcc01 100644 --- 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 index 249ee0d700909..4ff82b8f5bd80 100644 --- 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 index 476006f1a20bd..b79e90f5421e7 100644 --- 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 index 0ce9caf13fa88..84fb7a98132e2 100644 --- 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 index 7b4a2eacebcfa..0fb974b588c58 100644 --- 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')