test

Author: f3sch

Detectors/ITSMFT/ITS/tracking/GPU/cuda/TimeFrameGPU.cu

@@ -469,7 +469,7 @@ template <int nLayers>
 void TimeFrameGPU<nLayers>::createTrackITSExtDevice(bounded_vector<CellSeed>& seeds)
 {
   START_GPU_STREAM_TIMER(mGpuStreams[0]->get(), "reserving tracks");
-  mTrackITSExt = bounded_vector<TrackITSExt>(seeds.size(), this->getMemoryPool().get());
+  mTrackITSExt = bounded_vector<TrackITSExt>(seeds.size(), {}, this->getMemoryPool().get());
   LOGP(debug, "gpu-allocation: reserving {} tracks, for {} MB.", seeds.size(), seeds.size() * sizeof(o2::its::TrackITSExt) / MB);
   allocMemAsync(reinterpret_cast<void**>(&mTrackITSExtDevice), seeds.size() * sizeof(o2::its::TrackITSExt), mGpuStreams[0], this->getExtAllocator());
   GPUChkErrS(cudaMemsetAsync(mTrackITSExtDevice, 0, seeds.size() * sizeof(o2::its::TrackITSExt), mGpuStreams[0]->get()));

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

@@ -271,7 +271,7 @@ struct TimeFrame {
   int mNrof = 0;
   int mNExtendedTracks{0};
   int mNExtendedUsedClusters{0};
-  bounded_vector<int> mROFramesPV = {0};
+  bounded_vector<int> mROFramesPV;
   bounded_vector<Vertex> mPrimaryVertices;
 
   // State if memory will be externally managed.

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

@@ -32,8 +32,6 @@
 #include "GPUCommonDef.h"
 #include "GPUCommonMath.h"
 
-#include <oneapi/tbb.h>
-#include <oneapi/tbb/partitioner.h>
 #include <oneapi/tbb/task_arena.h>
 
 namespace o2
@@ -129,7 +127,6 @@ class VertexerTraits
  private:
   std::shared_ptr<BoundedMemoryResource> mMemoryPool;
   tbb::task_arena mTaskArena;
-  tbb::affinity_partitioner mPartitioner;
 };
 
 inline void VertexerTraits::initialise(const TrackingParameters& trackingParams, const int iteration)

Detectors/ITSMFT/ITS/tracking/src/TimeFrame.cxx

@@ -267,7 +267,7 @@ void TimeFrame<nLayers>::prepareClusters(const TrackingParameters& trkParam, con
         h.bin = bin;
         h.ind = clsPerBin[bin]++;
       }
-      bounded_vector<int> lutPerBin(clsPerBin.size(), mMemoryPool.get());
+      bounded_vector<int> lutPerBin(clsPerBin.size(), 0, mMemoryPool.get());
       lutPerBin[0] = 0;
       for (unsigned int iB{1}; iB < lutPerBin.size(); ++iB) {
         lutPerBin[iB] = lutPerBin[iB - 1] + clsPerBin[iB - 1];

Detectors/ITSMFT/ITS/tracking/src/Tracker.cxx

@@ -124,7 +124,7 @@ void Tracker::clustersToTracks(LogFunc logger, LogFunc error)
     }
     if (mTraits->supportsFindShortPrimaries() && mTrkParams[0].FindShortTracks) {
       auto nTracksB = mTimeFrame->getNumberOfTracks();
-      total += evaluateTask(&Tracker::findShortPrimaries, "Short primaries finding", iteration, logger);
+      total += evaluateTask(&Tracker::findShortPrimaries, "Short primaries finding", 0, logger);
       auto nTracksA = mTimeFrame->getNumberOfTracks();
       logger(std::format("  `-> found {} additional tracks", nTracksA - nTracksB));
     }

Detectors/ITSMFT/ITS/tracking/src/VertexerTraits.cxx

@@ -14,6 +14,9 @@
 #include <string>
 #include <chrono>
 
+#include <oneapi/tbb/blocked_range.h>
+#include <oneapi/tbb/parallel_for.h>
+
 #include "ITStracking/VertexerTraits.h"
 #include "ITStracking/BoundedAllocator.h"
 #include "ITStracking/ClusterLines.h"
@@ -180,8 +183,8 @@ void VertexerTraits::computeTracklets(const int iteration)
   mTaskArena.execute([&] {
     tbb::parallel_for(
       tbb::blocked_range<short>(0, (short)mTimeFrame->getNrof()),
-      [&](const tbb::blocked_range<short>& rofs) {
-        for (short pivotRofId = rofs.begin(); pivotRofId < rofs.end(); ++pivotRofId) {
+      [&](const tbb::blocked_range<short>& Rofs) {
+        for (short pivotRofId = Rofs.begin(); pivotRofId < Rofs.end(); ++pivotRofId) {
           bool skipROF = iteration && (int)mTimeFrame->getPrimaryVertices(pivotRofId).size() > mVrtParams[iteration].vertPerRofThreshold;
           short startROF{std::max((short)0, static_cast<short>(pivotRofId - mVrtParams[iteration].deltaRof))};
           short endROF{std::min(static_cast<short>(mTimeFrame->getNrof()), static_cast<short>(pivotRofId + mVrtParams[iteration].deltaRof + 1))};
@@ -216,8 +219,7 @@ void VertexerTraits::computeTracklets(const int iteration)
           mTimeFrame->getNTrackletsROF(pivotRofId, 0) = std::accumulate(mTimeFrame->getNTrackletsCluster(pivotRofId, 0).begin(), mTimeFrame->getNTrackletsCluster(pivotRofId, 0).end(), 0);
           mTimeFrame->getNTrackletsROF(pivotRofId, 1) = std::accumulate(mTimeFrame->getNTrackletsCluster(pivotRofId, 1).begin(), mTimeFrame->getNTrackletsCluster(pivotRofId, 1).end(), 0);
         }
-      },
-      mPartitioner);
+      });
   });
 
   mTimeFrame->computeTrackletsPerROFScans();
@@ -227,8 +229,8 @@ void VertexerTraits::computeTracklets(const int iteration)
   mTaskArena.execute([&] {
     tbb::parallel_for(
       tbb::blocked_range<short>(0, (short)mTimeFrame->getNrof()),
-      [&](const tbb::blocked_range<short>& rofs) {
-        for (short pivotRofId = rofs.begin(); pivotRofId < rofs.end(); ++pivotRofId) {
+      [&](const tbb::blocked_range<short>& Rofs) {
+        for (short pivotRofId = Rofs.begin(); pivotRofId < Rofs.end(); ++pivotRofId) {
           bool skipROF = iteration && (int)mTimeFrame->getPrimaryVertices(pivotRofId).size() > mVrtParams[iteration].vertPerRofThreshold;
           short startROF{std::max((short)0, static_cast<short>(pivotRofId - mVrtParams[iteration].deltaRof))};
           short endROF{std::min(static_cast<short>(mTimeFrame->getNrof()), static_cast<short>(pivotRofId + mVrtParams[iteration].deltaRof + 1))};
@@ -263,8 +265,7 @@ void VertexerTraits::computeTracklets(const int iteration)
               mVrtParams[iteration].maxTrackletsPerCluster);
           }
         }
-      },
-      mPartitioner);
+      });
   });
 
   /// Create tracklets labels for L0-L1, information is as flat as in tracklets vector (no rofId)
@@ -337,8 +338,8 @@ void VertexerTraits::computeTrackletMatching(const int iteration)
   mTaskArena.execute([&] {
     tbb::parallel_for(
       tbb::blocked_range<short>(0, (short)mTimeFrame->getNrof()),
-      [&](const tbb::blocked_range<short>& rofs) {
-        for (short pivotRofId = rofs.begin(); pivotRofId < rofs.end(); ++pivotRofId) {
+      [&](const tbb::blocked_range<short>& Rofs) {
+        for (short pivotRofId = Rofs.begin(); pivotRofId < Rofs.end(); ++pivotRofId) {
           if (iteration && (int)mTimeFrame->getPrimaryVertices(pivotRofId).size() > mVrtParams[iteration].vertPerRofThreshold) {
             continue;
           }