Merge pull request cms-sw#16 from SegmentLinking/from-CMSSW_13_3_0_pr…

…e3_LST_X/modules-dev

SDL::modulesBuffer as an ES product

RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py

@@ -387,14 +387,9 @@
 from RecoTracker.LST.lstSeedTracks_cfi import lstInitialStepSeedTracks,lstHighPtTripletStepSeedTracks
 from RecoTracker.LST.lstPixelSeedInputProducer_cfi import lstPixelSeedInputProducer
 from RecoTracker.LST.lstPhase2OTHitsInputProducer_cfi import lstPhase2OTHitsInputProducer
-from RecoTracker.LST.lstProducer_cfi import lstProducer as _lstProducer
-# Define lstProducer like this to be able to run the serial version explicitly
-lstProducer = _lstProducer.clone(
-  alpaka = cms.untracked.PSet(backend = cms.untracked.string('serial_sync'))
-)
-from Configuration.ProcessModifiers.gpu_cff import gpu
-gpu.toReplaceWith(lstProducer,_lstProducer.clone())
-_HighPtTripletStepTask_LST.add(siPhase2RecHits, lstInitialStepSeedTracks, lstHighPtTripletStepSeedTracks, lstPixelSeedInputProducer, lstPhase2OTHitsInputProducer, lstProducer)
+from RecoTracker.LST.lstProducer_cff import *
+_HighPtTripletStepTask_LST.add(siPhase2RecHits, lstInitialStepSeedTracks, lstHighPtTripletStepSeedTracks, lstPixelSeedInputProducer, lstPhase2OTHitsInputProducer,
+                               lstProducer, lstModulesDevESProducer)
 (trackingPhase2PU140 & trackingLST).toReplaceWith(HighPtTripletStepTask, _HighPtTripletStepTask_LST)
 
 # fast tracking mask producer 

RecoTracker/LST/BuildFile.xml

@@ -1,5 +1,9 @@
 <use name="DataFormats/Common"/>
+<use name="alpaka"/>
+<use name="lst_headers"/>
 <use name="DataFormats/TrackerRecHit2D"/>
+<use name="HeterogeneousCore/AlpakaInterface"/>
+<flags ALPAKA_BACKENDS="cuda serial"/>
 <export>
-  <lib name="RecoTrackerLST"/>
+  <lib name="1"/>
 </export>

RecoTracker/LST/plugins/BuildFile.xml

@@ -5,6 +5,7 @@
   <use name="DataFormats/TrackerRecHit2D"/>
   <use name="DataFormats/TrajectorySeed"/>
   <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
   <use name="FWCore/Utilities"/>
   <use name="Geometry/TrackerGeometryBuilder"/>
@@ -13,6 +14,7 @@
   <use name="RecoTracker/LST"/>
   <use name="RecoTracker/TkSeedingLayers"/>
   <use name="RecoTracker/TkSeedGenerator"/>
+  <use name="RecoTracker/Record"/>
   <use name="TrackingTools/GeomPropagators"/>
   <use name="TrackingTools/Records"/>
   <use name="TrackingTools/TrajectoryState"/>
@@ -31,6 +33,7 @@
   <use name="HeterogeneousCore/AlpakaCore"/>
   <use name="HeterogeneousCore/AlpakaInterface"/>
   <use name="RecoTracker/LST"/>
+  <use name="RecoTracker/Record"/>
   <flags ALPAKA_BACKENDS="serial"/>
   <flags EDM_PLUGIN="1"/>
 </library>
@@ -44,6 +47,7 @@
   <use name="HeterogeneousCore/AlpakaCore"/>
   <use name="HeterogeneousCore/AlpakaInterface"/>
   <use name="RecoTracker/LST"/>
+  <use name="RecoTracker/Record"/>
   <flags ALPAKA_BACKENDS="cuda"/>
   <flags EDM_PLUGIN="1"/>
 </library>

RecoTracker/LST/plugins/alpaka/LSTModulesDevESProducer.cc

@@ -0,0 +1,57 @@
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+#include "HeterogeneousCore/AlpakaCore/interface/alpaka/ESProducer.h"
+#include "HeterogeneousCore/AlpakaCore/interface/alpaka/ModuleFactory.h"
+#include "HeterogeneousCore/AlpakaInterface/interface/config.h"
+#include "HeterogeneousCore/AlpakaInterface/interface/memory.h"
+
+#include "RecoTracker/Record/interface/TrackerRecoGeometryRecord.h"
+
+// LST includes
+#include <SDL/Module.h>
+#include <SDL/ModuleMethods.h>
+#include <SDL/LST.h>
+
+namespace cms::alpakatools {
+  template <>
+  struct CopyToDevice<SDL::modulesBuffer<alpaka_common::DevHost>> {
+    template <typename TQueue>
+    static auto copyAsync(TQueue& queue, SDL::modulesBuffer<alpaka_common::DevHost> const& srcData) {
+      return SDL::modulesBuffer<alpaka::Dev<TQueue>>(queue, srcData);
+    }
+  };
+} //namespace cms::alpakatools
+namespace ALPAKA_ACCELERATOR_NAMESPACE {
+
+class LSTModulesDevESProducer : public ESProducer {
+public:
+  LSTModulesDevESProducer(const edm::ParameterSet &iConfig);
+
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
+
+  std::optional<SDL::modulesBuffer<alpaka_common::DevHost>> produce(const TrackerRecoGeometryRecord &iRecord);
+
+};
+
+LSTModulesDevESProducer::LSTModulesDevESProducer(const edm::ParameterSet &iConfig)
+  : ESProducer(iConfig)
+{
+  setWhatProduced(this, iConfig.getParameter<std::string>("ComponentName"));
+}
+
+void LSTModulesDevESProducer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<std::string>("ComponentName", "")->setComment("Product label");
+  descriptions.addWithDefaultLabel(desc);
+}
+
+  std::optional<SDL::modulesBuffer<alpaka_common::DevHost>> LSTModulesDevESProducer::produce(const TrackerRecoGeometryRecord &iRecord) {
+    SDL::modulesBuffer<alpaka_common::DevHost> modules(cms::alpakatools::host());
+    alpaka::QueueCpuBlocking queue(cms::alpakatools::host());
+    SDL::LST::loadAndFillES(queue, &modules);
+    return modules;
+}
+
+}  // namespace ALPAKA_ACCELERATOR_NAMESPACE
+
+DEFINE_FWK_EVENTSETUP_ALPAKA_MODULE(LSTModulesDevESProducer);

