Merge branch 'AliceO2Group:dev' into bug-fixes

Author: ChSonnabend

.github/workflows/code-transformations.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         persist-credentials: false

.github/workflows/datamodel-doc.yml

@@ -10,20 +10,20 @@ jobs:
     steps:
 
       - name: Checkout O2
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: O2
           persist-credentials: false
 
       - name: Checkout O2Physics
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: AliceO2Group/O2Physics
           path: O2Physics
           persist-credentials: false
 
       - name: Checkout documentation
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: AliceO2Group/analysis-framework
           path: analysis-framework
@@ -40,7 +40,7 @@ jobs:
           git checkout -B auto-datamodel-doc
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.x
 

.github/workflows/doxygen.yml

@@ -13,7 +13,7 @@ jobs:
       run: |
         sudo apt-get update -y
         sudo apt-get install -y doxygen doxygen-doc doxygen-latex doxygen-gui graphviz cmake
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: "dev"
         persist-credentials: false

.github/workflows/first-timer.yml

@@ -8,7 +8,7 @@ jobs:
   nag_first_timer:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/first-interaction@v1
+    - uses: actions/first-interaction@v3
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         pr-message: 'This seems to be your first PR. You will need a positive review in order for tests to start.'

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
         branch=$(echo ${{ github.event.inputs.tag }}-patches | tr . - | sed -e's/-[0-9]*-patches$/-patches/')
         EOF
       id: decide_release_branch
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: "dev"
     - name: Tag branch (or create one before tagging if does not exists)

.github/workflows/reports.yml

@@ -17,9 +17,9 @@ jobs:
     if: github.repository == 'AliceO2Group/AliceO2'
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up Python 3.10
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: '3.10'
     - uses: actions/cache@v4

.github/workflows/stale.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v9
+    - uses: actions/stale@v10
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-pr-message: 'This PR did not have any update in the last 30 days. Is it still needed? Unless further action in will be closed in 5 days.'

DataFormats/Detectors/TPC/include/DataFormatsTPC/RawDataTypes.h

@@ -28,6 +28,7 @@ enum Type : char {
   ZS = 2,      ///< final Zero Suppression (can be ILBZS, DLBZS)
   IDC = 3,     ///< Integrated Digitial Currents, with priority bit to end up in separate buffer
   SAC = 4,     ///< Sampled Analogue Currents from the current monitor
+  CMV = 5,     ///< Common mode values
 };
 
 const std::unordered_map<Type, std::string_view> TypeNameMap{
@@ -36,6 +37,7 @@ const std::unordered_map<Type, std::string_view> TypeNameMap{
   {Type::ZS, "ZS"},
   {Type::IDC, "IDC"},
   {Type::SAC, "SAC"},
+  {Type::CMV, "CMV"},
 };
 
 } // namespace o2::tpc::raw_data_types

Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/TimeFrameGPU.h

