Skip to content

Commit d56140c

Browse files
davidrohrdavidrohr
committed
GPU CMake: some cleanup / simplification
1 parent 8060987 commit d56140c

File tree

11 files changed

+32
-36
lines changed

11 files changed

+32
-36
lines changed

‎GPU/Common/CMakeLists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
6262
COMPONENT_NAME GPU
6363
LABELS gpu)
6464
endif()
65-
install(FILES ${HDRS_INSTALL} DESTINATION include/GPU)
6665
endif()
6766

68-
if(ALIGPU_BUILD_TYPE STREQUAL "Standalone")
69-
install(FILES ${HDRS_INSTALL}
70-
DESTINATION include)
71-
endif()
67+
install(FILES ${HDRS_INSTALL} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GPU)

‎GPU/GPUTracking/Base/cuda/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
120120
${CMAKE_SOURCE_DIR}/DataFormats/Reconstruction/src
121121
${CMAKE_CURRENT_SOURCE_DIR}
122122
TARGETVARNAME targetName)
123-
install(FILES ${HDRS} DESTINATION include/GPU)
124123
endif()
125124

126125
if(ALIGPU_BUILD_TYPE STREQUAL "Standalone")
@@ -132,6 +131,8 @@ if(ALIGPU_BUILD_TYPE STREQUAL "Standalone")
132131
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
133132
endif()
134133

134+
install(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GPU)
135+
135136
target_compile_definitions(${targetName} PRIVATE $<TARGET_PROPERTY:O2::GPUTracking,COMPILE_DEFINITIONS>)
136137

137138
if (onnxruntime_FOUND)

‎GPU/GPUTracking/Base/hip/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,6 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
169169
${GPUCA_HIP_SOURCE_DIR}
170170
TARGETVARNAME targetName)
171171

172-
install(FILES ${HDRS} DESTINATION include/GPU)
173-
174172
# o2_add_test(GPUsortHIP NAME test_GPUsortHIP
175173
# SOURCES test/testGPUsortHIP.hip
176174
# PUBLIC_LINK_LIBRARIES O2::GPUCommon hip::host hip::device hip::hipcub roc::rocthrust
@@ -187,6 +185,8 @@ if(ALIGPU_BUILD_TYPE STREQUAL "Standalone")
187185
include_directories(${GPUCA_HIP_SOURCE_DIR})
188186
endif()
189187

188+
install(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GPU)
189+
190190
target_compile_definitions(${targetName} PRIVATE $<TARGET_PROPERTY:O2::GPUTracking,COMPILE_DEFINITIONS>)
191191

192192
if (onnxruntime_FOUND)

‎GPU/GPUTracking/Base/opencl/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
9696
# the compile_defitions are not propagated automatically on purpose (they are
9797
# declared PRIVATE) so we are not leaking them outside of the GPU**
9898
# directories
99-
100-
install(FILES ${HDRS} DESTINATION include/GPU)
10199
endif()
102100

103101
if(ALIGPU_BUILD_TYPE STREQUAL "Standalone")
@@ -107,6 +105,8 @@ if(ALIGPU_BUILD_TYPE STREQUAL "Standalone")
107105
set(targetName ${MODULE})
108106
endif()
109107

108+
install(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GPU)
109+
110110
if(OPENCL_ENABLED_SPIRV)
111111
target_compile_definitions(${targetName} PRIVATE OPENCL_ENABLED_SPIRV)
112112
endif()

‎GPU/GPUTracking/CMakeLists.txt‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,13 @@ set(TEMPLATE_HEADER_LIST Base/GPUReconstructionKernelList.template.h
242242
Definitions/GPUDefParametersLoad.template.inc)
243243
set(GENERATED_HEADERS_LIST "")
244244