RecoTracker/LST/plugins/alpaka/LSTProducer.cc

@@ -1,5 +1,6 @@
 #include <alpaka/alpaka.hpp>
 
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
@@ -16,6 +17,8 @@
 #include "RecoTracker/LST/interface/LSTPhase2OTHitsInput.h"
 #include "RecoTracker/LST/interface/LSTPixelSeedInput.h"
 
+#include "RecoTracker/Record/interface/TrackerRecoGeometryRecord.h"
+
 #include "SDL/LST.h"
 
 namespace ALPAKA_ACCELERATOR_NAMESPACE {
@@ -26,6 +29,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
         : lstPixelSeedInputToken_{consumes<LSTPixelSeedInput>(config.getParameter<edm::InputTag>("pixelSeedInput"))},
           lstPhase2OTHitsInputToken_{
               consumes<LSTPhase2OTHitsInput>(config.getParameter<edm::InputTag>("phase2OTHitsInput"))},
+          modulesESToken_{esConsumes()},
           verbose_(config.getParameter<int>("verbose")),
           lstOutputToken_{produces()} {}
 
@@ -35,7 +39,9 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
       auto const& pixelSeeds = event.get(lstPixelSeedInputToken_);
       auto const& phase2OTHits = event.get(lstPhase2OTHitsInputToken_);
 
-      lst_.eventSetup();
+      auto const& modulesData = setup.getData(modulesESToken_);
+      SDL::modulesBuffersES = &modulesData;
+      SDL::modulesInGPU->setData(modulesData);
       lst_.run(event.queue(),
                verbose_,
                pixelSeeds.px(),
@@ -79,6 +85,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
   private:
     edm::EDGetTokenT<LSTPixelSeedInput> lstPixelSeedInputToken_;
     edm::EDGetTokenT<LSTPhase2OTHitsInput> lstPhase2OTHitsInputToken_;
+    device::ESGetToken<SDL::modulesBuffer<Device>, TrackerRecoGeometryRecord> modulesESToken_;
     const int verbose_;
     edm::EDPutTokenT<LSTOutput> lstOutputToken_;
 

RecoTracker/LST/python/lstProducer_cff.py

@@ -0,0 +1,9 @@
+import FWCore.ParameterSet.Config as cms
+
+from RecoTracker.LST.lstProducer_cfi import lstProducer
+
+from Configuration.ProcessModifiers.gpu_cff import gpu
+(~gpu).toModify(lstProducer.alpaka, backend = 'serial_sync')
+
+from RecoTracker.LST.lstModulesDevESProducer_cfi import lstModulesDevESProducer
+(~gpu).toModify(lstModulesDevESProducer.alpaka, backend = 'serial_sync')

RecoTracker/LST/src/alpaka/ES_ModulesDev.cc

@@ -0,0 +1,7 @@
+#include <SDL/Module.h>
+#include "HeterogeneousCore/AlpakaCore/interface/alpaka/typelookup.h"
+
+// Temporary hack: The DevHost instantiation is needed in both CPU and GPU plugins,
+// whereas the (non-host-)Device instantiation only in the GPU plugin
+TYPELOOKUP_DATA_REG(SDL::modulesBuffer<alpaka_common::DevHost>);
+TYPELOOKUP_ALPAKA_TEMPLATED_DATA_REG(SDL::modulesBuffer);

RecoTracker/LST/test/LSTAlpakaTester.py

@@ -34,10 +34,8 @@
 )
 
 process.options = cms.untracked.PSet(
-    FailPath = cms.untracked.vstring(),
     IgnoreCompletely = cms.untracked.vstring(),
     Rethrow = cms.untracked.vstring(),
-    SkipEvent = cms.untracked.vstring(),
     accelerators = cms.untracked.vstring('*'),
     allowUnscheduled = cms.obsolete.untracked.bool,
     canDeleteEarly = cms.untracked.vstring(),
@@ -91,8 +89,7 @@
 # Main LST Producer
 process.load('Configuration.StandardSequences.Accelerators_cff')
 process.load("HeterogeneousCore.AlpakaCore.ProcessAcceleratorAlpaka_cfi")
-from RecoTracker.LST.lstProducer_cfi import lstProducer as _lstProducer
-process.lstProducer = _lstProducer.clone()
+process.load("RecoTracker.LST.lstProducer_cff")
 
 # Track Fitting
 import RecoTracker.TrackProducer.TrackProducer_cfi