AI/rocm-systems
2
0
Forka 0
Codice Problemi Pull Request Actions Pacchetti Progetti Rilasci Wiki Attività

hipcc.bin and hipconfig.bin packaging updates:

Sfoglia il codice sorgente 
- revert f313c2ea80
  - package hipcc.bin and hipconfig.bin in hip-devel

Change-Id: Iadfd2f64780b7ee2dce677436a7882d7fca74fb3
This commit is contained in:
Konstantin Zhuravlyov
2022-01-18 09:34:50 -05:00
committato da Konstantin Zhuravlyov
parent bafc5bb30f
commit d7ec25785d
3 ha cambiato i file con 9 aggiunte e 85 eliminazioni
Scarica il file Patch Scarica il file Diff Expand all files Collapse all files
hipamd/CMakeLists.txt
+3 -22
Vedi File
@@ -44,6 +44,7 @@ option(__HIP_ENABLE_PCH "Enable/Disable pre-compiled hip headers" ON)
option(__HIP_ENABLE_RTC "Enable/Disable pre-processed hiprtc shared lib" ON)
option(__HIP_USE_CMPXCHG_FOR_FP_ATOMICS "Enable/Disable FP Atomics version" OFF)
option(HIP_OFFICIAL_BUILD "Enable/Disable for mainline/staging builds" OFF)
set(HIPCC_BIN_DIR "" CACHE STRING "HIPCC and HIPCONFIG binary directories")
if(__HIP_ENABLE_PCH)
set(_pchStatus 1)
@@ -55,7 +56,8 @@ if(__HIP_USE_CMPXCHG_FOR_FP_ATOMICS)
add_definitions(-D__HIP_USE_CMPXCHG_FOR_FP_ATOMICS)
endif()
message (STATUS "HIP_COMMON_DIR found at ${HIP_COMMON_DIR}" )
message(STATUS "HIPCC_BIN_DIR found at ${HIPCC_BIN_DIR}")
message(STATUS "HIP_COMMON_DIR found at ${HIP_COMMON_DIR}")
set(HIP_COMMON_INCLUDE_DIR ${HIP_COMMON_DIR}/include)
set(HIP_COMMON_BIN_DIR ${HIP_COMMON_DIR}/bin)
set(__HIPCONFIG_EXECUTABLE__ ${HIP_COMMON_DIR}/bin/hipconfig)
@@ -322,12 +324,6 @@ install(FILES ${PROJECT_BINARY_DIR}/.hipInfo DESTINATION lib)
# Install .hipVersion
install(FILES ${PROJECT_BINARY_DIR}/.hipVersion DESTINATION bin)
# Install hipcc binaries
if(HIPCC_BIN_DIR)
install(FILES ${HIPCC_BIN_DIR}/hipcc.bin DESTINATION bin)
install(FILES ${HIPCC_BIN_DIR}/hipconfig.bin DESTINATION bin)
endif()
# Install src, bin, include & cmake if necessary
execute_process(COMMAND test ${CMAKE_INSTALL_PREFIX} -ef ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE INSTALL_SOURCE)
@@ -432,18 +428,6 @@ if(HIP_RUNTIME STREQUAL "rocclr")
WORKING_DIRECTORY ${BUILD_DIR} )
endif()
# Package: hipcc (if HIPCC_BIN_DIR is available)
message(STATUS "HIPCC_BIN_DIR found at ${HIPCC_BIN_DIR}" )
set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hipcc)
configure_file(packaging/hipcc.txt ${BUILD_DIR}/CMakeLists.txt @ONLY)
add_custom_target(pkg_hipcc COMMAND ${CMAKE_COMMAND} .
COMMAND rm -rf *.deb *.rpm *.tar.gz
COMMAND make package
COMMAND cp *.deb ${PROJECT_BINARY_DIR}
COMMAND cp *.rpm ${PROJECT_BINARY_DIR}
COMMAND cp *.tar.gz ${PROJECT_BINARY_DIR}
WORKING_DIRECTORY ${BUILD_DIR})
# Package: hip_runtime_nvidia
set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hip-runtime-nvidia)
configure_file(packaging/hip-runtime-nvidia.txt ${BUILD_DIR}/CMakeLists.txt @ONLY)
@@ -498,9 +482,6 @@ endif()
if(HIP_RUNTIME STREQUAL "rocclr")
set(package_list pkg_hip_base hip_on_rocclr pkg_hip_nvcc pkg_hip_doc pkg_hip_samples)
if(HIPCC_BIN_DIR)
set(package_list ${package_list} pkg_hipcc)
endif()
if(HIP_CATCH_TEST EQUAL "1")
set(package_list ${package_list} pkg_hip_catch_tests)
endif()
hipamd/packaging/hip-devel.txt
+6
Vedi File
@@ -27,6 +27,12 @@ else()
install(DIRECTORY @HIP_COMMON_DIR@/bin DESTINATION . USE_SOURCE_PERMISSIONS
PATTERN *.bat EXCLUDE)
endif()
if (NOT @HIPCC_BIN_DIR@ STREQUAL "")
install(PROGRAMS @HIPCC_BIN_DIR@/hipcc.bin DESTINATION bin)
install(PROGRAMS @HIPCC_BIN_DIR@/hipconfig.bin DESTINATION bin)
endif()
install(DIRECTORY @hip_SOURCE_DIR@/bin DESTINATION . USE_SOURCE_PERMISSIONS)
install(DIRECTORY @HIP_COMMON_DIR@/include DESTINATION .)
install(DIRECTORY @hip_SOURCE_DIR@/include/hip/amd_detail DESTINATION include/hip)
hipamd/packaging/hipcc.txt
-63
Vedi File
@@ -1,63 +0,0 @@
cmake_minimum_required(VERSION 3.6.3)
project(hipcc)
install(PROGRAMS @HIPCC_BIN_DIR@/hipcc.bin DESTINATION bin )
install(PROGRAMS @HIPCC_BIN_DIR@/hipconfig.bin DESTINATION bin )
# hipcc.txt is processed to produce CMakeList.txt,
# pass down value from parent
set(ROCM_DEP_ROCMCORE "@ROCM_DEP_ROCMCORE@")
#############################
# Packaging steps
#############################
set(CPACK_PACKAGE_NAME "hipcc")
set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.")
set(CPACK_PACKAGE_VERSION_MAJOR @HIP_VERSION_MAJOR@)
set(CPACK_PACKAGE_VERSION_MINOR @HIP_VERSION_MINOR@)
set(CPACK_PACKAGE_VERSION_PATCH @HIP_PACKAGING_VERSION_PATCH@)
set(CPACK_PACKAGE_CONTACT "HIP Support <hip.support@amd.com>")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP compiler driver (hipcc)")
set(CPACK_PACKAGE_DESCRIPTION "hipcc is a compiler driver utility that will call clang or nvcc,
depending on target, and pass the appropriate include and library options
for the target compiler and HIP infrastructure.")
set(CPACK_SET_DESTDIR TRUE)
set(CPACK_INSTALL_PREFIX @CPACK_INSTALL_PREFIX@ )
set(CPACK_GENERATOR "TGZ;DEB;RPM")
#Debian package specific variables
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_DEBIAN_PACKAGE_HOMEPAGE} CACHE STRING "https://github.com/RadeonOpenCompute/ROCm")
if(ROCM_DEP_ROCMCORE)
set(CPACK_DEBIAN_PACKAGE_DEPENDS "rocm-core")
endif()
if (DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
set(CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE})
else()
set(CPACK_DEBIAN_PACKAGE_RELEASE "local")
endif()
#RPM package specific variables
set(CPACK_RPM_PACKAGE_AUTOREQPROV "NO")
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt" "${ROCM_PATH}" "@CPACK_PACKAGING_INSTALL_PREFIX@" "@CPACK_PACKAGING_INSTALL_PREFIX@/bin")
if(ROCM_DEP_ROCMCORE)
set(CPACK_RPM_PACKAGE_REQUIRES "rocm-core")
endif()
if(DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE})
set(CPACK_RPM_PACKAGE_RELEASE $ENV{CPACK_RPM_PACKAGE_RELEASE})
else()
set(CPACK_RPM_PACKAGE_RELEASE "local")
endif()
#Set rpm distro
if(CPACK_RPM_PACKAGE_RELEASE)
set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
endif()
#Prepare final version for the CAPACK use
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}.${ROCM_VERSION_FOR_PACKAGE}")
#Set the names now using CPACK utility
set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
include(CPack)