245-
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly)
245+
set(ON_THE_FLY_DIR ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly)
246+
file(MAKE_DIRECTORY ${ON_THE_FLY_DIR})
246247
foreach(TEMPLATE_FILE ${TEMPLATE_HEADER_LIST})
247248
get_filename_component(OUTPUT_FILE_NAME ${TEMPLATE_FILE} NAME)
248249
string(REPLACE ".template" "" OUTPUT_FILE_NAME ${OUTPUT_FILE_NAME})
249-
file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/${OUTPUT_FILE_NAME} INPUT ${TEMPLATE_FILE})
250-
list(APPEND GENERATED_HEADERS_LIST ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/${OUTPUT_FILE_NAME})
250+
file(GENERATE OUTPUT ${ON_THE_FLY_DIR}/${OUTPUT_FILE_NAME} INPUT ${TEMPLATE_FILE})
251+
list(APPEND GENERATED_HEADERS_LIST ${ON_THE_FLY_DIR}/${OUTPUT_FILE_NAME})
251252
endforeach()
252253
set(GPUDEFPARAMETERSLBLIST "$<JOIN:$<LIST:TRANSFORM,$<LIST:TRANSFORM,$<TARGET_PROPERTY:O2_GPU_KERNELS,O2_GPU_KERNEL_NAMES>,REPLACE,[^A-Za-z0-9]+,_>,PREPEND,LB_>,\n>\n")
253254
string(APPEND GPUDEFPARAMETERSLBLIST "$<JOIN:$<LIST:TRANSFORM,$<TARGET_PROPERTY:O2_GPU_KERNELS,O2_GPU_KERNEL_PARAMS>,PREPEND,PAR_>,\n>\n")
@@ -256,14 +257,14 @@ file(GENERATE
256257
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/GPUDefParametersLoadPrepareBase
257258
CONTENT ${GPUDEFPARAMETERSLBLIST})
258259
add_custom_command(
259-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/GPUDefParametersLoadPrepare.h
260-
COMMAND awk "{print(\"#ifndef GPUCA_\" $0 \"\\n#define GPUCA_\" $0 \" 0\\n#endif\")}" ${CMAKE_CURRENT_BINARY_DIR}/GPUDefParametersLoadPrepareBase > ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/GPUDefParametersLoadPrepare.h
260+
OUTPUT ${ON_THE_FLY_DIR}/GPUDefParametersLoadPrepare.h
261+
COMMAND awk "{print(\"#ifndef GPUCA_\" $0 \"\\n#define GPUCA_\" $0 \" 0\\n#endif\")}" ${CMAKE_CURRENT_BINARY_DIR}/GPUDefParametersLoadPrepareBase > ${ON_THE_FLY_DIR}/GPUDefParametersLoadPrepare.h
261262
COMMENT "Generating GPUDefParametersLoadPrepare.h"
262263
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/GPUDefParametersLoadPrepareBase
263264
VERBATIM
264265
COMMAND_EXPAND_LISTS
265266
)
266-
list(APPEND GENERATED_HEADERS_LIST ${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly/GPUDefParametersLoadPrepare.h)
267+
list(APPEND GENERATED_HEADERS_LIST ${ON_THE_FLY_DIR}/GPUDefParametersLoadPrepare.h)
267268

268269
set(HDRS_INSTALL ${HDRS_INSTALL} ${GENERATED_HEADERS_LIST})
269270
include(kernels.cmake)
@@ -306,7 +307,7 @@ set(INCDIRS
306307
${CMAKE_CURRENT_SOURCE_DIR}/Debug
307308
${CMAKE_CURRENT_SOURCE_DIR}/DataCompression
308309
${CMAKE_CURRENT_SOURCE_DIR}/TPCClusterFinder
309-
${CMAKE_CURRENT_BINARY_DIR}/include_gpu_onthefly)
310+
${ON_THE_FLY_DIR})
310311

311312
# Main CMake part for O2
312313
if(ALIGPU_BUILD_TYPE STREQUAL "O2")
@@ -356,12 +357,6 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
356357
HEADERS ${HDRS_CINT_O2} ${HDRS_CINT_O2_ADDITIONAL}
357358
LINKDEF GPUTrackingLinkDef_O2.h)
358359

359-
install(FILES ${HDRS_SRCS} ${HDRS_CINT_O2} ${HDRS_CINT_DATATYPES} ${HDRS_INSTALL}
360-
DESTINATION include/GPU)
361-
install(DIRECTORY utils
362-
DESTINATION include/GPU
363-
FILES_MATCHING PATTERN *.h)
364-
365360
o2_add_test_root_macro(Standalone/tools/createGeo.C
366361
PUBLIC_LINK_LIBRARIES O2::GPUTracking
367362
LABELS its COMPILE_ONLY)
@@ -390,13 +385,15 @@ if(ALIGPU_BUILD_TYPE STREQUAL "Standalone")
390385
else()
391386
target_compile_definitions(${targetName} PRIVATE GPUCA_NO_ROOT)
392387
endif()
393-
install(FILES ${HDRS_SRCS} ${HDRS_CINT_O2} ${HDRS_CINT_DATATYPES} ${HDRS_INSTALL}
394-
DESTINATION include)
395-
install(DIRECTORY utils
396-
DESTINATION include
397-
FILES_MATCHING PATTERN *.h)
398388
endif()
399389

