From eaed05a860ee1d6f76a39f1fae49e7c5b2e0f995 Mon Sep 17 00:00:00 2001 From: Ajay Date: Mon, 17 Jul 2023 15:48:13 -0700 Subject: [PATCH] SWDEV-411709 - rename .hipVersion to version. Fix path to share/hip Change-Id: Ic7ec170f2fc6e3197d9a37b28dfc1d0b9611954b [ROCm/clr commit: 2205684f6c67677d40725605bd4b17dbb58c5931] --- projects/clr/hipamd/CMakeLists.txt | 13 +++++++------ projects/clr/hipamd/hip-backward-compat.cmake | 12 ++++++++++-- projects/clr/hipamd/packaging/CMakeLists.txt | 7 ++++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/projects/clr/hipamd/CMakeLists.txt b/projects/clr/hipamd/CMakeLists.txt index 55cd58cd7e..6b411d1a91 100755 --- a/projects/clr/hipamd/CMakeLists.txt +++ b/projects/clr/hipamd/CMakeLists.txt @@ -302,8 +302,8 @@ endif() # Generate .hipInfo file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo}) -# Generate .hipVersion -file(WRITE "${PROJECT_BINARY_DIR}/.hipVersion" ${_versionInfo}) +# Generate version +file(WRITE "${PROJECT_BINARY_DIR}/version" ${_versionInfo}) # Build doxygen documentation find_program(DOXYGEN_EXE doxygen) @@ -326,11 +326,12 @@ endif() # Install .hipInfo install(FILES ${PROJECT_BINARY_DIR}/.hipInfo DESTINATION ${CMAKE_INSTALL_LIBDIR}) -# Install .hipVersion +# Install version +install(FILES ${PROJECT_BINARY_DIR}/version DESTINATION ${CMAKE_INSTALL_DATADIR}/hip) +# .hipVersion is added to satisfy Windows compute build. +#TODO to be removed if(WIN32) - install(FILES ${PROJECT_BINARY_DIR}/.hipVersion DESTINATION ${CMAKE_INSTALL_BINDIR}) -else() - install(FILES ${PROJECT_BINARY_DIR}/.hipVersion DESTINATION ${CMAKE_INSTALL_DATADIR}/hip RENAME version) + install(FILES ${PROJECT_BINARY_DIR}/version DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME .hipVersion) endif() # Install src, bin, include & cmake if necessary diff --git a/projects/clr/hipamd/hip-backward-compat.cmake b/projects/clr/hipamd/hip-backward-compat.cmake index ac415966e1..a625b63217 100644 --- a/projects/clr/hipamd/hip-backward-compat.cmake +++ b/projects/clr/hipamd/hip-backward-compat.cmake @@ -23,6 +23,7 @@ set(HIP_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(HIP_WRAPPER_DIR ${HIP_BUILD_DIR}/wrapper_dir) set(HIP_WRAPPER_INC_DIR ${HIP_WRAPPER_DIR}/include/hip) set(HIP_WRAPPER_BIN_DIR ${HIP_WRAPPER_DIR}/bin) +set(HIP_WRAPPER_DATA_DIR ${HIP_WRAPPER_DIR}/share) set(HIP_WRAPPER_LIB_DIR ${HIP_WRAPPER_DIR}/lib) set(HIP_WRAPPER_CMAKE_DIR ${HIP_WRAPPER_DIR}/cmake) set(HIP_WRAPPER_FINDHIP_DIR ${HIP_WRAPPER_DIR}/FindHIP) @@ -109,8 +110,6 @@ function(create_binary_symlink) file(MAKE_DIRECTORY ${HIP_WRAPPER_BIN_DIR}) #get all binaries file(GLOB binary_files ${HIP_SRC_BIN_DIR}/*) - #Add .hipVersion to binary list - set(binary_files "${binary_files}" ".hipVersion") foreach(binary_file ${binary_files}) get_filename_component(file_name ${binary_file} NAME) add_custom_target(link_${file_name} ALL @@ -217,6 +216,15 @@ generate_wrapper_header() install(DIRECTORY ${HIP_WRAPPER_INC_DIR} DESTINATION hip/include COMPONENT dev) # Create symlink to binaries create_binary_symlink() + +# version file +file(MAKE_DIRECTORY ${HIP_WRAPPER_DATA_DIR} ${HIP_WRAPPER_DATA_DIR}/hip) +add_custom_target(link_version ALL + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E create_symlink + ../../../share/hip/version ${HIP_WRAPPER_DATA_DIR}/hip/version) + +install(DIRECTORY ${HIP_WRAPPER_DATA_DIR} DESTINATION hip COMPONENT dev) install(DIRECTORY ${HIP_WRAPPER_BIN_DIR} DESTINATION hip COMPONENT dev) option(BUILD_SHARED_LIBS "Build the shared library" ON) diff --git a/projects/clr/hipamd/packaging/CMakeLists.txt b/projects/clr/hipamd/packaging/CMakeLists.txt index e6d725b675..59551649fe 100644 --- a/projects/clr/hipamd/packaging/CMakeLists.txt +++ b/projects/clr/hipamd/packaging/CMakeLists.txt @@ -96,10 +96,11 @@ install(FILES ${CMAKE_BINARY_DIR}/hipamd/include/hip/amd_detail/hip_prof_str.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hip/amd_detail COMPONENT dev) install(FILES ${CMAKE_BINARY_DIR}/hipamd/include/hip/hip_version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hip COMPONENT dev) +install(FILES ${CMAKE_BINARY_DIR}/hipamd/version DESTINATION ${CMAKE_INSTALL_DATADIR}/hip COMPONENT dev) +# .hipVersion is added to satisfy Windows compute build. +#TODO to be removed if(WIN32) - install(FILES ${CMAKE_BINARY_DIR}/hipamd/.hipVersion DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT dev) -else() - install(FILES ${CMAKE_BINARY_DIR}/hipamd/.hipVersion DESTINATION ${CMAKE_INSTALL_DATADIR}/hip RENAME version COMPONENT dev) + install(FILES ${CMAKE_BINARY_DIR}/hipamd/version DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME .hipVersion COMPONENT dev) endif() install(DIRECTORY ${HIP_COMMON_DIR}/cmake/ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/hip COMPONENT dev) install(FILES ${CMAKE_BINARY_DIR}/hipamd/hip-config.cmake ${CMAKE_BINARY_DIR}/hipamd/hip-config-version.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/hip COMPONENT dev)