@@ -25,13 +25,13 @@ namespace o2::its::gpu
 {
 
 template <int nLayers = 7>
-class TimeFrameGPU : public TimeFrame<nLayers>
+class TimeFrameGPU final : public TimeFrame<nLayers>
 {
   using typename TimeFrame<nLayers>::CellSeedN;
   using typename TimeFrame<nLayers>::IndexTableUtilsN;
 
  public:
-  TimeFrameGPU();
+  TimeFrameGPU() = default;
   ~TimeFrameGPU() = default;
 
   /// Most relevant operations
@@ -44,13 +44,13 @@ class TimeFrameGPU : public TimeFrame<nLayers>
   void loadTrackingFrameInfoDevice(const int, const int);
   void createTrackingFrameInfoDeviceArray(const int);
   void loadUnsortedClustersDevice(const int, const int);
-  void createUnsortedClustersDeviceArray(const int);
+  void createUnsortedClustersDeviceArray(const int, const int = nLayers);
   void loadClustersDevice(const int, const int);
-  void createClustersDeviceArray(const int);
+  void createClustersDeviceArray(const int, const int = nLayers);
   void loadClustersIndexTables(const int, const int);
-  void createClustersIndexTablesArray(const int iteration);
+  void createClustersIndexTablesArray(const int);
   void createUsedClustersDevice(const int, const int);
-  void createUsedClustersDeviceArray(const int);
+  void createUsedClustersDeviceArray(const int, const int = nLayers);
   void loadUsedClustersDevice();
   void loadROFrameClustersDevice(const int, const int);
   void createROFrameClustersDeviceArray(const int);
@@ -85,6 +85,12 @@ class TimeFrameGPU : public TimeFrame<nLayers>
   void downloadCellsDevice();
   void downloadCellsLUTDevice();
 
+  /// Vertexer
+  void createVtxTrackletsLUTDevice(const int32_t);
+  void createVtxTrackletsBuffers(const int32_t);
+  void createVtxLinesLUTDevice(const int32_t);
+  void createVtxLinesBuffer(const int32_t);
+
   /// synchronization
   auto& getStream(const size_t stream) { return mGpuStreams[stream]; }
   auto& getStreams() { return mGpuStreams; }
@@ -98,6 +104,8 @@ class TimeFrameGPU : public TimeFrame<nLayers>
   virtual void wipe() final;
 
   /// interface
+  virtual bool isGPU() const noexcept final { return true; }
+  virtual const char* getName() const noexcept { return "GPU"; }
   int getNClustersInRofSpan(const int, const int, const int) const;
   IndexTableUtilsN* getDeviceIndexTableUtils() { return mIndexTableUtilsDevice; }
   int* getDeviceROFramesClusters(const int layer) { return mROFramesClustersDevice[layer]; }
@@ -122,7 +130,7 @@ class TimeFrameGPU : public TimeFrame<nLayers>
   const Cluster** getDeviceArrayUnsortedClusters() const { return mUnsortedClustersDeviceArray; }
   const int** getDeviceArrayClustersIndexTables() const { return mClustersIndexTablesDeviceArray; }
   std::vector<unsigned int> getClusterSizes();
-  const unsigned char** getDeviceArrayUsedClusters() const { return mUsedClustersDeviceArray; }
+  uint8_t** getDeviceArrayUsedClusters() const { return mUsedClustersDeviceArray; }
   const int** getDeviceROFrameClusters() const { return mROFramesClustersDeviceArray; }
   Tracklet** getDeviceArrayTracklets() { return mTrackletsDeviceArray; }
   int** getDeviceArrayTrackletsLUT() const { return mTrackletsLUTDeviceArray; }
@@ -135,6 +143,19 @@ class TimeFrameGPU : public TimeFrame<nLayers>
   int* getDeviceNeighboursIndexTables(const int layer) { return mNeighboursIndexTablesDevice[layer]; }
   uint8_t* getDeviceMultCutMask() { return mMultMaskDevice; }
 
+  // Vertexer
+  auto& getDeviceNTrackletsPerROF() const noexcept { return mNTrackletsPerROFDevice; }
+  auto& getDeviceNTrackletsPerCluster() const noexcept { return mNTrackletsPerClusterDevice; }
+  auto& getDeviceNTrackletsPerClusterSum() const noexcept { return mNTrackletsPerClusterSumDevice; }
+  int32_t** getDeviceArrayNTrackletsPerROF() const noexcept { return mNTrackletsPerROFDeviceArray; }
+  int32_t** getDeviceArrayNTrackletsPerCluster() const noexcept { return mNTrackletsPerClusterDeviceArray; }
+  int32_t** getDeviceArrayNTrackletsPerClusterSum() const noexcept { return mNTrackletsPerClusterSumDeviceArray; }
+  uint8_t* getDeviceUsedTracklets() const noexcept { return mUsedTrackletsDevice; }
+  int32_t* getDeviceNLinesPerCluster() const noexcept { return mNLinesPerClusterDevice; }
+  int32_t* getDeviceNLinesPerClusterSum() const noexcept { return mNLinesPerClusterSumDevice; }
+  Line* getDeviceLines() const noexcept { return mLinesDevice; }
+  gsl::span<int*> getDeviceTrackletsPerROFs() { return mNTrackletsPerROFDevice; }
+
   void setDevicePropagator(const o2::base::PropagatorImpl<float>* p) final { this->mPropagatorDevice = p; }
 
   // Host-specific getters
@@ -180,7 +201,7 @@ class TimeFrameGPU : public TimeFrame<nLayers>
   const Cluster** mClustersDeviceArray;
   const Cluster** mUnsortedClustersDeviceArray;
   const int** mClustersIndexTablesDeviceArray;
-  const unsigned char** mUsedClustersDeviceArray;
+  uint8_t** mUsedClustersDeviceArray;
   const int** mROFramesClustersDeviceArray;
   std::array<Tracklet*, nLayers - 1> mTrackletsDevice;
   std::array<int*, nLayers - 1> mTrackletsLUTDevice;
@@ -208,6 +229,18 @@ class TimeFrameGPU : public TimeFrame<nLayers>
   std::array<TrackingFrameInfo*, nLayers> mTrackingFrameInfoDevice;
   const TrackingFrameInfo** mTrackingFrameInfoDeviceArray;
 
+  /// Vertexer
+  std::array<int32_t*, 2> mNTrackletsPerROFDevice;
+  std::array<int32_t*, 2> mNTrackletsPerClusterDevice;
+  std::array<int32_t*, 2> mNTrackletsPerClusterSumDevice;
+  uint8_t* mUsedTrackletsDevice;
+  int32_t* mNLinesPerClusterDevice;
+  int32_t* mNLinesPerClusterSumDevice;
+  int32_t** mNTrackletsPerROFDeviceArray;
+  int32_t** mNTrackletsPerClusterDeviceArray;
+  int32_t** mNTrackletsPerClusterSumDeviceArray;
+  Line* mLinesDevice;
+
   // State
   Streams mGpuStreams;
   std::bitset<nLayers + 1> mPinnedUnsortedClusters{0};