GPU clusterizer with neural networks #13981
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -162,35 +162,35 @@ set(HDRS_INSTALL | |
| set(SRCS_NO_CINT ${SRCS_NO_CINT} display/GPUDisplayInterface.cxx) | ||
|
|
||
| set(SRCS_NO_CINT ${SRCS_NO_CINT} | ||
| Global/GPUChainITS.cxx | ||
| ITS/GPUITSFitter.cxx | ||
| ITS/GPUITSFitterKernels.cxx | ||
| dEdx/GPUdEdx.cxx | ||
| TPCConvert/GPUTPCConvert.cxx | ||
| TPCConvert/GPUTPCConvertKernel.cxx | ||
| DataCompression/GPUTPCCompression.cxx | ||
| DataCompression/GPUTPCCompressionTrackModel.cxx | ||
| DataCompression/GPUTPCCompressionKernels.cxx | ||
| DataCompression/GPUTPCDecompression.cxx | ||
| DataCompression/GPUTPCDecompressionKernels.cxx | ||
| DataCompression/TPCClusterDecompressor.cxx | ||
| DataCompression/GPUTPCClusterStatistics.cxx | ||
| TPCClusterFinder/GPUTPCClusterFinder.cxx | ||
| TPCClusterFinder/ClusterAccumulator.cxx | ||
| TPCClusterFinder/MCLabelAccumulator.cxx | ||
| TPCClusterFinder/GPUTPCCFCheckPadBaseline.cxx | ||
| TPCClusterFinder/GPUTPCCFStreamCompaction.cxx | ||
| TPCClusterFinder/GPUTPCCFChargeMapFiller.cxx | ||
| TPCClusterFinder/GPUTPCCFPeakFinder.cxx | ||
| TPCClusterFinder/GPUTPCCFNoiseSuppression.cxx | ||
| TPCClusterFinder/GPUTPCCFClusterizer.cxx | ||
| TPCClusterFinder/GPUTPCCFDeconvolution.cxx | ||
| TPCClusterFinder/GPUTPCCFMCLabelFlattener.cxx | ||
| TPCClusterFinder/GPUTPCCFDecodeZS.cxx | ||
| TPCClusterFinder/GPUTPCCFGather.cxx | ||
| Refit/GPUTrackingRefit.cxx | ||
| Refit/GPUTrackingRefitKernel.cxx | ||
| Merger/GPUTPCGMO2Output.cxx) | ||
|
|
||
| if(NOT ALIGPU_BUILD_TYPE STREQUAL "Standalone") | ||
| list(APPEND SRCS_NO_CINT TPCClusterFinder/GPUTPCNNClusterizerKernels.cxx TPCClusterFinder/GPUTPCNNClusterizer.cxx TPCClusterFinder/GPUTPCNNClusterizerHost.cxx) | ||
|
|
@@ -266,20 +266,18 @@ unset(HDRS_TMP) | |
|
|
||
| # Main CMake part for O2 | ||
| if(ALIGPU_BUILD_TYPE STREQUAL "O2") | ||
| o2_add_library(GPUDataTypes | ||
| TARGETVARNAME targetName | ||
| PUBLIC_INCLUDE_DIRECTORIES . | ||
| Definitions | ||
| DataTypes | ||
| PUBLIC_LINK_LIBRARIES O2::GPUUtils | ||
| O2::GPUCommon | ||
| O2::ReconstructionDataFormats | ||
| O2::TPCFastTransformation | ||
| O2::ML | ||
|
davidrohr marked this conversation as resolved.
Outdated
|
||
| PRIVATE_LINK_LIBRARIES O2::DataFormatsTPC | ||
| SOURCES ${SRCS_DATATYPES}) | ||
|
Collaborator
Author
There was a problem hiding this comment. @davidrohr This is needed, otherwise the code doesn't find GPUCA_HAS_ONNX internally. E.g. tpcNNClusterer objects are not created
Collaborator
There was a problem hiding this comment. We cannot globally add compile definitions, it should be bound to a target, then we have to understand why it didn't work.
Collaborator
Author
There was a problem hiding this comment. Found it: See the new commit
Collaborator
There was a problem hiding this comment. But wasn't it already there in my change:
Collaborator
Author
There was a problem hiding this comment. But GPUCA_HAS_ONNX=1 is needed in two places. Not sure which changes you refer to, but I saw it only in one place before. Maybe I missed it
Collaborator
There was a problem hiding this comment. Ah, now I understand. You added the library |
||
| target_compile_definitions(${targetName} PRIVATE GPUCA_O2_LIB GPUCA_TPC_GEOMETRY_O2 GPUCA_HAS_ONNX=1) | ||
|
|
||
| o2_target_root_dictionary(GPUDataTypes | ||
|
|
@@ -417,4 +415,4 @@ endif() | |
|
|
||
| if(${GPUCA_NO_FAST_MATH}) | ||
| target_compile_definitions(${targetName} PUBLIC GPUCA_NO_FAST_MATH) | ||
| endif() | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.