From 0cb701d8167be76e116338a4af793ac8b2e9d7f8 Mon Sep 17 00:00:00 2001 From: Callum Fare Date: Fri, 2 Aug 2024 14:23:55 +0100 Subject: [PATCH] Add specific install components for the UR loader and UMF. Remove the level-zero-sycl-dev component as it is now unused. --- sycl/CMakeLists.txt | 3 ++- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 17 ++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt index 1d5859cca5016..0cbf633efe3f6 100644 --- a/sycl/CMakeLists.txt +++ b/sycl/CMakeLists.txt @@ -447,7 +447,8 @@ set( SYCL_TOOLCHAIN_DEPLOY_COMPONENTS sycl-headers-extras sycl libsycldevice - level-zero-sycl-dev + unified-memory-framework + unified-runtime-loader ${XPTIFW_LIBS} ${SYCL_TOOLCHAIN_DEPS} ) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 6da3439a84003..ddf9983393a59 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -230,14 +230,10 @@ find_package(Threads REQUIRED) if(TARGET UnifiedRuntimeLoader) # Install the UR loader. - # TODO: this is piggy-backing on the existing target component level-zero-sycl-dev - # When UR is moved to its separate repo perhaps we should introduce new component, - # e.g. unified-runtime-sycl-dev. - # See github issue #14598 install(TARGETS ur_loader - LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT level-zero-sycl-dev - ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT level-zero-sycl-dev - RUNTIME DESTINATION "bin" COMPONENT level-zero-sycl-dev + LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT unified-runtime-loader + ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT unified-runtime-loader + RUNTIME DESTINATION "bin" COMPONENT unified-runtime-loader ) endif() @@ -301,8 +297,7 @@ if("native_cpu" IN_LIST SYCL_ENABLE_PLUGINS) endif() endif() -# TODO: this is piggy-backing on the existing target component level-zero-sycl-dev install(TARGETS umf - LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT level-zero-sycl-dev - ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT level-zero-sycl-dev - RUNTIME DESTINATION "bin" COMPONENT level-zero-sycl-dev) + LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT unified-memory-framework + ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" COMPONENT unified-memory-framework + RUNTIME DESTINATION "bin" COMPONENT unified-memory-framework)