Skip to content

Commit c43fa27

Browse files
committed
Replace PFClusterParamsESProducer with MoveToDeviceCache
1 parent 15455a9 commit c43fa27

13 files changed

+274
-358
lines changed

HLTrigger/Configuration/python/customizeHLTforCMSSW.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,19 @@ def customizeHLTfor47047(process):
153153
for prod in list(esproducers_by_type(process, "HcalMahiPulseOffsetsESProducer@alpaka")):
154154
delattr(process, prod.label())
155155

156+
for prod in producers_by_type(process, "PFClusterSoAProducer@alpaka", "alpaka_serial_sync::PFClusterSoAProducer"):
157+
clusterParamsLabel = prod.pfClusterParams.getModuleLabel()
158+
if hasattr(process, clusterParamsLabel):
159+
esProducer = getattr(process, clusterParamsLabel)
160+
for attr in ["seedFinder", "initialClusteringStep", "pfClusterBuilder"]:
161+
setattr(prod, attr, copy.deepcopy(getattr(esProducer, attr).copy()))
162+
del prod.pfClusterParams
163+
for prod in list(esproducers_by_type(process, "PFClusterParamsESProducer@alpaka")):
164+
delattr(process, prod.label())
165+
166+
if hasattr(process, "hltESSJobConfigurationGPURecord"):
167+
del process.hltESSJobConfigurationGPURecord
168+
156169
return process
157170

158171
# CMSSW version specific customizations

RecoParticleFlow/PFClusterProducer/interface/PFClusterParamsHostCollection.h

Lines changed: 0 additions & 14 deletions
This file was deleted.

RecoParticleFlow/PFClusterProducer/interface/alpaka/PFClusterParamsDeviceCollection.h

Lines changed: 0 additions & 21 deletions
This file was deleted.

RecoParticleFlow/PFClusterProducer/plugins/LegacyPFClusterProducer.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "DataFormats/ParticleFlowReco/interface/PFRecHitHostCollection.h"
3131
#include "DataFormats/ParticleFlowReco/interface/PFClusterHostCollection.h"
3232
#include "DataFormats/ParticleFlowReco/interface/PFRecHitFractionHostCollection.h"
33-
#include "HeterogeneousCore/CUDACore/interface/JobConfigurationGPURecord.h"
3433
#include "RecoParticleFlow/PFClusterProducer/interface/PFCPositionCalculatorBase.h"
3534

3635
class LegacyPFClusterProducer : public edm::stream::EDProducer<> {

RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterParamsESProducer.cc

Lines changed: 0 additions & 249 deletions
This file was deleted.

RecoParticleFlow/PFClusterProducer/interface/PFClusterParamsSoA.h renamed to RecoParticleFlow/PFClusterProducer/plugins/alpaka/PFClusterParamsSoA.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef RecoParticleFlow_PFClusterProducer_interface_PFClusterParamsSoA_h
2-
#define RecoParticleFlow_PFClusterProducer_interface_PFClusterParamsSoA_h
1+
#ifndef RecoParticleFlow_PFClusterProducer_plugins_alpaka_PFClusterParamsSoA_h
2+
#define RecoParticleFlow_PFClusterProducer_plugins_alpaka_PFClusterParamsSoA_h
33

44
#include "DataFormats/SoATemplate/interface/SoACommon.h"
55
#include "DataFormats/SoATemplate/interface/SoALayout.h"

0 commit comments

Comments
 (0)