From 5d5d419ca6aa55034eef0144f24e66789b486cb5 Mon Sep 17 00:00:00 2001 From: Gregory Shtrasberg <156009573+gshtras@users.noreply.github.com> Date: Tue, 5 Aug 2025 23:39:32 -0400 Subject: [PATCH] [Bugfix][CI/Build][ROCm] Make sure to use the headers from the build folder on ROCm (#22264) Signed-off-by: Gregory Shtrasberg --- cmake/utils.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/utils.cmake b/cmake/utils.cmake index 621179a701692..9c0ed1d09572e 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -467,6 +467,12 @@ function (define_gpu_extension_target GPU_MOD_NAME) if (GPU_LANGUAGE STREQUAL "HIP") # Make this target dependent on the hipify preprocessor step. add_dependencies(${GPU_MOD_NAME} hipify${GPU_MOD_NAME}) + # Make sure we include the hipified versions of the headers, and avoid conflicts with the ones in the original source folder + target_include_directories(${GPU_MOD_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/csrc + ${GPU_INCLUDE_DIRECTORIES}) + else() + target_include_directories(${GPU_MOD_NAME} PRIVATE csrc + ${GPU_INCLUDE_DIRECTORIES}) endif() if (GPU_ARCHITECTURES) @@ -482,8 +488,6 @@ function (define_gpu_extension_target GPU_MOD_NAME) target_compile_definitions(${GPU_MOD_NAME} PRIVATE "-DTORCH_EXTENSION_NAME=${GPU_MOD_NAME}") - target_include_directories(${GPU_MOD_NAME} PRIVATE csrc - ${GPU_INCLUDE_DIRECTORIES}) target_link_libraries(${GPU_MOD_NAME} PRIVATE torch ${GPU_LIBRARIES})