Merge 2c36399 into sapling-pr-archive-ktf

Author: ktf

Detectors/GlobalTracking/src/MatchTPCITS.cxx

@@ -671,7 +671,8 @@ bool MatchTPCITS::prepareITSData()
     auto pattID = clus.getPatternID();
     unsigned int npix;
 #ifdef ENABLE_UPGRADES
-    if ((pattID == o2::itsmft::CompCluster::InvalidPatternID) || ((withITS3) ? mIT3Dict->isGroup(pattID) : mITSDict->isGroup(pattID))) { // braces guarantee evaluation order
+    auto ib = o2::its3::constants::detID::isDetITS3(clus.getChipID());
+    if ((pattID == o2::itsmft::CompCluster::InvalidPatternID) || ((withITS3) ? mIT3Dict->isGroup(pattID, ib) : mITSDict->isGroup(pattID))) { // braces guarantee evaluation order
 #else
     if (pattID == o2::itsmft::CompCluster::InvalidPatternID || mITSDict->isGroup(pattID)) {
 #endif
@@ -681,7 +682,7 @@ bool MatchTPCITS::prepareITSData()
     } else {
 #ifdef ENABLE_UPGRADES
       if (withITS3) {
-        npix = mIT3Dict->getNpixels(pattID);
+        npix = mIT3Dict->getNpixels(pattID, ib);
       } else {
         npix = mITSDict->getNpixels(pattID);
       }
@@ -1444,8 +1445,7 @@ void MatchTPCITS::refitWinners(pmr::vector<o2::dataformats::TrackTPCITS>& matche
 
 #ifdef WITH_OPENMP
 #pragma omp parallel for schedule(dynamic) num_threads(mNThreads) \
-  reduction(+                                                     \
-            : nFailedRefit)
+  reduction(+ : nFailedRefit)
 #endif
   for (int ifit = 0; ifit < nToFit; ifit++) {
     int iTPC = tpcToFit[ifit], iITS;

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Cell.h

@@ -97,7 +97,7 @@ class CellSeed final : public o2::track::TrackParCovF
   GPUhd() void setFirstTrackletIndex(int trkl) { mTracklets[0] = trkl; };
   GPUhd() int getSecondTrackletIndex() const { return mTracklets[1]; };
   GPUhd() void setSecondTrackletIndex(int trkl) { mTracklets[1] = trkl; };
-  GPUhd() int getChi2() const { return mChi2; };
+  GPUhd() float getChi2() const { return mChi2; };
   GPUhd() void setChi2(float chi2) { mChi2 = chi2; };
   GPUhd() int getLevel() const { return mLevel; };
   GPUhd() void setLevel(int level) { mLevel = level; };

Detectors/Upgrades/ITS3/workflow/include/ITS3Workflow/RecoWorkflow.h

@@ -26,6 +26,7 @@ namespace o2::its3::reco_workflow
 framework::WorkflowSpec getWorkflow(bool useMC,
                                     const std::string& trmode,
                                     o2::gpu::GPUDataTypes::DeviceType dtype,
+                                    bool useGPUWorkflow,
                                     bool upstreamDigits,
                                     bool upstreamClusters,
                                     bool disableRootOutput,

Detectors/Upgrades/ITS3/workflow/src/RecoWorkflow.cxx

@@ -15,12 +15,18 @@
 #include "ITSWorkflow/ClusterWriterSpec.h"
 #include "ITSWorkflow/TrackWriterSpec.h"
 #include "ITS3Workflow/DigitReaderSpec.h"
-#include "Framework/Logger.h"
+#include "GPUWorkflow/GPUWorkflowSpec.h"
+#include "Framework/CCDBParamSpec.h"
+
+// Dummy pointers
+using CompletionPolicyData = std::vector<InputSpec>;
+static CompletionPolicyData gPolicyData;
+static std::shared_ptr<o2::gpu::GPURecoWorkflowSpec> gTask;
 
 namespace o2::its3::reco_workflow
 {
 
-framework::WorkflowSpec getWorkflow(bool useMC, const std::string& trmode, o2::gpu::GPUDataTypes::DeviceType dtype,
+framework::WorkflowSpec getWorkflow(bool useMC, const std::string& trmode, o2::gpu::GPUDataTypes::DeviceType dtype, bool useGPUWorkflow,
                                     bool upstreamDigits, bool upstreamClusters, bool disableRootOutput, bool useGeom, int useTrig, bool overrideBeamPosition)
 {
   framework::WorkflowSpec specs;
@@ -38,8 +44,36 @@ framework::WorkflowSpec getWorkflow(bool useMC, const std::string& trmode, o2::g
   }
 
   if (trmode != "off") {
-    specs.emplace_back(o2::its3::getTrackerSpec(useMC, useGeom, useTrig, trmode, overrideBeamPosition, dtype));
+    if (useGPUWorkflow) {
+      o2::gpu::GPURecoWorkflowSpec::Config cfg;
+      cfg.runITSTracking = true;
+      cfg.isITS3 = true;
+      cfg.itsTriggerType = useTrig;
+      cfg.itsOverrBeamEst = overrideBeamPosition;
+      cfg.processMC = useMC;
+      Inputs ggInputs;
+      auto ggRequest = std::make_shared<o2::base::GRPGeomRequest>(false, true, false, true, true,
+                                                                  useGeom ? o2::base::GRPGeomRequest::Aligned : o2::base::GRPGeomRequest::None,
+                                                                  ggInputs, true);
+      if (!useGeom) {
+        ggRequest->addInput({"itsTGeo", "ITS", "GEOMTGEO", 0, Lifetime::Condition, framework::ccdbParamSpec("ITS/Config/Geometry")}, ggInputs);
+      }
+
+      auto task = std::make_shared<o2::gpu::GPURecoWorkflowSpec>(&gPolicyData, cfg, std::vector<int>(), 0, ggRequest);
+      gTask = task;
+      Inputs taskInputs = task->inputs();
+      Options taskOptions = task->options();
+      std::move(ggInputs.begin(), ggInputs.end(), std::back_inserter(taskInputs));
 
+      specs.emplace_back(DataProcessorSpec{
+        "its3-gpu-tracker",
+        taskInputs,
+        task->outputs(),
+        AlgorithmSpec{adoptTask<o2::gpu::GPURecoWorkflowSpec>(task)},
+        taskOptions});
+    } else {
+      specs.emplace_back(o2::its3::getTrackerSpec(useMC, useGeom, useTrig, trmode, overrideBeamPosition, dtype));
+    }
     if (!disableRootOutput) {
       specs.emplace_back(o2::its::getTrackWriterSpec(useMC));
     }

Detectors/Upgrades/ITS3/workflow/src/its3-reco-workflow.cxx

@@ -48,6 +48,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
     {"tracking-mode", o2::framework::VariantType::String, "off", {"off,sync,async,cosmics"}},
     {"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings"}},
     {"use-full-geometry", o2::framework::VariantType::Bool, false, {"use full geometry instead of the light-weight IT3 part"}},
+    {"use-gpu-workflow", o2::framework::VariantType::Bool, false, {"use GPU workflow (default: false)"}},
     {"gpu-device", o2::framework::VariantType::Int, 1, {"use gpu device: CPU=1,CUDA=2,HIP=3 (default: CPU)"}}};
   o2::raw::HBFUtilsInitializer::addConfigOption(options);
   std::swap(workflowOptions, options);
@@ -67,6 +68,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   auto extClusters = configcontext.options().get<bool>("clusters-from-upstream");
   auto disableRootOutput = configcontext.options().get<bool>("disable-root-output");
   auto useGeom = configcontext.options().get<bool>("use-full-geometry");
+  auto useGPUWfx = configcontext.options().get<bool>("use-gpu-workflow");
   std::transform(trmode.begin(), trmode.end(), trmode.begin(), [](unsigned char c) { return std::tolower(c); });
 
   o2::conf::ConfigurableParam::updateFromString(configcontext.options().get<std::string>("configKeyValues"));
@@ -80,7 +82,7 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
       LOG(fatal) << "Unknown trigger type requested for events prescaling: " << selTrig;
     }
   }
-  auto wf = o2::its3::reco_workflow::getWorkflow(useMC, trmode, gpuDevice, extDigits, extClusters, disableRootOutput, useGeom, trType, beamPosOVerride);
+  auto wf = o2::its3::reco_workflow::getWorkflow(useMC, trmode, gpuDevice, useGPUWfx, extDigits, extClusters, disableRootOutput, useGeom, trType, beamPosOVerride);
 
   // configure dpl timer to inject correct firstTForbit: start from the 1st orbit of TF containing 1st sampled orbit
   o2::raw::HBFUtilsInitializer hbfIni(configcontext, wf);

Detectors/Vertexing/StrangenessTracking/include/StrangenessTracking/StrangenessTracker.h

@@ -279,20 +279,20 @@ class StrangenessTracker
     for (unsigned int iClus{0}; iClus < ITSclus.size(); ++iClus) {
       auto& clus = ITSclus[iClus];
       auto pattID = clus.getPatternID();
+      auto ib = o2::its3::constants::detID::isDetITS3(clus.getChipID());
       int npix;
       o2::itsmft::ClusterPattern patt;
 
-      if (pattID == o2::itsmft::CompCluster::InvalidPatternID || mdict->isGroup(pattID)) {
+      if (pattID == o2::itsmft::CompCluster::InvalidPatternID || mdict->isGroup(pattID, ib)) {
         patt.acquirePattern(pattIt);
         npix = patt.getNPixels();
       } else {
 
-        npix = mdict->getNpixels(pattID);
-        patt = mdict->getPattern(pattID);
+        npix = mdict->getNpixels(pattID, ib);
+        patt = mdict->getPattern(pattID, ib);
       }
       clusSizeVec[iClus] = npix;
     }
-    // LOG(info) << " Patt Npixel: " << pattVec[0].getNPixels();
   }
 #endif
 

Framework/Core/src/CommonServices.cxx

@@ -44,6 +44,7 @@
 #include "Framework/DeviceConfig.h"
 #include "Framework/DefaultsHelpers.h"
 #include "Framework/Signpost.h"
+#include "Framework/DriverConfig.h"
 
 #include "TextDriverClient.h"
 #include "WSDriverClient.h"
@@ -800,6 +801,9 @@ auto sendRelayerMetrics(ServiceRegistryRef registry, DataProcessingStats& stats)
 
 auto flushStates(ServiceRegistryRef registry, DataProcessingStates& states) -> void
 {
+  if (!registry.get<DriverConfig const>().driverHasGUI) {
+    return;
+  }
   states.flushChangedStates([&states, registry](std::string const& spec, int64_t timestamp, std::string_view value) mutable -> void {
     auto& client = registry.get<ControlService>();
     client.push(spec, value, timestamp);

GPU/Workflow/CMakeLists.txt

@@ -27,7 +27,8 @@ o2_add_library(GPUWorkflow
                                      O2::DataFormatsGlobalTracking
                                      O2::DataFormatsTRD
                PRIVATE_LINK_LIBRARIES O2::GPUTracking
-                                      O2::ITSTrackingInterface)
+                                      O2::ITSTrackingInterface
+                                      $<$<BOOL:${ENABLE_UPGRADES}>:O2::ITS3TrackingInterface>)
 
 o2_add_executable(reco-workflow
        COMPONENT_NAME gpu

GPU/Workflow/include/GPUWorkflow/GPUWorkflowSpec.h

@@ -130,6 +130,7 @@ class GPURecoWorkflowSpec : public o2::framework::Task
     bool runITSTracking = false;
     bool itsOverrBeamEst = false;
     bool tpcTriggerHandling = false;
+    bool isITS3 = false;
   };
 
   GPURecoWorkflowSpec(CompletionPolicyData* policyData, Config const& specconfig, std::vector<int32_t> const& tpcsectors, uint64_t tpcSectorMask, std::shared_ptr<o2::base::GRPGeomRequest>& ggr, std::function<bool(o2::framework::DataProcessingHeader::StartTime)>** gPolicyOrder = nullptr);

GPU/Workflow/src/GPUWorkflowITS.cxx

@@ -20,6 +20,10 @@
 
 #include "ITStracking/TrackingInterface.h"
 
+#ifdef ENABLE_UPGRADES
+#include "ITS3Reconstruction/TrackingInterface.h"
+#endif
+
 namespace o2::gpu
 {
 
@@ -35,6 +39,18 @@ void GPURecoWorkflowSpec::initFunctionITS(o2::framework::InitContext& ic)
 {
   o2::its::VertexerTraits* vtxTraits = nullptr;
   o2::its::TrackerTraits* trkTraits = nullptr;
+#ifdef ENABLE_UPGRADES
+  if (mSpecConfig.isITS3) {
+    mITSTrackingInterface = std::make_unique<o2::its3::ITS3TrackingInterface>(mSpecConfig.processMC,
+                                                                              mSpecConfig.itsTriggerType,
+                                                                              mSpecConfig.itsOverrBeamEst);
+  } else
+#endif
+  {
+    mITSTrackingInterface = std::make_unique<o2::its::ITSTrackingInterface>(mSpecConfig.processMC,
+                                                                            mSpecConfig.itsTriggerType,
+                                                                            mSpecConfig.itsOverrBeamEst);
+  }
   mITSTrackingInterface = std::make_unique<o2::its::ITSTrackingInterface>(mSpecConfig.processMC,
                                                                           mSpecConfig.itsTriggerType,
                                                                           mSpecConfig.itsOverrBeamEst);