SWDEV-287869 - [HIP] Package rename

Change-Id: Ic4ddece01bfc34d586cfaba3193c56ce0540626d


[ROCm/clr commit: 50e57158eb]

projects/clr/hipamd/CMakeLists.txt

@@ -379,11 +379,11 @@ install(
 #############################
 # Packaging steps
 #############################
-# 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)
+# Package: hip_devel
+set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hip-devel)
+configure_file(packaging/hip-devel.txt ${BUILD_DIR}/CMakeLists.txt @ONLY)
+configure_file(packaging/hip-devel.postinst ${BUILD_DIR}/postinst @ONLY)
+configure_file(packaging/hip-devel.prerm ${BUILD_DIR}/prerm @ONLY)
 
 add_custom_target(pkg_hip_base COMMAND ${CMAKE_COMMAND} .
     COMMAND rm -rf *.deb *.rpm *.tar.gz
@@ -400,9 +400,9 @@ endif()
 
 if(HIP_RUNTIME STREQUAL "rocclr")
     set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/rocclr)
-    configure_file(packaging/hip-rocclr.txt ${BUILD_DIR}/CMakeLists.txt @ONLY)
-    configure_file(packaging/hip-rocclr.postinst ${BUILD_DIR}/postinst @ONLY)
-    configure_file(packaging/hip-rocclr.prerm ${BUILD_DIR}/prerm @ONLY)
+    configure_file(packaging/hip-runtime-amd.txt ${BUILD_DIR}/CMakeLists.txt @ONLY)
+    configure_file(packaging/hip-runtime-amd.postinst ${BUILD_DIR}/postinst @ONLY)
+    configure_file(packaging/hip-runtime-amd.prerm ${BUILD_DIR}/prerm @ONLY)
     add_custom_target(hip_on_rocclr COMMAND ${CMAKE_COMMAND} .
         COMMAND rm -rf *.deb *.rpm *.tar.gz
         COMMAND make package
@@ -412,9 +412,9 @@ if(HIP_RUNTIME STREQUAL "rocclr")
         WORKING_DIRECTORY ${BUILD_DIR} )
 endif()
 
-# Package: hip_nvcc
-set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hip-nvcc)
-configure_file(packaging/hip-nvcc.txt ${BUILD_DIR}/CMakeLists.txt @ONLY)
+# 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)
 add_custom_target(pkg_hip_nvcc COMMAND ${CMAKE_COMMAND} .
     COMMAND rm -rf *.deb *.rpm *.tar.gz
     COMMAND make package

projects/clr/hipamd/install.sh

@@ -115,11 +115,11 @@ function buildHIP()
     if [ "$OS_NAME" == "Ubuntu" ]
     then
       cp hip-*.deb $WORKING_DIR
-      sudo dpkg -i -B hip-base*.deb hip-rocclr*.deb hip-sample*.deb hip-doc*.deb
+      sudo dpkg -i -B hip-devel*.deb hip-runtime-amd*.deb hip-sample*.deb hip-doc*.deb
     elif [ "$OS_NAME" == "CentOS" ]
     then
       cp hip-*.rpm $WORKING_DIR
-      sudo rpm -ivh --replacefiles --force hip-base*.rpm hip-rocclr*.rpm hip-sample*.rpm \
+      sudo rpm -ivh --replacefiles --force hip-devel*.rpm hip-runtime-amd*.rpm hip-sample*.rpm \
          hip-doc*.rpm
     fi
     popd

projects/clr/hipamd/packaging/hip-devel.txt

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 cmake_minimum_required(VERSION 2.8.3)
-project(hip_base)
+project(hip_devel)
 
 if(WIN32)
   install(DIRECTORY @HIP_COMMON_DIR@/bin DESTINATION . USE_SOURCE_PERMISSIONS)
@@ -42,10 +42,10 @@ install(DIRECTORY @HIP_COMMON_DIR@/cmake DESTINATION .)
 #############################
 set(CPACK_SET_DESTDIR TRUE)
 set(CPACK_INSTALL_PREFIX @CPACK_INSTALL_PREFIX@ )
-set(CPACK_PACKAGE_NAME "hip-base")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP Heterogenous-computing Interface for Portability [BASE]")
+set(CPACK_PACKAGE_NAME "hip-devel")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP Heterogenous-computing Interface for Portability [DEVELOPMENT]")
 set(CPACK_PACKAGE_DESCRIPTION "HIP:
-      Heterogenous-computing Interface for Portability [BASE]")
+      Heterogenous-computing Interface for Portability [DEVELOPMENT]")
 set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.")
 set(CPACK_PACKAGE_CONTACT "HIP Support <hip.support@amd.com>")
 set(CPACK_PACKAGE_VERSION_MAJOR @HIP_VERSION_MAJOR@)
@@ -60,7 +60,6 @@ set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "perl (>= 5.0), liburi-encode-perl, libfile-basedir-perl, libfile-copy-recursive-perl, libfile-listing-perl, libfile-which-perl, libc6, file")
 set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-base")
-set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_base")
 
 set(CPACK_BINARY_RPM "ON")
 set(CPACK_RPM_PACKAGE_RELEASE @CPACK_RPM_PACKAGE_RELEASE@)
@@ -70,8 +69,6 @@ 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")
 set(CPACK_RPM_PACKAGE_REQUIRES "perl >= 5.0, perl-File-Which, perl-File-Listing, perl-File-BaseDir, perl-URI-Encode, file")
-set(CPACK_RPM_PACKAGE_OBSOLETES "hip_base")
-set(CPACK_RPM_PACKAGE_CONFLICTS "hip_base")
 set(CPACK_BINARY_RPM "ON")
 set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt")
 set(CPACK_SOURCE_GENERATOR "TGZ")

projects/clr/hipamd/packaging/hip-doc.txt

@@ -55,9 +55,8 @@ set(CPACK_GENERATOR "TGZ;DEB;RPM")
 set(CPACK_BINARY_DEB "ON")
 set(CPACK_DEBIAN_PACKAGE_RELEASE @CPACK_DEBIAN_PACKAGE_RELEASE@)
 set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE})")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-devel (= ${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE})")
 set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-doc")
