Skip to content

Commit a478634

Browse files
ChSonnabendChSonnabend
committed
Modifications from comments on PR
1 parent 815cc30 commit a478634

File tree

7 files changed

+310
-150
lines changed

7 files changed

+310
-150
lines changed

‎GPU/GPUTracking/CMakeLists.txt‎

Lines changed: 97 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -158,37 +158,71 @@ set(HDRS_INSTALL
158158
)
159159

160160
set(SRCS_NO_CINT ${SRCS_NO_CINT} display/GPUDisplayInterface.cxx)
161-
set(SRCS_NO_CINT ${SRCS_NO_CINT}
162-
Global/GPUChainITS.cxx
163-
ITS/GPUITSFitter.cxx
164-
ITS/GPUITSFitterKernels.cxx
165-
dEdx/GPUdEdx.cxx
166-
TPCConvert/GPUTPCConvert.cxx
167-
TPCConvert/GPUTPCConvertKernel.cxx
168-
DataCompression/GPUTPCCompression.cxx
169-
DataCompression/GPUTPCCompressionTrackModel.cxx
170-
DataCompression/GPUTPCCompressionKernels.cxx
171-
DataCompression/GPUTPCDecompression.cxx
172-
DataCompression/GPUTPCDecompressionKernels.cxx
173-
DataCompression/TPCClusterDecompressor.cxx
174-
DataCompression/GPUTPCClusterStatistics.cxx
175-
TPCClusterFinder/GPUTPCClusterFinder.cxx
176-
TPCClusterFinder/ClusterAccumulator.cxx
177-
TPCClusterFinder/MCLabelAccumulator.cxx
178-
TPCClusterFinder/GPUTPCCFCheckPadBaseline.cxx
179-
TPCClusterFinder/GPUTPCCFStreamCompaction.cxx
180-
TPCClusterFinder/GPUTPCCFChargeMapFiller.cxx
181-
TPCClusterFinder/GPUTPCCFPeakFinder.cxx
182-
TPCClusterFinder/GPUTPCCFNoiseSuppression.cxx
183-
TPCClusterFinder/GPUTPCCFClusterizer.cxx
184-
TPCClusterFinder/GPUTPCNNClusterizer.cxx
185-
TPCClusterFinder/GPUTPCCFDeconvolution.cxx
186-
TPCClusterFinder/GPUTPCCFMCLabelFlattener.cxx
187-
TPCClusterFinder/GPUTPCCFDecodeZS.cxx
188-
TPCClusterFinder/GPUTPCCFGather.cxx
189-
Refit/GPUTrackingRefit.cxx
190-
Refit/GPUTrackingRefitKernel.cxx
191-
Merger/GPUTPCGMO2Output.cxx)
161+
162+
if(NOT ALIGPU_BUILD_TYPE STREQUAL "Standalone")
163+
set(SRCS_NO_CINT ${SRCS_NO_CINT}
164+
Global/GPUChainITS.cxx
165+
ITS/GPUITSFitter.cxx
166+
ITS/GPUITSFitterKernels.cxx
167+
dEdx/GPUdEdx.cxx
168+
TPCConvert/GPUTPCConvert.cxx
169+
TPCConvert/GPUTPCConvertKernel.cxx
170+
DataCompression/GPUTPCCompression.cxx
171+
DataCompression/GPUTPCCompressionTrackModel.cxx
172+
DataCompression/GPUTPCCompressionKernels.cxx
173+
DataCompression/GPUTPCDecompression.cxx
174+
DataCompression/GPUTPCDecompressionKernels.cxx
175+
DataCompression/TPCClusterDecompressor.cxx
176+
DataCompression/GPUTPCClusterStatistics.cxx
177+
TPCClusterFinder/GPUTPCClusterFinder.cxx
178+
TPCClusterFinder/ClusterAccumulator.cxx
179+
TPCClusterFinder/MCLabelAccumulator.cxx
180+
TPCClusterFinder/GPUTPCCFCheckPadBaseline.cxx
181+
TPCClusterFinder/GPUTPCCFStreamCompaction.cxx
182+
TPCClusterFinder/GPUTPCCFChargeMapFiller.cxx
183+
TPCClusterFinder/GPUTPCCFPeakFinder.cxx
184+
TPCClusterFinder/GPUTPCCFNoiseSuppression.cxx
185+
TPCClusterFinder/GPUTPCCFClusterizer.cxx
186+
TPCClusterFinder/GPUTPCNNClusterizer.cxx
187+
TPCClusterFinder/GPUTPCCFDeconvolution.cxx
188+
TPCClusterFinder/GPUTPCCFMCLabelFlattener.cxx
189+
TPCClusterFinder/GPUTPCCFDecodeZS.cxx
190+
TPCClusterFinder/GPUTPCCFGather.cxx
191+
Refit/GPUTrackingRefit.cxx
192+
Refit/GPUTrackingRefitKernel.cxx
193+
Merger/GPUTPCGMO2Output.cxx)
194+
else()
195+
set(SRCS_NO_CINT ${SRCS_NO_CINT}
196+
Global/GPUChainITS.cxx
197+
ITS/GPUITSFitter.cxx
198+
ITS/GPUITSFitterKernels.cxx
199+
dEdx/GPUdEdx.cxx
200+
TPCConvert/GPUTPCConvert.cxx
201+
TPCConvert/GPUTPCConvertKernel.cxx
202+
DataCompression/GPUTPCCompression.cxx
203+
DataCompression/GPUTPCCompressionTrackModel.cxx
204+
DataCompression/GPUTPCCompressionKernels.cxx
205+
DataCompression/GPUTPCDecompression.cxx
206+
DataCompression/GPUTPCDecompressionKernels.cxx
207+
DataCompression/TPCClusterDecompressor.cxx
208+
DataCompression/GPUTPCClusterStatistics.cxx
209+
TPCClusterFinder/GPUTPCClusterFinder.cxx
210+
TPCClusterFinder/ClusterAccumulator.cxx
211+
TPCClusterFinder/MCLabelAccumulator.cxx
212+
TPCClusterFinder/GPUTPCCFCheckPadBaseline.cxx
213+
TPCClusterFinder/GPUTPCCFStreamCompaction.cxx
214+
TPCClusterFinder/GPUTPCCFChargeMapFiller.cxx
215+
TPCClusterFinder/GPUTPCCFPeakFinder.cxx
216+
TPCClusterFinder/GPUTPCCFNoiseSuppression.cxx
217+
TPCClusterFinder/GPUTPCCFClusterizer.cxx
218+
TPCClusterFinder/GPUTPCCFDeconvolution.cxx
219+
TPCClusterFinder/GPUTPCCFMCLabelFlattener.cxx
220+
TPCClusterFinder/GPUTPCCFDecodeZS.cxx
221+
TPCClusterFinder/GPUTPCCFGather.cxx
222+
Refit/GPUTrackingRefit.cxx
223+
Refit/GPUTrackingRefitKernel.cxx
224+
Merger/GPUTPCGMO2Output.cxx)
225+
endif()
192226

