resolve test failures and compiler warnings

cms-sw · Jul 29, 2021 · fbe2b59 · fbe2b59
1 parent 10f6af4
commit fbe2b59
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/RecoLocalTracker/SiStripClusterizer/plugins/SiStripRawToClusterGPUKernel.h b/RecoLocalTracker/SiStripClusterizer/plugins/SiStripRawToClusterGPUKernel.h
@@ -23,7 +23,7 @@ namespace edm {
   class ParameterSet;
 }
 
-class sst_data_t;
+struct sst_data_t;
 class clust_data_t;
 
 namespace stripgpu {

diff --git a/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizerOnDemand_cfi.py b/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizerOnDemand_cfi.py
@@ -32,12 +32,14 @@
     cuda = siStripClustersFromSOA,
 )
 
-siStripClustersTaskCUDA = cms.Task(
+siStripClustersTaskCUDA = cms.Task()
+
+gpu.toReplaceWith(siStripClustersTaskCUDA, cms.Task(
     # conditions used *only* by the modules running on GPU
     SiStripClusterizerConditionsGPUESProducer,
     # reconstruct the strip clusters on the gpu
     siStripClusterizerFromRawGPU,
-)
+))
 
 gpu.toReplaceWith(siStripClustersTask, cms.Task(
     # CUDA specific

diff --git a/RecoLocalTracker/SiStripClusterizer/python/customizeStripClustersFromRaw.py b/RecoLocalTracker/SiStripClusterizer/python/customizeStripClustersFromRaw.py
@@ -1,5 +1,4 @@
 import FWCore.ParameterSet.Config as cms
-import RecoLocalTracker.SiStripClusterizer.SiStripClusterizerOnDemand_cfi as SiStripClusterizerOnDemand_cfi
 
 def customizeStripClustersFromRaw(process):
     if hasattr(process, 'striptrackerlocalrecoTask'):
@@ -13,10 +12,13 @@ def customizeStripClustersFromRaw(process):
 
 def customizeHLTStripClustersFromRaw(process):
     if hasattr(process, 'hltSiStripRawToClustersFacility'):
-        process.load("RecoLocalTracker.SiStripClusterizer.SiStripClusterizerConditionsGPUESProducer_cfi")
+        import RecoLocalTracker.SiStripClusterizer.SiStripClusterizerOnDemand_cfi as SiStripClusterizerOnDemand_cfi
+
         process.load("RecoLocalTracker.SiStripClusterizer.SiStripClusterizerOnDemand_cfi")
         process.hltSiStripRawToClustersFacility = SiStripClusterizerOnDemand_cfi.siStripClusters.clone()
         process.HLTDoLocalStripSequence.replace(process.hltSiStripRawToClustersFacility,
-                                   cms.Sequence(process.hltSiStripRawToClustersFacility, process.siStripClustersTask))
+                                   cms.Sequence(process.hltSiStripRawToClustersFacility, process.siStripClustersTaskCUDA))
+        process.HLTDoLocalStripSequenceRegForBTag.replace(process.hltSiStripRawToClustersFacility,
+                                             cms.Sequence(process.hltSiStripRawToClustersFacility, process.siStripClustersTaskCUDA))
 
     return process