-set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_doc")
 
 set(CPACK_BINARY_RPM "ON")
 set(CPACK_RPM_PACKAGE_RELEASE @CPACK_RPM_PACKAGE_RELEASE@)
@@ -65,9 +64,7 @@ set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
 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}-${CPACK_RPM_PACKAGE_RELEASE}")
-set(CPACK_RPM_PACKAGE_OBSOLETES "hip_doc")
-set(CPACK_RPM_PACKAGE_CONFLICTS "hip_doc")
+set(CPACK_RPM_PACKAGE_REQUIRES "hip-devel = ${HIP_BASE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}")
 set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt")
 set(CPACK_SOURCE_GENERATOR "TGZ")
 include(CPack)

projects/clr/hipamd/packaging/hip-runtime-amd.txt

@@ -19,7 +19,7 @@
 # THE SOFTWARE.
 
 cmake_minimum_required(VERSION 2.8.3)
-project(hip_rocclr)
+project(hip_runtime_amd)
 
 if(@BUILD_SHARED_LIBS@)
   install(FILES @PROJECT_BINARY_DIR@/lib/libamdhip64.so DESTINATION lib)
@@ -60,11 +60,11 @@ foreach(_target_file ${_target_files})
 endforeach()
 install(FILES ${_target_files} DESTINATION lib/cmake/hip-lang)
 
-set(CPACK_PACKAGE_NAME "hip-rocclr")
+set(CPACK_PACKAGE_NAME "hip-runtime-amd")
 set(HCC_PACKAGE_NAME "rocclr")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [ROCClr]")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [RUNTIME - AMD]")
 set(CPACK_PACKAGE_DESCRIPTION "HIP:
-      Heterogenous-computing Interface for Portability [ROCClr]")
+      Heterogenous-computing Interface for Portability [RUNTIME - AMD]")
 set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.")
 set(CPACK_PACKAGE_CONTACT "HIP Support <hip.support@amd.com>")
 set(CPACK_PACKAGE_VERSION_MAJOR @HIP_VERSION_MAJOR@)
@@ -77,8 +77,8 @@ set(CPACK_BINARY_DEB "ON")
 set(CPACK_DEBIAN_PACKAGE_RELEASE @CPACK_DEBIAN_PACKAGE_RELEASE@)
 set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "hsa-rocr-dev (>= 1.3), rocminfo, hip-base (= ${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}),  comgr (>= 2.0), rocm-llvm, libc6")
-set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-hcc (= ${CPACK_PACKAGE_VERSION})")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "hsa-rocr-dev (>= 1.3), rocminfo,  comgr (>= 2.0), rocm-llvm, libc6")
+set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-rocclr (= ${CPACK_PACKAGE_VERSION})")
 
 set(CPACK_BINARY_RPM "ON")
 set(CPACK_RPM_PACKAGE_RELEASE @CPACK_RPM_PACKAGE_RELEASE@)
