From ee44fffd35af7e30b5e8b5ac9978b04ae2532ff1 Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Sun, 1 Dec 2019 14:47:43 +0530 Subject: [PATCH] Revert "[packaging] Conform to debian package naming rules (#1647)" (#1688) This reverts commit 8016fa32df714b478f2d9431d85282a71c61c11c. [ROCm/hip commit: 4585b7f6f3df21526b3fabe73d2b40b0d8068778] --- projects/hip/CMakeLists.txt | 31 ++++------- projects/hip/INSTALL.md | 8 +-- .../hip/docker/dockerfile-hip-ubuntu-16.04 | 8 +-- projects/hip/install.sh | 4 +- projects/hip/packaging/hip-hcc.txt | 54 ------------------- .../{hip-base.postinst => hip_base.postinst} | 0 .../{hip-base.prerm => hip_base.prerm} | 0 .../packaging/{hip-base.txt => hip_base.txt} | 3 +- .../packaging/{hip-doc.txt => hip_doc.txt} | 7 ++- .../{hip-hcc.postinst => hip_hcc.postinst} | 0 .../{hip-hcc.prerm => hip_hcc.prerm} | 0 projects/hip/packaging/hip_hcc.txt | 31 +++++++++-- .../packaging/{hip-nvcc.txt => hip_nvcc.txt} | 7 ++- .../{hip-samples.txt => hip_samples.txt} | 7 ++- 14 files changed, 58 insertions(+), 102 deletions(-) delete mode 100644 projects/hip/packaging/hip-hcc.txt rename projects/hip/packaging/{hip-base.postinst => hip_base.postinst} (100%) rename projects/hip/packaging/{hip-base.prerm => hip_base.prerm} (100%) rename projects/hip/packaging/{hip-base.txt => hip_base.txt} (96%) rename projects/hip/packaging/{hip-doc.txt => hip_doc.txt} (89%) rename projects/hip/packaging/{hip-hcc.postinst => hip_hcc.postinst} (100%) rename projects/hip/packaging/{hip-hcc.prerm => hip_hcc.prerm} (100%) rename projects/hip/packaging/{hip-nvcc.txt => hip_nvcc.txt} (87%) rename projects/hip/packaging/{hip-samples.txt => hip_samples.txt} (85%) diff --git a/projects/hip/CMakeLists.txt b/projects/hip/CMakeLists.txt index 5f388f080b..b26ee22d62 100644 --- a/projects/hip/CMakeLists.txt +++ b/projects/hip/CMakeLists.txt @@ -421,9 +421,9 @@ endif() ############################# # Package: hip_base set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hip_base) -configure_file(packaging/hip-base.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) -configure_file(packaging/hip-base.postinst ${BUILD_DIR}/postinst @ONLY) -configure_file(packaging/hip-base.prerm ${BUILD_DIR}/prerm @ONLY) +configure_file(packaging/hip_base.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) +configure_file(packaging/hip_base.postinst ${BUILD_DIR}/postinst @ONLY) +configure_file(packaging/hip_base.prerm ${BUILD_DIR}/prerm @ONLY) add_custom_target(pkg_hip_base COMMAND ${CMAKE_COMMAND} . COMMAND rm -rf *.deb *.rpm *.tar.gz @@ -441,9 +441,9 @@ endif() # Package: hip_hcc set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hip_hcc) -configure_file(packaging/hip-hcc.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) -configure_file(packaging/hip-hcc.postinst ${BUILD_DIR}/postinst @ONLY) -configure_file(packaging/hip-hcc.prerm ${BUILD_DIR}/prerm @ONLY) +configure_file(packaging/hip_hcc.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) +configure_file(packaging/hip_hcc.postinst ${BUILD_DIR}/postinst @ONLY) +configure_file(packaging/hip_hcc.prerm ${BUILD_DIR}/prerm @ONLY) add_custom_target(pkg_hip_hcc COMMAND ${CMAKE_COMMAND} . COMMAND rm -rf *.deb *.rpm *.tar.gz COMMAND make package @@ -455,7 +455,7 @@ add_custom_target(pkg_hip_hcc COMMAND ${CMAKE_COMMAND} . # Package: hip_nvcc set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hip_nvcc) -configure_file(packaging/hip-nvcc.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) +configure_file(packaging/hip_nvcc.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) add_custom_target(pkg_hip_nvcc COMMAND ${CMAKE_COMMAND} . COMMAND rm -rf *.deb *.rpm *.tar.gz COMMAND make package @@ -466,7 +466,7 @@ add_custom_target(pkg_hip_nvcc COMMAND ${CMAKE_COMMAND} . # Package: hip_doc set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hip_doc) -configure_file(packaging/hip-doc.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) +configure_file(packaging/hip_doc.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) add_custom_target(pkg_hip_doc COMMAND ${CMAKE_COMMAND} . COMMAND rm -rf *.deb *.rpm *.tar.gz COMMAND make package @@ -477,7 +477,7 @@ add_custom_target(pkg_hip_doc COMMAND ${CMAKE_COMMAND} . # Package: hip_samples set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hip_samples) -configure_file(packaging/hip-samples.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) +configure_file(packaging/hip_samples.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) add_custom_target(pkg_hip_samples COMMAND ${CMAKE_COMMAND} . COMMAND rm -rf *.deb *.rpm *.tar.gz COMMAND make package @@ -486,17 +486,6 @@ add_custom_target(pkg_hip_samples COMMAND ${CMAKE_COMMAND} . COMMAND cp *.tar.gz ${PROJECT_BINARY_DIR} WORKING_DIRECTORY ${BUILD_DIR}) -# Package: hip_hcc_legacy -set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hip_hcc_legacy) -configure_file(packaging/hip_hcc.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) -add_custom_target(pkg_hip_hcc_legacy 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: all if(POLICY CMP0037) cmake_policy(PUSH) @@ -509,7 +498,7 @@ for i in *.rpm ; do mv \$i \${i/.rpm/.x86_64.rpm} ; done add_custom_target(package COMMAND bash ${PROJECT_BINARY_DIR}/fixnames WORKING_DIRECTORY ${PROJECT_BINARY_DIR} - DEPENDS pkg_hip_base pkg_hip_hcc pkg_hip_nvcc pkg_hip_doc pkg_hip_samples pkg_hip_hcc_legacy) + DEPENDS pkg_hip_base pkg_hip_hcc pkg_hip_nvcc pkg_hip_doc pkg_hip_samples) if(POLICY CMP0037) cmake_policy(POP) endif() diff --git a/projects/hip/INSTALL.md b/projects/hip/INSTALL.md index 2dc12f81a8..273c77a23c 100644 --- a/projects/hip/INSTALL.md +++ b/projects/hip/INSTALL.md @@ -24,9 +24,9 @@ HIP code can be developed either on AMD ROCm platform using hcc or clang compile ## HIP-hcc * Add the ROCm package server to your system as per the OS-specific guide available [here](https://rocm.github.io/ROCmInstall.html#installing-from-amd-rocm-repositories). -* Install the "hip-hcc" package. This will install HCC and the HIP porting layer. +* Install the "hip_hcc" package. This will install HCC and the HIP porting layer. ``` -apt-get install hip-hcc +apt-get install hip_hcc ``` * Default paths and environment variables: @@ -67,9 +67,9 @@ apt-get install hip-hcc ## HIP-nvcc * Add the ROCm package server to your system as per the OS-specific guide available [here](https://rocm.github.io/ROCmInstall.html#installing-from-amd-rocm-repositories). -* Install the "hip-nvcc" package. This will install CUDA SDK and the HIP porting layer. +* Install the "hip_nvcc" package. This will install CUDA SDK and the HIP porting layer. ``` -apt-get install hip-nvcc +apt-get install hip_nvcc ``` * Default paths and environment variables: diff --git a/projects/hip/docker/dockerfile-hip-ubuntu-16.04 b/projects/hip/docker/dockerfile-hip-ubuntu-16.04 index 93dd17b948..0852ae38c5 100644 --- a/projects/hip/docker/dockerfile-hip-ubuntu-16.04 +++ b/projects/hip/docker/dockerfile-hip-ubuntu-16.04 @@ -10,10 +10,10 @@ COPY *.deb /tmp/ # Install the debian package RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --allow-unauthenticated -y \ - /tmp/hip-base-*.deb \ - /tmp/hip-hcc-*.deb \ - /tmp/hip-doc-*.deb \ - /tmp/hip-samples-* \ + /tmp/hip_base-*.deb \ + /tmp/hip_hcc-*.deb \ + /tmp/hip_doc-*.deb \ + /tmp/hip_samples-* \ && rm -f /tmp/*.deb \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/projects/hip/install.sh b/projects/hip/install.sh index 51a303e812..c7dc48e1a8 100755 --- a/projects/hip/install.sh +++ b/projects/hip/install.sh @@ -35,8 +35,8 @@ function buildHIP() make $DASH_JAY make package rename -v 's/([a-z0-9_.\-]).deb/$1-amd64.deb/' *.deb;rename -v 's/([a-z0-9_.\-]).rpm/$1.x86_64.rpm/' *.rpm - cp hip-*.deb $WORKING_DIR - sudo dpkg -i hip-base*.deb hip-hcc*.deb hip-sample*.deb hip-doc*.deb + cp hip_*.deb $WORKING_DIR + sudo dpkg -i hip_base*.deb hip_hcc*.deb hip_sample*.deb hip_doc*.deb popd rm -rf $BUILD_ROOT } diff --git a/projects/hip/packaging/hip-hcc.txt b/projects/hip/packaging/hip-hcc.txt deleted file mode 100644 index 0ccf75af50..0000000000 --- a/projects/hip/packaging/hip-hcc.txt +++ /dev/null @@ -1,54 +0,0 @@ -cmake_minimum_required(VERSION 2.8.3) -project(hip_hcc) - -install(FILES @PROJECT_BINARY_DIR@/libhip_hcc.so DESTINATION lib) -install(FILES @PROJECT_BINARY_DIR@/libhip_hcc_static.a DESTINATION lib) -if(NOT @HIP_COMPILER@ STREQUAL "clang") - install(FILES @PROJECT_BINARY_DIR@/libhiprtc.so DESTINATION lib) -endif() -install(FILES @PROJECT_BINARY_DIR@/.hipInfo DESTINATION lib) -install(FILES @PROJECT_BINARY_DIR@/hip-config.cmake @PROJECT_BINARY_DIR@/hip-config-version.cmake DESTINATION lib/cmake/hip) -install(FILES @hip_SOURCE_DIR@/packaging/hip-targets.cmake @hip_SOURCE_DIR@/packaging/hip-targets-release.cmake DESTINATION lib/cmake/hip) - -############################# -# Packaging steps -############################# -set(CPACK_SET_DESTDIR TRUE) -set(CPACK_INSTALL_PREFIX "/opt/rocm/hip") -set(CPACK_PACKAGE_NAME "hip-hcc") -if(@HCC_VERSION_MAJOR@ EQUAL 0) - set(HCC_PACKAGE_NAME "hcc_lc") -else() - set(HCC_PACKAGE_NAME "hcc") -endif() -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [HCC]") -set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.") -set(CPACK_PACKAGE_CONTACT "Maneesh Gupta ") -set(CPACK_PACKAGE_VERSION @HIP_VERSION_MAJOR@.@HIP_VERSION_MINOR@.@HIP_VERSION_PATCH@) -set(CPACK_PACKAGE_VERSION_MAJOR @HIP_VERSION_MAJOR@) -set(CPACK_PACKAGE_VERSION_MINOR @HIP_VERSION_MINOR@) -set(CPACK_PACKAGE_VERSION_PATCH @HIP_VERSION_PATCH@) -set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) -set(CPACK_GENERATOR "TGZ;DEB;RPM") -set(CPACK_BINARY_DEB "ON") -set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm") -if(@COMPILE_HIP_ATP_MARKER@) - set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION}), ${HCC_PACKAGE_NAME} (= @HCC_PACKAGE_VERSION@), rocm-profiler, comgr (>= 1.1)") -else() - set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION}), ${HCC_PACKAGE_NAME} (= @HCC_PACKAGE_VERSION@), comgr (>= 1.1)") -endif() -set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_hcc") -set(CPACK_BINARY_RPM "ON") -set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") -set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/postinst") -set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/prerm") -set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") -string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION}) -if(@COMPILE_HIP_ATP_MARKER@) - set(CPACK_RPM_PACKAGE_REQUIRES "hip-base = ${HIP_BASE_VERSION}, ${HCC_PACKAGE_NAME} = @HCC_PACKAGE_VERSION@, rocm-profiler, comgr >= 1.1") -else() - set(CPACK_RPM_PACKAGE_REQUIRES "hip-base = ${HIP_BASE_VERSION}, ${HCC_PACKAGE_NAME} = @HCC_PACKAGE_VERSION@, comgr >= 1.1") -endif() -set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") -set(CPACK_SOURCE_GENERATOR "TGZ") -include(CPack) diff --git a/projects/hip/packaging/hip-base.postinst b/projects/hip/packaging/hip_base.postinst similarity index 100% rename from projects/hip/packaging/hip-base.postinst rename to projects/hip/packaging/hip_base.postinst diff --git a/projects/hip/packaging/hip-base.prerm b/projects/hip/packaging/hip_base.prerm similarity index 100% rename from projects/hip/packaging/hip-base.prerm rename to projects/hip/packaging/hip_base.prerm diff --git a/projects/hip/packaging/hip-base.txt b/projects/hip/packaging/hip_base.txt similarity index 96% rename from projects/hip/packaging/hip-base.txt rename to projects/hip/packaging/hip_base.txt index 381c8b66d1..a44f0acb74 100644 --- a/projects/hip/packaging/hip-base.txt +++ b/projects/hip/packaging/hip_base.txt @@ -16,7 +16,7 @@ install(DIRECTORY @hip_SOURCE_DIR@/cmake DESTINATION .) ############################# set(CPACK_SET_DESTDIR TRUE) set(CPACK_INSTALL_PREFIX "/opt/rocm/hip") -set(CPACK_PACKAGE_NAME "hip-base") +set(CPACK_PACKAGE_NAME "hip_base") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [BASE]") set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.") set(CPACK_PACKAGE_CONTACT "Maneesh Gupta ") @@ -29,7 +29,6 @@ set(CPACK_GENERATOR "TGZ;DEB;RPM") set(CPACK_BINARY_DEB "ON") set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm") set(CPACK_DEBIAN_PACKAGE_DEPENDS "perl (>= 5.0)") -set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_base") set(CPACK_BINARY_RPM "ON") set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/postinst") diff --git a/projects/hip/packaging/hip-doc.txt b/projects/hip/packaging/hip_doc.txt similarity index 89% rename from projects/hip/packaging/hip-doc.txt rename to projects/hip/packaging/hip_doc.txt index 5f07785ba5..2c1619f221 100644 --- a/projects/hip/packaging/hip-doc.txt +++ b/projects/hip/packaging/hip_doc.txt @@ -20,7 +20,7 @@ endif() ############################# set(CPACK_SET_DESTDIR TRUE) set(CPACK_INSTALL_PREFIX "/opt/rocm/hip") -set(CPACK_PACKAGE_NAME "hip-doc") +set(CPACK_PACKAGE_NAME "hip_doc") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [DOCUMENTATION]") set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.") set(CPACK_PACKAGE_CONTACT "Maneesh Gupta ") @@ -31,13 +31,12 @@ set(CPACK_PACKAGE_VERSION_PATCH @HIP_VERSION_PATCH@) set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) set(CPACK_GENERATOR "TGZ;DEB;RPM") set(CPACK_BINARY_DEB "ON") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION})") -set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_doc") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_base (= ${CPACK_PACKAGE_VERSION})") set(CPACK_BINARY_RPM "ON") set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION}) -set(CPACK_RPM_PACKAGE_REQUIRES "hip-base = ${HIP_BASE_VERSION}") +set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${HIP_BASE_VERSION}") set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") set(CPACK_SOURCE_GENERATOR "TGZ") include(CPack) diff --git a/projects/hip/packaging/hip-hcc.postinst b/projects/hip/packaging/hip_hcc.postinst similarity index 100% rename from projects/hip/packaging/hip-hcc.postinst rename to projects/hip/packaging/hip_hcc.postinst diff --git a/projects/hip/packaging/hip-hcc.prerm b/projects/hip/packaging/hip_hcc.prerm similarity index 100% rename from projects/hip/packaging/hip-hcc.prerm rename to projects/hip/packaging/hip_hcc.prerm diff --git a/projects/hip/packaging/hip_hcc.txt b/projects/hip/packaging/hip_hcc.txt index 083288d5bd..c688433cc0 100644 --- a/projects/hip/packaging/hip_hcc.txt +++ b/projects/hip/packaging/hip_hcc.txt @@ -1,5 +1,14 @@ cmake_minimum_required(VERSION 2.8.3) -project(hip_hcc_legacy) +project(hip_hcc) + +install(FILES @PROJECT_BINARY_DIR@/libhip_hcc.so DESTINATION lib) +install(FILES @PROJECT_BINARY_DIR@/libhip_hcc_static.a DESTINATION lib) +if(NOT @HIP_COMPILER@ STREQUAL "clang") + install(FILES @PROJECT_BINARY_DIR@/libhiprtc.so DESTINATION lib) +endif() +install(FILES @PROJECT_BINARY_DIR@/.hipInfo DESTINATION lib) +install(FILES @PROJECT_BINARY_DIR@/hip-config.cmake @PROJECT_BINARY_DIR@/hip-config-version.cmake DESTINATION lib/cmake/hip) +install(FILES @hip_SOURCE_DIR@/packaging/hip-targets.cmake @hip_SOURCE_DIR@/packaging/hip-targets-release.cmake DESTINATION lib/cmake/hip) ############################# # Packaging steps @@ -7,6 +16,11 @@ project(hip_hcc_legacy) set(CPACK_SET_DESTDIR TRUE) set(CPACK_INSTALL_PREFIX "/opt/rocm/hip") set(CPACK_PACKAGE_NAME "hip_hcc") +if(@HCC_VERSION_MAJOR@ EQUAL 0) + set(HCC_PACKAGE_NAME "hcc_lc") +else() + set(HCC_PACKAGE_NAME "hcc") +endif() set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [HCC]") set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.") set(CPACK_PACKAGE_CONTACT "Maneesh Gupta ") @@ -17,12 +31,23 @@ set(CPACK_PACKAGE_VERSION_PATCH @HIP_VERSION_PATCH@) set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) set(CPACK_GENERATOR "TGZ;DEB;RPM") set(CPACK_BINARY_DEB "ON") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-hcc (= ${CPACK_PACKAGE_VERSION})") +set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm") +if(@COMPILE_HIP_ATP_MARKER@) + set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_base (= ${CPACK_PACKAGE_VERSION}), ${HCC_PACKAGE_NAME} (= @HCC_PACKAGE_VERSION@), rocm-profiler, comgr (>= 1.1)") +else() + set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_base (= ${CPACK_PACKAGE_VERSION}), ${HCC_PACKAGE_NAME} (= @HCC_PACKAGE_VERSION@), comgr (>= 1.1)") +endif() set(CPACK_BINARY_RPM "ON") set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") +set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/postinst") +set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/prerm") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION}) -set(CPACK_RPM_PACKAGE_REQUIRES "hip-hcc = ${HIP_BASE_VERSION}") +if(@COMPILE_HIP_ATP_MARKER@) + set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${HIP_BASE_VERSION}, ${HCC_PACKAGE_NAME} = @HCC_PACKAGE_VERSION@, rocm-profiler, comgr >= 1.1") +else() + set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${HIP_BASE_VERSION}, ${HCC_PACKAGE_NAME} = @HCC_PACKAGE_VERSION@, comgr >= 1.1") +endif() set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") set(CPACK_SOURCE_GENERATOR "TGZ") include(CPack) diff --git a/projects/hip/packaging/hip-nvcc.txt b/projects/hip/packaging/hip_nvcc.txt similarity index 87% rename from projects/hip/packaging/hip-nvcc.txt rename to projects/hip/packaging/hip_nvcc.txt index 11c1c290a7..975176f934 100644 --- a/projects/hip/packaging/hip-nvcc.txt +++ b/projects/hip/packaging/hip_nvcc.txt @@ -6,7 +6,7 @@ project(hip_nvcc) ############################# set(CPACK_SET_DESTDIR TRUE) set(CPACK_INSTALL_PREFIX "/opt/rocm/hip") -set(CPACK_PACKAGE_NAME "hip-nvcc") +set(CPACK_PACKAGE_NAME "hip_nvcc") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [NVCC]") set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.") set(CPACK_PACKAGE_CONTACT "Maneesh Gupta ") @@ -18,15 +18,14 @@ set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR} set(CPACK_GENERATOR "TGZ;DEB;RPM") set(CPACK_BINARY_DEB "ON") #set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION}), cuda (>= 7.5)") -set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_nvcc") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_base (= ${CPACK_PACKAGE_VERSION}), cuda (>= 7.5)") set(CPACK_BINARY_RPM "ON") set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") #set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/postinst") #set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/prerm") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION}) -set(CPACK_RPM_PACKAGE_REQUIRES "hip-base = ${HIP_BASE_VERSION}, cuda >= 7.5") +set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${HIP_BASE_VERSION}, cuda >= 7.5") set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") set(CPACK_SOURCE_GENERATOR "TGZ") include(CPack) diff --git a/projects/hip/packaging/hip-samples.txt b/projects/hip/packaging/hip_samples.txt similarity index 85% rename from projects/hip/packaging/hip-samples.txt rename to projects/hip/packaging/hip_samples.txt index 8a8bd05ceb..4c1e04cb23 100644 --- a/projects/hip/packaging/hip-samples.txt +++ b/projects/hip/packaging/hip_samples.txt @@ -8,7 +8,7 @@ install(DIRECTORY @hip_SOURCE_DIR@/samples DESTINATION .) ############################# set(CPACK_SET_DESTDIR TRUE) set(CPACK_INSTALL_PREFIX "/opt/rocm/hip") -set(CPACK_PACKAGE_NAME "hip-samples") +set(CPACK_PACKAGE_NAME "hip_samples") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [SAMPLES]") set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.") set(CPACK_PACKAGE_CONTACT "Maneesh Gupta ") @@ -19,13 +19,12 @@ set(CPACK_PACKAGE_VERSION_PATCH @HIP_VERSION_PATCH@) set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) set(CPACK_GENERATOR "TGZ;DEB;RPM") set(CPACK_BINARY_DEB "ON") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION})") -set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_samples") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip_base (= ${CPACK_PACKAGE_VERSION})") set(CPACK_BINARY_RPM "ON") set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") string(REPLACE "-" "_" HIP_BASE_VERSION ${CPACK_PACKAGE_VERSION}) -set(CPACK_RPM_PACKAGE_REQUIRES "hip-base = ${HIP_BASE_VERSION}") +set(CPACK_RPM_PACKAGE_REQUIRES "hip_base = ${HIP_BASE_VERSION}") set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt") set(CPACK_SOURCE_GENERATOR "TGZ") include(CPack)