Skip to content

Commit e8af1c2

Browse files
committed
Adding ifdefs for standalone build and header exclusions in GPUORTFloat16
1 parent 66da84e commit e8af1c2

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

Common/ML/include/ML/3rdparty/GPUORTFloat16.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55
// - https://github.com/microsoft/onnxruntime/blob/main/include/onnxruntime/core/session/onnxruntime_float16.h
66
// - https://github.com/microsoft/onnxruntime/blob/main/include/onnxruntime/core/session/onnxruntime_cxx_api.h
77

8+
#ifndef GPUCA_GPUCODE_DEVICE
89
#include <stdint.h>
910
#include <cmath>
1011
#include <cstring>
1112
#include <limits>
13+
#endif
14+
1215
#include "GPUCommonDef.h"
1316

1417
namespace o2

GPU/GPUTracking/Definitions/GPUDefGPUParameters.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,12 +513,16 @@
513513

514514
#define GPUCA_LB_GPUTPCCFNoiseSuppression_noiseSuppression GPUCA_LB_GPUTPCCFNoiseSuppression
515515
#define GPUCA_LB_GPUTPCCFNoiseSuppression_updatePeaks GPUCA_LB_GPUTPCCFNoiseSuppression
516+
517+
#ifdef GPUCA_HAS_ONNX
516518
#define GPUCA_LB_GPUTPCNNClusterizer_runCfClusterizer GPUCA_LB_GPUTPCNNClusterizer
517519
#define GPUCA_LB_GPUTPCNNClusterizer_fillInputNN GPUCA_LB_GPUTPCNNClusterizer
518520
#define GPUCA_LB_GPUTPCNNClusterizer_determineClass1Labels GPUCA_LB_GPUTPCNNClusterizer
519521
#define GPUCA_LB_GPUTPCNNClusterizer_determineClass2Labels GPUCA_LB_GPUTPCNNClusterizer
520522
#define GPUCA_LB_GPUTPCNNClusterizer_publishClass1Regression GPUCA_LB_GPUTPCNNClusterizer
521523
#define GPUCA_LB_GPUTPCNNClusterizer_publishClass2Regression GPUCA_LB_GPUTPCNNClusterizer
524+
#endif
525+
522526
#define GPUCA_LB_GPUTPCCFStreamCompaction_scanStart GPUCA_THREAD_COUNT_SCAN
523527
#define GPUCA_LB_GPUTPCCFStreamCompaction_scanUp GPUCA_THREAD_COUNT_SCAN
524528
#define GPUCA_LB_GPUTPCCFStreamCompaction_scanTop GPUCA_THREAD_COUNT_SCAN

GPU/GPUTracking/kernels.cmake

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ o2_gpu_kernel_file_list(O2PROPAGATOR TrackParametrization.cxx TrackParametrizati
2424
o2_gpu_kernel_file_list(TPCCOMPRESSION GPUTPCCompressionTrackModel.cxx)
2525
o2_gpu_kernel_file_list(TPCDECOMPRESSION GPUTPCCompressionTrackModel.cxx ERRORS)
2626
o2_gpu_kernel_file_list(TPCCLUSTERFINDER ERRORS ClusterAccumulator.cxx GPUTPCNNClusterizer.cxx)
27+
if(NOT ALIGPU_BUILD_TYPE STREQUAL "Standalone")
28+
o2_gpu_kernel_file_list(TPCNNCLUSTERFINDER ERRORS ClusterAccumulator.cxx GPUTPCNNClusterizer.cxx)
29+
endif()
2730
o2_gpu_kernel_file_list(TRDTRACKER GPUTRDTrack.cxx GPUTRDTracker.cxx GPUTRDTrackletWord.cxx GeometryBase.cxx)
2831
o2_gpu_kernel_file_list(GLOBALREFIT TPCMERGER O2PROPAGATOR MATLUT GPUTrackingRefit.cxx)
2932

@@ -110,12 +113,14 @@ o2_gpu_add_kernel("GPUTPCCFPeakFinder" "= TPCCLUS
110113
o2_gpu_add_kernel("GPUTPCCFNoiseSuppression, noiseSuppression" "= TPCCLUSTERFINDER" LB single)
111114
o2_gpu_add_kernel("GPUTPCCFNoiseSuppression, updatePeaks" "= TPCCLUSTERFINDER" LB single)
112115
o2_gpu_add_kernel("GPUTPCCFDeconvolution" "= TPCCLUSTERFINDER" LB single)
113-
o2_gpu_add_kernel("GPUTPCNNClusterizer, runCfClusterizer" "= TPCCLUSTERFINDER" LB single int8_t dtype int8_t onlyMC uint batchStart)
114-
o2_gpu_add_kernel("GPUTPCNNClusterizer, fillInputNN" "= TPCCLUSTERFINDER" LB single int8_t dtype int8_t onlyMC uint batchStart)
115-
o2_gpu_add_kernel("GPUTPCNNClusterizer, determineClass1Labels" "= TPCCLUSTERFINDER" LB single int8_t dtype int8_t onlyMC uint batchStart)
116-
o2_gpu_add_kernel("GPUTPCNNClusterizer, determineClass2Labels" "= TPCCLUSTERFINDER" LB single int8_t dtype int8_t onlyMC uint batchStart)
117-
o2_gpu_add_kernel("GPUTPCNNClusterizer, publishClass1Regression" "= TPCCLUSTERFINDER" LB single int8_t dtype int8_t onlyMC uint batchStart)
118-
o2_gpu_add_kernel("GPUTPCNNClusterizer, publishClass2Regression" "= TPCCLUSTERFINDER" LB single int8_t dtype int8_t onlyMC uint batchStart)
116+
if(NOT ALIGPU_BUILD_TYPE STREQUAL "Standalone")
117+
o2_gpu_add_kernel("GPUTPCNNClusterizer, runCfClusterizer" "= TPCNNCLUSTERFINDER" LB single int8_t dtype int8_t onlyMC uint batchStart)
118+
o2_gpu_add_kernel("GPUTPCNNClusterizer, fillInputNN" "= TPCNNCLUSTERFINDER" LB single int8_t dtype int8_t onlyMC uint batchStart)
119+
o2_gpu_add_kernel("GPUTPCNNClusterizer, determineClass1Labels" "= TPCNNCLUSTERFINDER" LB single int8_t dtype int8_t onlyMC uint batchStart)
120+
o2_gpu_add_kernel("GPUTPCNNClusterizer, determineClass2Labels" "= TPCNNCLUSTERFINDER" LB single int8_t dtype int8_t onlyMC uint batchStart)
121+
o2_gpu_add_kernel("GPUTPCNNClusterizer, publishClass1Regression" "= TPCNNCLUSTERFINDER" LB single int8_t dtype int8_t onlyMC uint batchStart)
122+
o2_gpu_add_kernel("GPUTPCNNClusterizer, publishClass2Regression" "= TPCNNCLUSTERFINDER" LB single int8_t dtype int8_t onlyMC uint batchStart)
123+
endif()
119124
o2_gpu_add_kernel("GPUTPCCFClusterizer" "= TPCCLUSTERFINDER" LB single int8_t onlyMC)
120125
o2_gpu_add_kernel("GPUTPCCFMCLabelFlattener, setRowOffsets" "= TPCCLUSTERFINDER" NO single)
121126
o2_gpu_add_kernel("GPUTPCCFMCLabelFlattener, flatten" "= TPCCLUSTERFINDER" NO single GPUTPCLinearLabels* out)

0 commit comments

Comments
 (0)