@@ -88,8 +88,8 @@ 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 "hsa-rocr-dev >= 1.3, rocminfo, hip-base = ${HIP_BASE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE},  comgr >= 2.0, rocm-llvm")
-set(CPACK_RPM_PACKAGE_PROVIDES "hip-hcc = ${HIP_BASE_VERSION}")
+set(CPACK_RPM_PACKAGE_REQUIRES "hsa-rocr-dev >= 1.3, rocminfo,  comgr >= 2.0, rocm-llvm")
+set(CPACK_RPM_PACKAGE_PROVIDES "hip-rocclr = ${HIP_BASE_VERSION}")
 set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt")
 set(CPACK_SOURCE_GENERATOR "TGZ")
 include(CPack)

projects/clr/hipamd/packaging/hip-runtime-nvidia.txt

@@ -19,17 +19,17 @@
 # THE SOFTWARE.
 
 cmake_minimum_required(VERSION 2.8.3)
-project(hip_nvcc)
+project(hip_runtime_nvidia)
 
 #############################
 # Packaging steps
 #############################
 set(CPACK_SET_DESTDIR TRUE)
 set(CPACK_INSTALL_PREFIX @CPACK_INSTALL_PREFIX@ )
-set(CPACK_PACKAGE_NAME "hip-nvcc")
+set(CPACK_PACKAGE_NAME "hip-runtime-nvidia")
 set(CPACK_PACKAGE_DESCRIPTION "HIP:
-          Heterogenous-computing Interface for Portability [NVCC]")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [NVCC]")
+          Heterogenous-computing Interface for Portability [RUNTIME - NVIDIA]")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [RUNTIME - NVIDIA]")
 set(CPACK_PACKAGE_VENDOR "Advanced Micro Devices, Inc.")
 set(CPACK_PACKAGE_CONTACT "HIP Support <hip.support@amd.com>")
 set(CPACK_PACKAGE_VERSION_MAJOR @HIP_VERSION_MAJOR@)
@@ -42,9 +42,8 @@ set(CPACK_BINARY_DEB "ON")
 set(CPACK_DEBIAN_PACKAGE_RELEASE @CPACK_DEBIAN_PACKAGE_RELEASE@)
 set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}), cuda (>= 7.5)")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "cuda (>= 7.5)")
 set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-nvcc")
-set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_nvcc")
 
 set(CPACK_BINARY_RPM "ON")
 set(CPACK_RPM_PACKAGE_RELEASE @CPACK_RPM_PACKAGE_RELEASE@)
@@ -54,9 +53,7 @@ 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}-${CPACK_RPM_PACKAGE_RELEASE}, cuda >= 7.5")
-set(CPACK_RPM_PACKAGE_OBSOLETES "hip_nvcc")
-set(CPACK_RPM_PACKAGE_CONFLICTS "hip_nvcc")
+set(CPACK_RPM_PACKAGE_REQUIRES "cuda >= 7.5")
 set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt")
 set(CPACK_SOURCE_GENERATOR "TGZ")
 include(CPack)

projects/clr/hipamd/packaging/hip-samples.txt

@@ -43,9 +43,8 @@ set(CPACK_GENERATOR "TGZ;DEB;RPM")
 set(CPACK_BINARY_DEB "ON")
 set(CPACK_DEBIAN_PACKAGE_RELEASE @CPACK_DEBIAN_PACKAGE_RELEASE@)
 set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-base (= ${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE})")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "hip-devel (= ${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE})")
 set(CPACK_DEBIAN_PACKAGE_PROVIDES "hip-samples")
-set(CPACK_DEBIAN_PACKAGE_REPLACES "hip_samples")
 
 set(CPACK_BINARY_RPM "ON")
 set(CPACK_RPM_PACKAGE_RELEASE @CPACK_RPM_PACKAGE_RELEASE@)
@@ -53,9 +52,7 @@ set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
 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}-${CPACK_RPM_PACKAGE_RELEASE}")
-set(CPACK_RPM_PACKAGE_OBSOLETES "hip_samples")
-set(CPACK_RPM_PACKAGE_CONFLICTS "hip_samples")
+set(CPACK_RPM_PACKAGE_REQUIRES "hip-devel = ${HIP_BASE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}")
 set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/opt")
 set(CPACK_SOURCE_GENERATOR "TGZ")
 include(CPack)