AI/rocm-systems
2
0
Fork 0
Código Incidencias Pull Requests Acciones Paquetes Proyectos Lanzamientos Wiki Actividad

SWDEV-344894 - Remove workaround code to strip the destination directory hip

Explorar el Código 
HIP build scripts updated, so that cmake install prefix and cpack packaging prefix doesn't have destination directory hip
The workaround in source code is not at all required.

Depends-On: I6775407b4bfec84b6b911d333f3725c310539bfc
Change-Id: Ic1f5e170690d6dba0fec493143dea390c435cd42


[ROCm/clr commit: db6eaa35aa]
Este commit está contenido en:
Ranjith Ramakrishnan
2022-07-06 12:45:38 -07:00
padre d9be7ebb3e
commit eea147de6e
Se han modificado 1 ficheros con 0 adiciones y 33 borrados
Descargar archivo de parche Descargar archivo de diferencias Expandir todos los archivos Contraer todos los archivos
projects/clr/hipamd/CMakeLists.txt
-33
Ver fichero
@@ -265,39 +265,6 @@ endif()
# Set default install path as "${ROCM_PATH}", can override the path from cmake build.
set(CPACK_INSTALL_PREFIX ${HIP_DEFAULT_INSTALL_PREFIX} CACHE PATH "Package Installation path for HIP")
#TODO: Workaround to handle hip installation in /opt/rocm
#Once the build script(prototype) changes for file reorg are merged, this should be removed
# CPACK_INSTALL_PREFIX = /opt/rocm-ver/hip
# CMAKE_INSTALL_PREFIX = /xxx/out/OS-Name/OS-Version/hip
# The workaround will remove the destination name "hip" from the prefix path
if(NOT WIN32)
if(FILE_REORG_BACKWARD_COMPATIBILITY)
#In jenkins and docker builds using build_hip_on_rocclr.sh, the CPACK_INSTALL_PREFIX path will contain string "/opt/rocm"
# Use that condition to remove string "hip"
if(CPACK_INSTALL_PREFIX)
string(FIND ${CPACK_INSTALL_PREFIX} "/opt/rocm" ROCMDIR_FOUND)
if(NOT ${ROCMDIR_FOUND} MATCHES "-1")
get_filename_component(DEST_DIR ${CPACK_INSTALL_PREFIX} NAME)
if(DEST_DIR STREQUAL "hip")
get_filename_component(CPACK_INSTALL_PREFIX ${CPACK_INSTALL_PREFIX} DIRECTORY)
endif()#end of DEST_DIR check
endif()#end of rocm dir check
endif()
#In jenkins and docker builds using build_hip_on_rocclr.sh, the CMAKE_INSTALL_PREFIX path will contain string "/out/"
if(CMAKE_INSTALL_PREFIX)
string(FIND ${CMAKE_INSTALL_PREFIX} "/out/" OUTDIR_FOUND)
if(NOT ${OUTDIR_FOUND} MATCHES "-1")
get_filename_component(DEST_DIR ${CMAKE_INSTALL_PREFIX} NAME)
if(DEST_DIR STREQUAL "hip")
get_filename_component(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} DIRECTORY)
endif()#end of DEST_DIR check
endif()#end of out dir find check
endif()
endif()#End of File reorg check
endif()#end of OS check #end of TODO
if(IS_ABSOLUTE ${CMAKE_INSTALL_PREFIX})
message(STATUS "HIP will be installed in: " ${CMAKE_INSTALL_PREFIX})
else()