updated package generation and removed hiphcc_static as a target for hip-vdi

Change-Id: I0067dd6341f47a212cb02b8d43d3ea01644c2391


[ROCm/hip commit: 28d8a38c0e]

projects/hip/packaging/hip-targets-release.cmake

@@ -10,24 +10,25 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 get_filename_component(_DIR "${CMAKE_CURRENT_LIST_DIR}" REALPATH)
 get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH)
 
+if(HIP_PLATFORM STREQUAL "hcc")
 # Import target "hip::hip_hcc_static" for configuration "Release"
-set_property(TARGET hip::hip_hcc_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-if(HIP_COMPILER STREQUAL "clang")
-set_target_properties(hip::hip_hcc_static PROPERTIES
-  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
-  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libhip_hcc_static.a"
-  )
-else()
-set_target_properties(hip::hip_hcc_static PROPERTIES
-  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
-  IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE "hc_am"
-  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libhip_hcc_static.a"
-  )
+    set_property(TARGET hip::hip_hcc_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+  if(HIP_COMPILER STREQUAL "clang")
+    set_target_properties(hip::hip_hcc_static PROPERTIES
+    IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+    IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libhip_hcc_static.a"
+    )
+  else()
+    set_target_properties(hip::hip_hcc_static PROPERTIES
+    IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+    IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE "hc_am"
+    IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libhip_hcc_static.a"
+    )
+  endif()
+  list(APPEND _IMPORT_CHECK_TARGETS hip::hip_hcc_static )
+  list(APPEND _IMPORT_CHECK_FILES_FOR_hip::hip_hcc_static "${_IMPORT_PREFIX}/lib/libhip_hcc_static.a" )
+
 endif()
-
-list(APPEND _IMPORT_CHECK_TARGETS hip::hip_hcc_static )
-list(APPEND _IMPORT_CHECK_FILES_FOR_hip::hip_hcc_static "${_IMPORT_PREFIX}/lib/libhip_hcc_static.a" )
-
 # Import target "hip::hip_hcc" for configuration "Release"
 set_property(TARGET hip::hip_hcc APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
 if(HIP_COMPILER STREQUAL "clang")

projects/hip/packaging/hip-targets.cmake

@@ -16,7 +16,11 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 set(_targetsDefined)
 set(_targetsNotDefined)
 set(_expectedTargets)
-foreach(_expectedTarget hip::hip_hcc_static hip::hip_hcc hip::host hip::device)
+if(HIP_PLATFORM STREQUAL "hcc")
+   foreach(_expectedTarget hip:hip_hcc_static hip::hip_hcc hip::host hip::device)
+else()
+   foreach(_expectedTarget hip::hip_hcc hip::host hip::device)
+endif()
   list(APPEND _expectedTargets ${_expectedTarget})
   if(NOT TARGET ${_expectedTarget})
     list(APPEND _targetsNotDefined ${_expectedTarget})
@@ -48,7 +52,9 @@ get_filename_component(_DIR "${CMAKE_CURRENT_LIST_DIR}" REALPATH)
 get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../" REALPATH)
 
 # Create imported target hip::hip_hcc_static
-add_library(hip::hip_hcc_static STATIC IMPORTED)
+if(HIP_PLATFORM STREQUAL "hcc")
+   add_library(hip::hip_hcc_static STATIC IMPORTED)
+endif()
 
 #if HSA is not under ROCm then provide CMAKE_PREFIX_PATH=<HSA_PATH>
 find_path(HSA_HEADER hsa/hsa.h
@@ -62,11 +68,11 @@ find_path(HSA_HEADER hsa/hsa.h
 if (HSA_HEADER-NOTFOUND)
   message (FATAL_ERROR "HSA header not found! ROCM_PATH environment not set")
 endif()
-
-set_target_properties(hip::hip_hcc_static PROPERTIES
-  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}"
-  INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}"
-)
+if(HIP_PLATFORM STREQUAL "hcc")
+  set_target_properties(hip::hip_hcc_static PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}"
+    INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}")
+endif()    
 
 # Create imported target hip::hip_hcc
 add_library(hip::hip_hcc SHARED IMPORTED)

projects/hip/packaging/hip-vdi.postinst

@@ -0,0 +1,29 @@
+#!/bin/bash
+pushd () {
+    command pushd "$@" > /dev/null
+}
+
+popd () {
+    command popd "$@" > /dev/null
+}
+
+
+ROCMDIR=@ROCM_PATH@
+ROCMLIBDIR=$ROCMDIR/lib
+HIPDIR=$ROCMDIR/hip
+HIPLIBDIR=$ROCMDIR/hip/lib
+
+# Soft-link to library files
+HIPLIBFILES=$(ls -A $HIPLIBDIR | grep -v [-/$])
+mkdir -p $ROCMLIBDIR
+mkdir -p $ROCMLIBDIR/cmake
+pushd $ROCMLIBDIR
+for f in $HIPLIBFILES
+do
+    ln -s -r -f $HIPLIBDIR/$f $(basename $f)
+done
+# Make the hip cmake directory link.
+pushd cmake
+ln -s -r -f $HIPLIBDIR/cmake/hip hip
+popd
+popd

projects/hip/packaging/hip-vdi.prerm

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+pushd () {
+    command pushd "$@" > /dev/null
+}
+
+popd () {
+    command popd "$@" > /dev/null
+}
+
+ROCMDIR=@ROCM_PATH@
+ROCMLIBDIR=$ROCMDIR/lib
+HIPDIR=$ROCMDIR/hip
+HIPLIBDIR=$ROCMDIR/hip/lib
+([ ! -d $ROCMDIR ] || [ ! -d $HIPDIR ]) && exit 0
+([ ! -d $ROCMLIBDIR ] || [ ! -d $HIPLIBDIR ]) && exit 0
+
+# Remove soft-links to libraries
+HIPLIBFILES=$(ls -A $HIPLIBDIR | grep -v [-/$])
+pushd $ROCMLIBDIR
+for f in $HIPLIBFILES; do
+    [ -e $f ] || continue
+    rm $(basename $f)
+done
+pushd cmake
+unlink hip
+popd
+rmdir --ignore-fail-on-non-empty cmake
+popd
+rmdir --ignore-fail-on-non-empty $ROCMLIBDIR
+