390+
install(FILES ${HDRS_SRCS} ${HDRS_CINT_O2} ${HDRS_CINT_DATATYPES} ${HDRS_INSTALL}
391+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GPU)
392+
install(DIRECTORY utils
393+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GPU
394+
FILES_MATCHING PATTERN *.h)
395+
396+
400397
# GPUReconstructionLibrary needs to know which GPU backends are enabled for proper error messages
401398
configure_file(Base/GPUReconstructionAvailableBackends.template.h ${CMAKE_CURRENT_BINARY_DIR}/GPUReconstructionAvailableBackends.h)
402399
set_source_files_properties(Base/GPUReconstructionLibrary.cxx

‎GPU/GPUTracking/Interface/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ target_include_directories(${targetName}
4646
target_compile_definitions(${targetName} PRIVATE $<TARGET_PROPERTY:O2::GPUTracking,COMPILE_DEFINITIONS>)
4747

4848

49-
install(FILES ${HDRS} DESTINATION include/GPU)
49+
install(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GPU)

‎GPU/GPUTracking/Standalone/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
cmake_minimum_required(VERSION 3.27 FATAL_ERROR)
1414
project(GPUTrackingStandalone)
1515
include(FeatureSummary)
16+
include(GNUInstallDirs)
1617
set(CMAKE_INSTALL_MESSAGE LAZY)
1718

1819
set(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}")

‎GPU/GPUTracking/Standalone/tools/dumpGPUDefParam.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/// \author David Rohr
1414

1515
// Run e.g. as:
16-
// ROOT_INCLUDE_PATH="`pwd`/include" root -l -q -b src/GPU/GPUTracking/Standalone/tools/dumpGPUDefParam.C'()'
16+
// ROOT_INCLUDE_PATH="`pwd`/include/GPU" root -l -q -b src/GPU/GPUTracking/Standalone/tools/dumpGPUDefParam.C'()'
1717

1818
// Logic for testing to load the default parameters
1919
/* #define GPUCA_GPUCODE

‎GPU/GPUTracking/display/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
133133

134134
target_compile_definitions(${targetName} PRIVATE GPUCA_BUILD_EVENT_DISPLAY_GLFW GPUCA_DISPLAY_GL3W GPUCA_DISPLAY_OPENGL_CORE)
135135

136-
install(FILES ${HDRS} ${HDRS_INSTALL} DESTINATION include/GPU)
137-
138136
o2_add_executable(field-uniform-exporter
139137
TARGETVARNAME exporterName
140138
COMPONENT_NAME gpu
@@ -157,6 +155,8 @@ if(ALIGPU_BUILD_TYPE STREQUAL "Standalone")
157155
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/setinclude.sh PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE DESTINATION displayTrackFilter)
158156
endif()
159157

158+
install(FILES ${HDRS} ${HDRS_INSTALL} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GPU)
159+
160160
target_compile_definitions(${targetName} PRIVATE $<TARGET_PROPERTY:O2::GPUTracking,COMPILE_DEFINITIONS>)
161161

162162
message(STATUS "Building GPU Event Display (Vulkan ${GPUCA_EVENT_DISPLAY_VULKAN}, Wayland ${GPUCA_EVENT_DISPLAY_WAYLAND}, Freetype ${GPUCA_EVENT_DISPLAY_FREETYPE}, Fontconfig ${Fontconfig_FOUND}, Qt ${GPUCA_EVENT_DISPLAY_QT})")

‎GPU/TPCFastTransformation/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ if(${ALIGPU_BUILD_TYPE} STREQUAL "O2")
6464
HEADERS ${HDRS_CINT_O2}
6565
LINKDEF TPCFastTransformationLinkDef_O2.h)
6666

67-
install(FILES ${HDRS_CINT_O2} DESTINATION include/GPU)
6867
file(COPY ${HDRS_CINT_O2} DESTINATION ${CMAKE_BINARY_DIR}/stage/include/GPU)
6968

7069
o2_add_test(${MODULE}
@@ -115,6 +114,8 @@ if(${ALIGPU_BUILD_TYPE} STREQUAL "O2")
115114
LABELS gpu tpc)
116115
endforeach()
117116

117+
install (FILES macro/TPCFastTransformInit.C
118+
DESTINATION share/macro/)
118119
endif()
119120

120121
if(ALIGPU_BUILD_TYPE STREQUAL "Standalone")
@@ -123,8 +124,7 @@ if(ALIGPU_BUILD_TYPE STREQUAL "Standalone")
123124
target_include_directories(${targetName} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
124125
endif()
125126

126-
install (FILES macro/TPCFastTransformInit.C
127-
DESTINATION share/macro/)
127+
install(FILES ${HDRS_CINT_O2} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GPU)
128128

129129
#
130130
# FIXME: this one is misplaced : it depends (at least) on TPCSimulation which is

0 commit comments

Comments
 (0)