Skip to content

Commit bdc54f9

Browse files
committed
GPU CMake: Some adaptions for gpu-systems package
1 parent 2d7a0bd commit bdc54f9

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

dependencies/FindO2GPU.cmake

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ endfunction()
6767
# Need to strip c++17 imposed by alidist defaults
6868
STRING(REGEX REPLACE "\-std=[^ ]*" "" O2_GPU_CMAKE_CXX_FLAGS_NOSTD "${CMAKE_CXX_FLAGS}")
6969

70-
# ---------------------------------- Fast Math / Deterministic Mode ----------------------------------
70+
# ================================== Fast Math / Deterministic Mode ==================================
7171
# set(GPUCA_DETERMINISTIC_MODE WHOLEO2) # Override
7272
set(GPUCA_DETERMINISTIC_MODE_MAP_OFF 0)
7373
set(GPUCA_DETERMINISTIC_MODE_MAP_NO_FAST_MATH 1) # No -ffast-math and similar compile flags for GPU folder
@@ -101,7 +101,7 @@ if(GPUCA_DETERMINISTIC_MODE GREATER_EQUAL ${GPUCA_DETERMINISTIC_MODE_MAP_WHOLEO2
101101
endif()
102102

103103

104-
# ---------------------------------- CUDA ----------------------------------
104+
# ================================== CUDA ==================================
105105
if(ENABLE_CUDA)
106106
if(CUDA_COMPUTETARGET)
107107
set(CMAKE_CUDA_ARCHITECTURES ${CUDA_COMPUTETARGET})
@@ -180,17 +180,19 @@ if(ENABLE_CUDA)
180180
endif()
181181
endif()
182182

183-
# ---------------------------------- OpenCL ----------------------------------
183+
# ================================== OpenCL ==================================
184184
if(ENABLE_OPENCL)
185185
find_package(OpenCL)
186186
if(ENABLE_OPENCL AND NOT ENABLE_OPENCL STREQUAL "AUTO")
187187
set_package_properties(OpenCL PROPERTIES TYPE REQUIRED)
188188
else()
189189
set_package_properties(OpenCL PROPERTIES TYPE OPTIONAL)
190190
endif()
191-
find_package(LLVM)
192-
if(LLVM_FOUND)
193-
find_package(Clang)
191+
if(NOT OPENCL_COMPATIBLE_CLANG_FOUND)
192+
find_package(LLVM)
193+
if(LLVM_FOUND)
194+
find_package(Clang)
195+
endif()
194196
endif()
195197
if (GPUCA_OPENCL_CLANGBIN)
196198
set(LLVM_CLANG ${GPUCA_OPENCL_CLANGBIN})
@@ -225,7 +227,7 @@ if(ENABLE_OPENCL)
225227
endif()
226228
endif()
227229

228-
# ---------------------------------- HIP ----------------------------------
230+
# ================================== HIP ==================================
229231
if(ENABLE_HIP)
230232
if(HIP_AMDGPUTARGET)
231233
set(CMAKE_HIP_ARCHITECTURES "${HIP_AMDGPUTARGET}")
@@ -329,4 +331,6 @@ endif()
329331

330332
# if we end up here without a FATAL, it means we have found the "O2GPU" package
331333
set(O2GPU_FOUND TRUE)
332-
include("${CMAKE_CURRENT_LIST_DIR}/../GPU/GPUTracking/cmake/kernel_helpers.cmake")
334+
if (NOT GPUCA_FINDO2GPU_CHECK_ONLY)
335+
include("${CMAKE_CURRENT_LIST_DIR}/../GPU/GPUTracking/cmake/kernel_helpers.cmake")
336+
endif()

0 commit comments

Comments
 (0)