Skip to content

Commit e4eaccd

Browse files
authored
ITSMFT: share tracking slab allocation primitives (#15730)
* ITSMFT: share tracking slab allocation primitives * ITSMFT: complete tracking allocation migration * ITSMFT: reuse capacity estimator statistics storage * ITSMFT: establish common tracking dependency direction * ITSMFT: move shared tracking support out of ITS * Address ITSMFT tracking review feedback * ITSMFT: decouple capacity estimator from slab sink statistics
1 parent 10dad2d commit e4eaccd

69 files changed

Lines changed: 1203 additions & 677 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Detectors/ITSMFT/ITS/tracking/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ o2_add_library(ITStracking
1313
TARGETVARNAME targetName
1414
SOURCES src/ClusterLines.cxx
1515
src/Cluster.cxx
16-
src/CapacityEstimator.cxx
1716
src/Configuration.cxx
1817
src/FastMultEstConfig.cxx
1918
src/FastMultEst.cxx
@@ -22,7 +21,6 @@ o2_add_library(ITStracking
2221
src/IOUtils.cxx
2322
src/Tracker.cxx
2423
src/TrackerTraits.cxx
25-
src/TrackingConfigParam.cxx
2624
src/Vertexer.cxx
2725
src/VertexerTraits.cxx
2826
PUBLIC_LINK_LIBRARIES
@@ -36,9 +34,11 @@ o2_add_library(ITStracking
3634
O2::ITSReconstruction
3735
O2::ITSMFTReconstruction
3836
O2::DataFormatsITS
37+
O2::ITSMFTTracking
3938
PRIVATE_LINK_LIBRARIES
4039
O2::Steer
4140
TBB::tbb)
41+
4242
# target_compile_options(${targetName} PRIVATE -O0 -g -fPIC -fno-omit-frame-pointer)
4343

4444
o2_add_library(ITSTrackingInterface
@@ -55,7 +55,6 @@ o2_target_root_dictionary(ITStracking
5555
include/ITStracking/Cluster.h
5656
include/ITStracking/Definitions.h
5757
include/ITStracking/FastMultEstConfig.h
58-
include/ITStracking/TrackingConfigParam.h
5958
LINKDEF src/TrackingLinkDef.h)
6059

6160
if(CUDA_ENABLED OR HIP_ENABLED)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <gsl/gsl>
1717
#include <bitset>
1818

19-
#include "ITStracking/BoundedAllocator.h"
19+
#include "ITSMFTTracking/BoundedAllocator.h"
2020
#include "ITStracking/TimeFrame.h"
2121
#include "ITStracking/Configuration.h"
2222
#include "ITStracking/TrackExtensionHypothesis.h"

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,19 @@
1616
#include <array>
1717
#include <gsl/gsl>
1818

19-
#include "ITStracking/BoundedAllocator.h"
20-
#include "ITStracking/CapacityEstimator.h"
21-
#include "ITStracking/ROFLookupTables.h"
19+
#include "ITSMFTTracking/BoundedAllocator.h"
20+
#include "ITSMFTTracking/CapacityEstimator.h"
21+
#include "ITSMFTTracking/ROFLookupTables.h"
2222
#include "ITStracking/TrackingTopology.h"
2323
#include "ITStracking/TrackExtensionHypothesis.h"
2424
#include "ITStrackingGPU/Utils.h"
2525
#include "DetectorsBase/Propagator.h"
2626

2727
namespace o2::its
2828
{
29+
using o2::itsmft::tracking::bounded_vector;
30+
using o2::itsmft::tracking::CapacityEstimator;
31+
2932
class CellSeed;
3033
struct CellNeighbour;
3134
template <int>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <string>
2121
#include <tuple>
2222

23-
#include "ITStracking/MathUtils.h"
23+
#include "ITSMFTTracking/MathUtils.h"
2424
#include "ITStracking/ExternalAllocator.h"
2525

2626
#include "GPUCommonDef.h"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include <vector>
2121

2222
#include "ITStrackingGPU/TimeFrameGPU.h"
23-
#include "ITStracking/Constants.h"
24-
#include "ITStracking/BoundedAllocator.h"
23+
#include "ITSMFTTracking/Constants.h"
24+
#include "ITSMFTTracking/BoundedAllocator.h"
2525
#include "ITStrackingGPU/Utils.h"
2626

2727
#include "GPUCommonDef.h"

Detectors/ITSMFT/ITS/tracking/GPU/cuda/TrackerTraitsGPU.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
namespace o2::its
2121
{
2222

23+
using o2::itsmft::tracking::runOnSlab;
24+
using o2::itsmft::tracking::SlabSite;
25+
2326
template <int NLayers>
2427
void TrackerTraitsGPU<NLayers>::initialiseTimeFrame(const int iteration)
2528
{

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
#include <thrust/unique.h>
3030

3131
#include "DataFormatsITS/TrackITS.h"
32-
#include "ITStracking/Constants.h"
32+
#include "ITSMFTTracking/Constants.h"
3333
#include "ITStracking/Definitions.h"
3434
#include "ITStracking/IndexTableUtils.h"
3535
#include "ITStrackingGPU/LaunchGeometry.h"
36-
#include "ITStracking/MathUtils.h"
36+
#include "ITSMFTTracking/MathUtils.h"
3737
#include "ITStracking/ExternalAllocator.h"
3838
#include "ITStracking/Tracklet.h"
3939
#include "ITStracking/Cluster.h"
@@ -52,6 +52,9 @@ using namespace o2::track;
5252

5353
namespace o2::its
5454
{
55+
56+
using o2::itsmft::tracking::runOnSlab;
57+
using o2::itsmft::tracking::SlabSite;
5558
namespace gpu
5659
{
5760

0 commit comments

Comments
 (0)