From 2488557decdb333b54a2c08dd2a2626c30c2804b Mon Sep 17 00:00:00 2001 From: Luke Drummond Date: Wed, 4 Dec 2024 14:53:48 +0000 Subject: [PATCH 1/2] Fix missing dependency on UR headers --- sycl/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt index a29bfc6310e39..bddbf7d6726a8 100644 --- a/sycl/CMakeLists.txt +++ b/sycl/CMakeLists.txt @@ -243,6 +243,11 @@ add_custom_target(sycl-headers sycl-device-aspect-macros-header boost_mp11-headers) +list(APPEND UR_HEADERS + ${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_api.h + ${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_api_funcs.def + ${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_print.hpp +) add_custom_command( OUTPUT ${OUT_HEADERS_IN_SYCL_DIR} ${OUT_HEADERS_IN_CL_DIR} @@ -252,14 +257,13 @@ add_custom_command( ${HEADERS_IN_CL_DIR} ${HEADERS_IN_STD_DIR} ${HEADERS_IN_SYCLCOMPAT_DIR} + ${UR_HEADERS} COMMAND ${CMAKE_COMMAND} -E copy_directory ${sycl_inc_dir}/sycl ${SYCL_INCLUDE_BUILD_DIR}/sycl COMMAND ${CMAKE_COMMAND} -E copy_directory ${sycl_inc_dir}/CL ${SYCL_INCLUDE_BUILD_DIR}/CL COMMAND ${CMAKE_COMMAND} -E copy_directory ${sycl_inc_dir}/std ${SYCL_INCLUDE_BUILD_DIR}/std COMMAND ${CMAKE_COMMAND} -E copy_directory ${sycl_inc_dir}/syclcompat ${SYCL_INCLUDE_BUILD_DIR}/syclcompat COMMAND ${CMAKE_COMMAND} -E copy ${sycl_inc_dir}/syclcompat.hpp ${SYCL_INCLUDE_BUILD_DIR}/syclcompat.hpp - COMMAND ${CMAKE_COMMAND} -E copy ${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_api.h ${SYCL_INCLUDE_BUILD_DIR} - COMMAND ${CMAKE_COMMAND} -E copy ${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_api_funcs.def ${SYCL_INCLUDE_BUILD_DIR} - COMMAND ${CMAKE_COMMAND} -E copy ${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_print.hpp ${SYCL_INCLUDE_BUILD_DIR} + COMMAND ${CMAKE_COMMAND} -E copy ${UR_HEADERS} ${SYCL_INCLUDE_BUILD_DIR} COMMENT "Copying SYCL headers ...") # Copy SYCL headers from source to install directory From 0bdc8f498056d1ddc1b92bd6be919889cc65d46d Mon Sep 17 00:00:00 2001 From: Luke Drummond Date: Wed, 4 Dec 2024 15:17:36 +0000 Subject: [PATCH 2/2] fixup! Fix missing dependency on UR headers --- sycl/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt index bddbf7d6726a8..28fdbc7245359 100644 --- a/sycl/CMakeLists.txt +++ b/sycl/CMakeLists.txt @@ -243,7 +243,7 @@ add_custom_target(sycl-headers sycl-device-aspect-macros-header boost_mp11-headers) -list(APPEND UR_HEADERS +list(APPEND UR_HEADERS_TO_COPY ${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_api.h ${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_api_funcs.def ${UNIFIED_RUNTIME_INCLUDE_DIR}/ur_print.hpp @@ -257,13 +257,13 @@ add_custom_command( ${HEADERS_IN_CL_DIR} ${HEADERS_IN_STD_DIR} ${HEADERS_IN_SYCLCOMPAT_DIR} - ${UR_HEADERS} + ${UR_HEADERS_TO_COPY} COMMAND ${CMAKE_COMMAND} -E copy_directory ${sycl_inc_dir}/sycl ${SYCL_INCLUDE_BUILD_DIR}/sycl COMMAND ${CMAKE_COMMAND} -E copy_directory ${sycl_inc_dir}/CL ${SYCL_INCLUDE_BUILD_DIR}/CL COMMAND ${CMAKE_COMMAND} -E copy_directory ${sycl_inc_dir}/std ${SYCL_INCLUDE_BUILD_DIR}/std COMMAND ${CMAKE_COMMAND} -E copy_directory ${sycl_inc_dir}/syclcompat ${SYCL_INCLUDE_BUILD_DIR}/syclcompat COMMAND ${CMAKE_COMMAND} -E copy ${sycl_inc_dir}/syclcompat.hpp ${SYCL_INCLUDE_BUILD_DIR}/syclcompat.hpp - COMMAND ${CMAKE_COMMAND} -E copy ${UR_HEADERS} ${SYCL_INCLUDE_BUILD_DIR} + COMMAND ${CMAKE_COMMAND} -E copy ${UR_HEADERS_TO_COPY} ${SYCL_INCLUDE_BUILD_DIR} COMMENT "Copying SYCL headers ...") # Copy SYCL headers from source to install directory