193227
set(SRCS_DATATYPES
194228
${SRCS_DATATYPES}
@@ -260,19 +294,37 @@ unset(HDRS_TMP)
260294

261295
# Main CMake part for O2
262296
if(ALIGPU_BUILD_TYPE STREQUAL "O2")
263-
o2_add_library(GPUDataTypes
264-
TARGETVARNAME targetName
265-
PUBLIC_INCLUDE_DIRECTORIES .
266-
Definitions
267-
DataTypes
268-
PUBLIC_LINK_LIBRARIES O2::GPUUtils
269-
O2::GPUCommon
270-
O2::ReconstructionDataFormats
271-
O2::TPCFastTransformation
272-
O2::ML
273-
PRIVATE_LINK_LIBRARIES O2::DataFormatsTPC
274-
SOURCES ${SRCS_DATATYPES})
275-
target_compile_definitions(${targetName} PRIVATE GPUCA_O2_LIB GPUCA_TPC_GEOMETRY_O2)
297+
298+
if(NOT ALIGPU_BUILD_TYPE STREQUAL "Standalone")
299+
o2_add_library(GPUDataTypes
300+
TARGETVARNAME targetName
301+
PUBLIC_INCLUDE_DIRECTORIES .
302+
Definitions
303+
DataTypes
304+
PUBLIC_LINK_LIBRARIES O2::GPUUtils
305+
O2::GPUCommon
306+
O2::ReconstructionDataFormats
307+
O2::TPCFastTransformation
308+
O2::ML
309+
PRIVATE_LINK_LIBRARIES O2::DataFormatsTPC
310+
SOURCES ${SRCS_DATATYPES})
311+
add_compile_definitions(GPUCA_HAS_ONNX=1)
312+
target_compile_definitions(${targetName} PRIVATE GPUCA_O2_LIB GPUCA_TPC_GEOMETRY_O2 GPUCA_HAS_ONNX)
313+
else()
314+
o2_add_library(GPUDataTypes
315+
TARGETVARNAME targetName
316+
PUBLIC_INCLUDE_DIRECTORIES .
317+
Definitions
318+
DataTypes
319+
PUBLIC_LINK_LIBRARIES O2::GPUUtils
320+
O2::GPUCommon
321+
O2::ReconstructionDataFormats
322+
O2::TPCFastTransformation
323+
PRIVATE_LINK_LIBRARIES O2::DataFormatsTPC
324+
SOURCES ${SRCS_DATATYPES})
325+
target_compile_definitions(${targetName} PRIVATE GPUCA_O2_LIB GPUCA_TPC_GEOMETRY_O2)
326+
endif()
327+
276328
o2_target_root_dictionary(GPUDataTypes
277329
HEADERS ${HDRS_CINT_DATATYPES} ${HDRS_CINT_O2_ADDITIONAL}
278330
LINKDEF GPUTrackingLinkDef_O2_DataTypes.h)
@@ -337,6 +389,7 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
337389
LABELS its COMPILE_ONLY)
338390

339391
add_subdirectory(Interface)
392+
340393
endif()
341394

342395
# Main CMake part for Standalone

‎GPU/GPUTracking/GPUTrackingLinkDef_O2_DataTypes.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessing + ;
3131
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessingParam + ;
3232
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessingRTC + ;
33+
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsProcessingNNclusterizer + ;
3334
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsDisplay + ;
3435
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsDisplayLight + ;
3536
#pragma link C++ class o2::gpu::GPUConfigurableParamGPUSettingsDisplayHeavy + ;

0 commit comments

Comments
 (0)