Skip to content

Commit be4c781

Browse files
committed
ACC/OCL: revised files to be installed
- Use add_custom_command instead of add_custom_target. - Added/fixed dependencies (custom build step). - Avoid regenerating code.
1 parent 01a76b2 commit be4c781

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ if (USE_ACCEL MATCHES "opencl")
248248
set(DBCSR_OPENCL_SCRIPT ${DBCSR_SOURCE_DIR}/acc/opencl/acc_opencl.sh)
249249
set(DBCSR_OPENCL_COMMON acc/opencl/common/opencl_atomics.h
250250
acc/opencl/common/opencl_common.h)
251-
list(APPEND DBCSR_ACC_HEADER acc/opencl/acc_opencl.h)
251+
list(APPEND DBCSR_ACC_HEADER acc/opencl/smm/opencl_libsmm.h
252+
acc/opencl/acc_opencl.h)
252253
endif ()
253254

254255
if (USE_ACCEL MATCHES "cuda|hip")

src/acc/opencl/smm/CMakeLists.txt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,20 @@ list(TRANSFORM DBCSR_OPENCL_KERNELS PREPEND ${CMAKE_CURRENT_SOURCE_DIR}/)
2323
list(APPEND DBCSR_OPENCL_DEPENDS ${DBCSR_ACC_HEADER} ${DBCSR_OPENCL_COMMON})
2424
list(TRANSFORM DBCSR_OPENCL_DEPENDS PREPEND ${DBCSR_SOURCE_DIR}/)
2525

26-
set(DBCSR_OPENCL_KERNELS_INC ${CMAKE_CURRENT_SOURCE_DIR}/opencl_kernels.h)
26+
set(DBCSR_OPENCL_KHEADER opencl_kernels.h)
2727

28-
add_custom_target(
29-
parameters # ALL
28+
add_custom_command(
3029
COMMAND
3130
${DBCSR_OPENCL_SCRIPT} ${DBCSR_OPENCL_SCRIPT_ARGS} ${DBCSR_OPENCL_KERNELS}
32-
${DBCSR_OPENCL_PARAMS} ${DBCSR_OPENCL_KERNELS_INC}
33-
DEPENDS ${DBCSR_OPENCL_SCRIPT} ${DBCSR_OPENCL_KERNELS} ${DBCSR_OPENCL_DEPENDS}
34-
BYPRODUCTS ${DBCSR_OPENCL_KERNELS_INC}
31+
${DBCSR_OPENCL_PARAMS} ${CMAKE_CURRENT_SOURCE_DIR}/${DBCSR_OPENCL_KHEADER}
32+
DEPENDS ${DBCSR_OPENCL_DEPENDS} ${DBCSR_OPENCL_KERNELS} ${DBCSR_OPENCL_SCRIPT}
33+
${DBCSR_OPENCL_PARAMS}
34+
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${DBCSR_OPENCL_KHEADER}
3535
COMMENT ${DBCSR_OPENCL_SCRIPT_MSG})
3636

37-
add_dependencies(dbcsr parameters)
37+
add_custom_target(${DBCSR_OPENCL_KHEADER}
38+
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${DBCSR_OPENCL_KHEADER})
39+
add_dependencies(dbcsr ${DBCSR_OPENCL_KHEADER})
40+
3841
target_include_directories(dbcsr PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
3942
${CMAKE_CURRENT_SOURCE_DIR})

0 commit comments

Comments
 (0)