GPUCommonAlgorithm: Cleanup preprocessor defines

davidrohr · davidrohr · commit 30efe2e21939 · 2025-03-25T11:25:28.000+01:00
diff --git a/GPU/Common/GPUCommonAlgorithm.h b/GPU/Common/GPUCommonAlgorithm.h
@@ -446,4 +446,8 @@ GPUdi() T warp_broadcast(T v, int32_t i)
 
 #endif
 
+#ifdef GPUCA_ALGORITHM_STD
+#undef GPUCA_ALGORITHM_STD
+#endif
+
 #endif
diff --git a/GPU/Common/GPUCommonAlgorithmThrust.h b/GPU/Common/GPUCommonAlgorithmThrust.h
@@ -52,7 +52,7 @@ GPUdi() void GPUCommonAlgorithm::sort(T* begin, T* end, const S& comp)
 }
 
 template <class T>
-GPUdi() void GPUCommonAlgorithm::sortInBlock(T* begin, T* end)
+GPUdi() void GPUCommonAlgorithm::sortInBlock(T* begin, T* end) // TODO: Try cub::BlockMergeSort
 {
   if (get_local_id(0) == 0) {
     sortDeviceDynamic(begin, end);
@@ -94,4 +94,6 @@ GPUhi() void GPUCommonAlgorithm::sortOnDevice(auto* rec, int32_t stream, T* begi
 }
 } // namespace o2::gpu
 
+#undef GPUCA_THRUST_NAMESPACE
+
 #endif

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ GPUdi() void GPUCommonAlgorithm::sort(T* begin, T* end, const S& comp)`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`template <class T>`
`55`		`-GPUdi() void GPUCommonAlgorithm::sortInBlock(T* begin, T* end)`
	`55`	`+GPUdi() void GPUCommonAlgorithm::sortInBlock(T* begin, T* end) // TODO: Try cub::BlockMergeSort`
`56`	`56`	`{`
`57`	`57`	`if (get_local_id(0) == 0) {`
`58`	`58`	`sortDeviceDynamic(begin, end);`
`@@ -94,4 +94,6 @@ GPUhi() void GPUCommonAlgorithm::sortOnDevice(auto* rec, int32_t stream, T* begi`
`94`	`94`	`}`
`95`	`95`	`} // namespace o2::gpu`
`96`	`96`
	`97`	`+#undef GPUCA_THRUST_NAMESPACE`
	`98`	`+`
`97`	`99`	`#endif`