Skip to content

ITSMFT: share tracking slab allocation primitives #15730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mpuccio wants to merge 7 commits into
base: dev
Choose a base branch
from
+1,203 −677
Open

ITSMFT: share tracking slab allocation primitives #15730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
24d008e
ITSMFT: share tracking slab allocation primitives
mpuccio Aug 27, 2026
6229d42
ITSMFT: complete tracking allocation migration
mpuccio Aug 27, 2026
cf52edd
ITSMFT: reuse capacity estimator statistics storage
mpuccio Aug 27, 2026
591c678
ITSMFT: establish common tracking dependency direction
mpuccio Aug 27, 2026
9f24e0b
ITSMFT: move shared tracking support out of ITS
mpuccio Aug 27, 2026
79f32e0
Address ITSMFT tracking review feedback
mpuccio Aug 28, 2026
3df7d03
ITSMFT: decouple capacity estimator from slab sink statistics
mpuccio Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Detectors/ITSMFT/ITS/tracking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ o2_add_library(ITStracking
TARGETVARNAME targetName
SOURCES src/ClusterLines.cxx
src/Cluster.cxx
src/CapacityEstimator.cxx
src/Configuration.cxx
src/FastMultEstConfig.cxx
src/FastMultEst.cxx
Expand All @@ -22,7 +21,6 @@ o2_add_library(ITStracking
src/IOUtils.cxx
src/Tracker.cxx
src/TrackerTraits.cxx
src/TrackingConfigParam.cxx
src/Vertexer.cxx
src/VertexerTraits.cxx
PUBLIC_LINK_LIBRARIES
Expand All @@ -36,9 +34,11 @@ o2_add_library(ITStracking
O2::ITSReconstruction
O2::ITSMFTReconstruction
O2::DataFormatsITS
O2::ITSMFTTracking
PRIVATE_LINK_LIBRARIES
O2::Steer
TBB::tbb)

# target_compile_options(${targetName} PRIVATE -O0 -g -fPIC -fno-omit-frame-pointer)

o2_add_library(ITSTrackingInterface
Expand All @@ -55,7 +55,6 @@ o2_target_root_dictionary(ITStracking
include/ITStracking/Cluster.h
include/ITStracking/Definitions.h
include/ITStracking/FastMultEstConfig.h
include/ITStracking/TrackingConfigParam.h
LINKDEF src/TrackingLinkDef.h)

if(CUDA_ENABLED OR HIP_ENABLED)
Expand Down
2 changes: 1 addition & 1 deletion Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/TimeFrameGPU.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <gsl/gsl>
#include <bitset>

#include "ITStracking/BoundedAllocator.h"
#include "ITSMFTTracking/BoundedAllocator.h"
#include "ITStracking/TimeFrame.h"
#include "ITStracking/Configuration.h"
#include "ITStracking/TrackExtensionHypothesis.h"
Expand Down
9 changes: 6 additions & 3 deletions Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/TrackingKernels.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,19 @@
#include <array>
#include <gsl/gsl>

#include "ITStracking/BoundedAllocator.h"
#include "ITStracking/CapacityEstimator.h"
#include "ITStracking/ROFLookupTables.h"
#include "ITSMFTTracking/BoundedAllocator.h"
#include "ITSMFTTracking/CapacityEstimator.h"
#include "ITSMFTTracking/ROFLookupTables.h"
#include "ITStracking/TrackingTopology.h"
#include "ITStracking/TrackExtensionHypothesis.h"
#include "ITStrackingGPU/Utils.h"
#include "DetectorsBase/Propagator.h"

namespace o2::its
{
using o2::itsmft::tracking::bounded_vector;
using o2::itsmft::tracking::CapacityEstimator;

class CellSeed;
struct CellNeighbour;
template <int>
Expand Down
2 changes: 1 addition & 1 deletion Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/Utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <string>
#include <tuple>

#include "ITStracking/MathUtils.h"
#include "ITSMFTTracking/MathUtils.h"
#include "ITStracking/ExternalAllocator.h"

#include "GPUCommonDef.h"
Expand Down
4 changes: 2 additions & 2 deletions Detectors/ITSMFT/ITS/tracking/GPU/cuda/TimeFrameGPU.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <vector>

#include "ITStrackingGPU/TimeFrameGPU.h"
#include "ITStracking/Constants.h"
#include "ITStracking/BoundedAllocator.h"
#include "ITSMFTTracking/Constants.h"
#include "ITSMFTTracking/BoundedAllocator.h"
#include "ITStrackingGPU/Utils.h"

#include "GPUCommonDef.h"
Expand Down
3 changes: 3 additions & 0 deletions Detectors/ITSMFT/ITS/tracking/GPU/cuda/TrackerTraitsGPU.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
namespace o2::its
{

using o2::itsmft::tracking::runOnSlab;
using o2::itsmft::tracking::SlabSite;

template <int NLayers>
void TrackerTraitsGPU<NLayers>::initialiseTimeFrame(const int iteration)
{
Expand Down
7 changes: 5 additions & 2 deletions Detectors/ITSMFT/ITS/tracking/GPU/cuda/TrackingKernels.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
#include <thrust/unique.h>

#include "DataFormatsITS/TrackITS.h"
#include "ITStracking/Constants.h"
#include "ITSMFTTracking/Constants.h"
#include "ITStracking/Definitions.h"
#include "ITStracking/IndexTableUtils.h"
#include "ITStrackingGPU/LaunchGeometry.h"
#include "ITStracking/MathUtils.h"
#include "ITSMFTTracking/MathUtils.h"
#include "ITStracking/ExternalAllocator.h"
#include "ITStracking/Tracklet.h"
#include "ITStracking/Cluster.h"
Expand All @@ -52,6 +52,9 @@ using namespace o2::track;

namespace o2::its
{

using o2::itsmft::tracking::runOnSlab;
using o2::itsmft::tracking::SlabSite;
namespace gpu
{

Expand Down
Loading
Loading