Skip to content

Commit

Permalink
GPU CMake: Don't create hipified source files in source tree but in C…
Browse files Browse the repository at this point in the history
…Make files folder
  • Loading branch information
davidrohr committed Mar 13, 2024
1 parent 5398141 commit 627f6eb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
3 changes: 0 additions & 3 deletions Detectors/ITSMFT/ITS/tracking/GPU/hip/.gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions GPU/GPUbenchmark/hip/.gitignore

This file was deleted.

8 changes: 6 additions & 2 deletions cmake/O2AddHipifiedExecutable.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,18 @@ function(o2_add_hipified_executable baseTargetName)
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${file})
get_filename_component(CUDA_SOURCE ${file} NAME)
string(REPLACE ".cu" ".hip" HIP_SOURCE ${CUDA_SOURCE})
set(OUTPUT_HIP_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${A_DEST_SRC_REL_PATH}/${HIP_SOURCE}")
set(OUTPUT_HIP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${A_DEST_SRC_REL_PATH}/${HIP_SOURCE}")
list(APPEND HIP_SOURCES ${OUTPUT_HIP_FILE})

add_custom_command(
OUTPUT ${OUTPUT_HIP_FILE}
COMMAND ${HIPIFY_EXECUTABLE} --quiet-warnings ${ABS_CUDA_SORUCE} | sed '1{/\#include \"hip\\/hip_runtime.h\"/d}' > ${OUTPUT_HIP_FILE}
DEPENDS ${file}
)

set_source_files_properties(${OUTPUT_HIP_FILE} PROPERTIES
INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}"
)
else()
list(APPEND HIP_SOURCES ${file})
endif()
Expand Down Expand Up @@ -74,4 +78,4 @@ function(o2_add_hipified_executable baseTargetName)
o2_add_executable("${baseTargetName}"
SOURCES ${HIP_SOURCES}
${FORWARD_ARGS})
endfunction()
endfunction()
8 changes: 6 additions & 2 deletions cmake/O2AddHipifiedLibrary.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,18 @@ function(o2_add_hipified_library baseTargetName)
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${file})
get_filename_component(CUDA_SOURCE ${file} NAME)
string(REPLACE ".cu" ".hip" HIP_SOURCE ${CUDA_SOURCE})
set(OUTPUT_HIP_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${HIP_SOURCE}")
set(OUTPUT_HIP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${HIP_SOURCE}")
list(APPEND HIP_SOURCES ${OUTPUT_HIP_FILE})

add_custom_command(
OUTPUT ${OUTPUT_HIP_FILE}
COMMAND ${HIPIFY_EXECUTABLE} --quiet-warnings ${ABS_CUDA_SORUCE} | sed '1{/\#include \"hip\\/hip_runtime.h\"/d}' > ${OUTPUT_HIP_FILE}
DEPENDS ${file}
)

set_source_files_properties(${OUTPUT_HIP_FILE} PROPERTIES
INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}"
)
else()
list(APPEND HIP_SOURCES ${file})
endif()
Expand Down Expand Up @@ -68,4 +72,4 @@ function(o2_add_hipified_library baseTargetName)
o2_add_library("${baseTargetName}"
SOURCES ${HIP_SOURCES}
${FORWARD_ARGS})
endfunction()
endfunction()

0 comments on commit 627f6eb

Please sign in to comment.