Remove unnecessary stuff from hip cmakefile
Remove the following from hip cmakefile,
1.find_package cmds of hsa-runtime64 and amd_comgr;
2.macros of USE_COMGR_LIBRARY and COMGR_DYN_DLL
because they have already been used in Rocclr cmakefile.
cmake mechanism will make hip cmakefile inherite them.
Change-Id: I03b527fc4135c79bb35cbbfe419211ec363cb067
[ROCm/hip commit: ecd4dca29d]
Этот коммит содержится в:
@@ -74,23 +74,7 @@ list( APPEND CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "/opt/rocm" "/opt/rocm/llvm"
|
||||
list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" )
|
||||
set(CMAKE_MODULE_PATH${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
|
||||
|
||||
add_definitions(-DUSE_COMGR_LIBRARY -DCOMGR_DYN_DLL)
|
||||
|
||||
|
||||
find_package(hsa-runtime64 REQUIRED CONFIG
|
||||
PATHS
|
||||
/opt/rocm/lib
|
||||
PATH_SUFFIXES
|
||||
cmake/hsa-runtime64
|
||||
)
|
||||
|
||||
find_package(amd_comgr REQUIRED CONFIG
|
||||
PATHS
|
||||
/opt/rocm/
|
||||
PATH_SUFFIXES
|
||||
cmake/amd_comgr
|
||||
lib/cmake/amd_comgr)
|
||||
|
||||
message(STATUS "Hsa runtime found at ${hsa-runtime64_DIR}.")
|
||||
message(STATUS "Code Object Manager found at ${amd_comgr_DIR}.")
|
||||
|
||||
find_package(LLVM REQUIRED CONFIG
|
||||
|
||||
@@ -7,7 +7,7 @@ set(HIP_LIB_TYPE "shared")
|
||||
if (NOT ${BUILD_SHARED_LIBS})
|
||||
set(HIP_LIB_TYPE "static")
|
||||
endif()
|
||||
message(STATUS "HIP_LIB_TYPE - ${HIP_LIB_TYPE}")
|
||||
message(STATUS "HIP runtime lib type - ${HIP_LIB_TYPE}")
|
||||
#-------------------------------------------------------------------------------
|
||||
# Helper macro to parse BUILD instructions
|
||||
macro(PARSE_BUILD_COMMAND _target _sources _hipcc_options _hcc_options _clang_options _nvcc_options _link_options _exclude_platforms _exclude_runtime _exclude_compiler _exclude_lib_type _depends _dir)
|
||||
|
||||
Ссылка в новой задаче
Block a user