Skip to content

GPU CMake: Switch from IMPLICIT_DEPENDS to DEPFILE and -MT -MD -MF, as ninja does not support IMPLICIT_DEPENDS #14321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidrohr merged 1 commit into from
May 23, 2025
Merged

GPU CMake: Switch from IMPLICIT_DEPENDS to DEPFILE and -MT -MD -MF, as ninja does not support IMPLICIT_DEPENDS #14321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions GPU/GPUTracking/Base/cuda/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@ add_custom_command(
COMMAND cp ${GPUDIR}/Base/GPUStdSystemHeaders.h ${GPU_RTC_BIN}.src
COMMAND cat ${GPUDIR}/Base/cuda/GPUReconstructionCUDAIncludesSystem.h | grep -v GPUStdSystemHeaders.h >> ${GPU_RTC_BIN}.src
COMMAND cat ${GPUDIR}/Base/GPUStdSystemHeaders.h >> ${GPU_RTC_BIN}.src
COMMAND ${CMAKE_CUDA_COMPILER} ${GPU_RTC_DEFINES} ${GPU_RTC_INCLUDES} -std=c++${CMAKE_CUDA_STANDARD} -D__CUDA_ARCH__=${RTC_CUDA_ARCH} -D__CUDACC__ -x c++ -M -MD -MT ${GPU_RTC_BIN}.src -MF ${GPU_RTC_BIN}.src.d ${GPU_RTC_SRC}
COMMAND ${CMAKE_CUDA_COMPILER} ${GPU_RTC_DEFINES} ${GPU_RTC_INCLUDES} -std=c++${CMAKE_CUDA_STANDARD} -D__CUDA_ARCH__=${RTC_CUDA_ARCH} -D__CUDACC__ -x c++ -E -Xcompiler "-nostdinc -P" ${GPU_RTC_SRC} >> ${GPU_RTC_BIN}.src
MAIN_DEPENDENCY ${GPU_RTC_SRC}
IMPLICIT_DEPENDS CXX ${GPU_RTC_SRC}
DEPENDS ${GPU_RTC_SRC} ${GPUDIR}/Base/GPUStdSystemHeaders.h ${GPUDIR}/Base/cuda/GPUReconstructionCUDAIncludesSystem.h ${GPUDIR}/Base/GPUStdSystemHeaders.h
DEPFILE ${GPU_RTC_BIN}.src.d
COMMAND_EXPAND_LISTS
COMMENT "Preparing CUDA RTC source file ${GPU_RTC_BIN}.src"
)
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Base/cuda/GPUReconstructionCUDAGenRTC.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ int32_t GPUReconstructionCUDA::genRTC(std::string& filename, uint32_t& nCompile)
}
return 0;
};
if (checkSHA(shasource, "source") ||
if (checkSHA(shasource, "source") || // TODO: CHECK VERSION!
checkSHA(shaparam, "param") ||
checkSHA(shacmd, "command line") ||
checkSHA(shakernels, "kernel definitions") ||
Expand Down
8 changes: 4 additions & 4 deletions GPU/GPUTracking/Base/hip/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ add_custom_command(
OUTPUT ${GPU_RTC_BIN}.src
COMMAND cp ${GPUDIR}/Base/GPUStdSystemHeaders.h ${GPU_RTC_BIN}.src
COMMAND cat ${GPUDIR}/Base/hip/GPUReconstructionHIPIncludesSystem.h | grep -v GPUStdSystemHeaders.h >> ${GPU_RTC_BIN}.src
COMMAND ${CMAKE_HIP_COMPILER} ${GPU_RTC_DEFINES} ${GPU_RTC_INCLUDES} -std=c++${CMAKE_HIP_STANDARD} -D__HIPCC__ -D__HIP_DEVICE_COMPILE__ -x c++ -nostdinc -E -P ${GPU_RTC_SRC} >> ${GPU_RTC_BIN}.src
MAIN_DEPENDENCY ${GPU_RTC_SRC}
IMPLICIT_DEPENDS CXX ${GPU_RTC_SRC}
DEPENDS ${MODULE}_HIPIFIED
COMMAND cat ${GPUDIR}/Base/GPUStdSystemHeaders.h >> ${GPU_RTC_BIN}.src
COMMAND ${CMAKE_HIP_COMPILER} ${GPU_RTC_DEFINES} ${GPU_RTC_INCLUDES} -std=c++${CMAKE_HIP_STANDARD} -D__HIPCC__ -D__HIP_DEVICE_COMPILE__ -x c++ -nostdinc -E -P ${GPU_RTC_SRC} -MD -MT ${GPU_RTC_BIN}.src -MF ${GPU_RTC_BIN}.src.d >> ${GPU_RTC_BIN}.src
DEPENDS ${GPU_RTC_SRC} ${GPUDIR}/Base/GPUStdSystemHeaders.h ${GPUDIR}/Base/hip/GPUReconstructionHIPIncludesSystem.h ${GPUDIR}/Base/GPUStdSystemHeaders.h ${MODULE}_HIPIFIED
DEPFILE ${GPU_RTC_BIN}.src.d
COMMAND_EXPAND_LISTS
COMMENT "Preparing HIP RTC source file ${GPU_RTC_BIN}.src"
)
Expand Down
10 changes: 6 additions & 4 deletions GPU/GPUTracking/Base/opencl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ if(OPENCL_ENABLED_SPIRV) # BUILD OpenCL intermediate code for SPIR-V target
-ferror-limit=1000 -Wno-invalid-constexpr -Wno-unused-command-line-argument
${OCL_FLAGS}
${OCL_DEFINECL}
-MD -MT ${CL_BIN}.spirv -MF ${CL_BIN}.spirv.d
-o ${CL_BIN}.spirv -c ${CL_SRC}
MAIN_DEPENDENCY ${CL_SRC}
IMPLICIT_DEPENDS CXX ${CL_SRC}
DEPENDS ${CL_SRC}
DEPFILE ${CL_BIN}.spirv.d
COMMAND_EXPAND_LISTS
COMMENT "Compiling OpenCL CL source file ${CL_SRC} to SPIRV ${CL_BIN}.spirv")

Expand All @@ -82,9 +83,10 @@ if(OPENCL_ENABLED) # BUILD OpenCL source code for runtime compilation target
${OCL_DEFINECL}
-cl-no-stdinc
-nostdinc
-MD -MT ${CL_BIN}.src -MF ${CL_BIN}.src.d
-E -P ${CL_SRC} > ${CL_BIN}.src
MAIN_DEPENDENCY ${CL_SRC}
IMPLICIT_DEPENDS CXX ${CL_SRC}
DEPENDS ${CL_SRC}
DEPFILE ${CL_BIN}.src.d
COMMAND_EXPAND_LISTS
COMMENT "Preparing OpenCL CL source file for run time compilation ${CL_BIN}.src")

Expand Down
4 changes: 2 additions & 2 deletions GPU/GPUTracking/cmake/vulkan_display.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ function(add_glslc_shader TARGET SHADER)

add_custom_command(
OUTPUT ${spirv-file}
COMMAND ${Vulkan_GLSLC_EXECUTABLE} -o ${spirv-file} ${input-file-abs}
COMMAND ${Vulkan_GLSLC_EXECUTABLE} -o ${spirv-file} ${input-file-abs} -MD -MT ${spirv-file} -MF ${spirv-file}.d
DEPENDS ${input-file-abs}
IMPLICIT_DEPENDS CXX ${input-file-abs}
DEPFILE ${input-file-abs}.d
COMMENT "Compiling GLSL to SPIRV: ${SHADER}"
VERBATIM
)
Expand Down