ITS GPU: Switch to using externally-provided o2::Propagator also for HIP

mhemmer-cern · Mar 26, 2024 · 86261fe · 86261fe
1 parent c7e4766
commit 86261fe
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 24 deletions.
diff --git a/Detectors/ITSMFT/ITS/tracking/GPU/cuda/TrackingKernels.cu b/Detectors/ITSMFT/ITS/tracking/GPU/cuda/TrackingKernels.cu
@@ -42,10 +42,6 @@
 // O2 track model
 #include "ReconstructionDataFormats/Track.h"
 using namespace o2::track;
-#ifdef __HIPCC__
-#include "TrackParametrization.cxx"
-#include "TrackParametrizationWithError.cxx"
-#endif
 
 namespace o2
 {

diff --git a/Detectors/ITSMFT/ITS/tracking/GPU/hip/CMakeLists.txt b/Detectors/ITSMFT/ITS/tracking/GPU/hip/CMakeLists.txt
@@ -23,30 +23,11 @@ if(HIP_ENABLED)
                          ../cuda/VertexerTraitsGPU.cu
                          ../cuda/Utils.cu
                  PUBLIC_INCLUDE_DIRECTORIES ../
-                 PRIVATE_INCLUDE_DIRECTORIES
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking/Base
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking/Base/hip
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking/DataTypes
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking/Global               # "GPUErrors.h"
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking/SliceTracker
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking/TRDTracking          # GPUTRDTracker.h
-                       ${CMAKE_SOURCE_DIR}/DataFormats/Reconstruction/src
-                       ${CMAKE_SOURCE_DIR}/DataFormats/Detectors/TPC/include    # "DataFormatsTPC/dEdxInfo.h"
-                       ${CMAKE_SOURCE_DIR}/DataFormats/Detectors/TRD/include    # "DataFormatsTRD/Constants.h"
-                       ${CMAKE_SOURCE_DIR}/Detectors/Base/src
-                       ${CMAKE_SOURCE_DIR}/Detectors/TRD/base/include           # "TRDBase/GeometryFlat.h"
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking/Definitions
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking/Merger
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking/TPCConvert
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking/DataCompression
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking/ITS
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking/TPCClusterFinder
-                       ${CMAKE_SOURCE_DIR}/GPU/GPUTracking/Refit
                  PUBLIC_LINK_LIBRARIES O2::ITStracking
                                        O2::GPUTracking
                                        O2::SimulationDataFormat
                                        O2::ReconstructionDataFormats
                                        hip::host
+                 PRIVATE_LINK_LIBRARIES O2::GPUTrackingHIPExternalProvider
                  TARGETVARNAME targetName)
 endif()