CMAKE - Rename SMI_*_DIR into AMD_SMI_*_DIR
Change-Id: I3b8b852e6b68f1448c8ed5d5e6ea4579c470ff53
Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com>
[ROCm/rdc commit: e033fd4c55]
Dieser Commit ist enthalten in:
committet von
Galantsev, Dmitrii
Ursprung
25853f01dc
Commit
3218c2af5c
@@ -152,16 +152,14 @@ if(BUILD_STANDALONE AND GRPC_ROOT STREQUAL GRPC_ROOT_DEFAULT)
|
||||
Continuing without gRPC install")
|
||||
endif()
|
||||
|
||||
find_package(SMI
|
||||
find_package(amd_smi
|
||||
NAMES amd_smi
|
||||
HINTS ${ROCM_DIR}/lib/cmake
|
||||
CONFIGURE REQUIRED)
|
||||
set(SMI_INC_DIR "${AMD_SMI_INCLUDE_DIR}" CACHE INTERNAL "AMD SMI include directory.")
|
||||
set(SMI_LIB_DIR "${AMD_SMI_LIB_DIR}" CACHE INTERNAL "AMD SMI library directory.")
|
||||
|
||||
if(NOT EXISTS "${SMI_INC_DIR}" OR NOT EXISTS "${SMI_LIB_DIR}")
|
||||
message(FATAL_ERROR "amd_smi not found in ${SMI_INC_DIR}. Please
|
||||
make sure amd_smi is installed and present in ${SMI_INC_DIR}.")
|
||||
if(NOT EXISTS "${AMD_SMI_INCLUDE_DIR}" OR NOT EXISTS "${AMD_SMI_LIB_DIR}")
|
||||
message(FATAL_ERROR "amd_smi not found in ${AMD_SMI_INCLUDE_DIR}. Please
|
||||
make sure amd_smi is installed and present in ${AMD_SMI_INCLUDE_DIR}.")
|
||||
endif()
|
||||
|
||||
set(${RDC}_VERSION_MAJOR "${VERSION_MAJOR}")
|
||||
|
||||
@@ -46,8 +46,8 @@ message("--------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
|
||||
message("--------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
|
||||
message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
|
||||
message("--------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
|
||||
message("---------SMI Lib Dir: " ${SMI_LIB_DIR})
|
||||
message("---------SMI Inc Dir: " ${SMI_INC_DIR})
|
||||
message("---------SMI Lib Dir: " ${AMD_SMI_LIB_DIR})
|
||||
message("---------SMI Inc Dir: " ${AMD_SMI_INCLUDE_DIR})
|
||||
message("")
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ set(CPACK_DEBIAN_PACKAGE_DEPENDS "rocm-core")
|
||||
set(CPACK_RPM_PACKAGE_REQUIRES "rocm-core")
|
||||
|
||||
# link SMI
|
||||
link_directories(${SMI_LIB_DIR})
|
||||
link_directories(${AMD_SMI_LIB_DIR})
|
||||
|
||||
# add librdc_bootstrap.so
|
||||
add_subdirectory(bootstrap)
|
||||
|
||||
@@ -28,7 +28,7 @@ target_include_directories(${BOOTSTRAP_LIB} PRIVATE
|
||||
"${PROJECT_SOURCE_DIR}"
|
||||
"${PROJECT_SOURCE_DIR}/include"
|
||||
"${COMMON_DIR}"
|
||||
"${SMI_INC_DIR}"
|
||||
"${AMD_SMI_INCLUDE_DIR}"
|
||||
"${ROCM_DIR}/include")
|
||||
|
||||
target_include_directories(${BOOTSTRAP_LIB}
|
||||
|
||||
@@ -69,7 +69,7 @@ target_link_libraries(${RDC_LIB} ${BOOTSTRAP_LIB} pthread amd_smi cap)
|
||||
target_include_directories(${RDC_LIB} PRIVATE
|
||||
"${PROJECT_SOURCE_DIR}"
|
||||
"${PROJECT_SOURCE_DIR}/include"
|
||||
"${SMI_INC_DIR}")
|
||||
"${AMD_SMI_INCLUDE_DIR}")
|
||||
|
||||
# Set the VERSION and SOVERSION values
|
||||
set_property(TARGET ${RDC_LIB} PROPERTY
|
||||
|
||||
@@ -38,7 +38,7 @@ if(BUILD_PROFILER)
|
||||
"${PROJECT_SOURCE_DIR}"
|
||||
"${PROJECT_SOURCE_DIR}/include"
|
||||
"${COMMON_DIR}"
|
||||
"${SMI_INC_DIR}"
|
||||
"${AMD_SMI_INCLUDE_DIR}"
|
||||
"${ROCM_DIR}/include"
|
||||
"${ROCM_DIR}/include/hsa")
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ if(BUILD_RUNTIME)
|
||||
"${PROJECT_SOURCE_DIR}"
|
||||
"${PROJECT_SOURCE_DIR}/include"
|
||||
"${COMMON_DIR}"
|
||||
"${SMI_INC_DIR}"
|
||||
"${AMD_SMI_INCLUDE_DIR}"
|
||||
"${ROCM_DIR}/include")
|
||||
|
||||
# let bootstrap find this module at build time
|
||||
|
||||
@@ -39,7 +39,7 @@ if(BUILD_RVS)
|
||||
"${PROJECT_SOURCE_DIR}"
|
||||
"${PROJECT_SOURCE_DIR}/include"
|
||||
"${COMMON_DIR}"
|
||||
"${SMI_INC_DIR}"
|
||||
"${AMD_SMI_INCLUDE_DIR}"
|
||||
"${ROCM_DIR}/include"
|
||||
"${ROCM_DIR}/include/hsa"
|
||||
"${ROCM_VALIDATION_SUITE_INCLUDE_DIR}")
|
||||
|
||||
@@ -34,8 +34,8 @@ message("--------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
|
||||
message("--------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
|
||||
message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
|
||||
message("--------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
|
||||
message("--------SMI Lib Dir: " ${SMI_LIB_DIR})
|
||||
message("--------SMI Inc Dir: " ${SMI_INC_DIR})
|
||||
message("--------SMI Lib Dir: " ${AMD_SMI_LIB_DIR})
|
||||
message("--------SMI Inc Dir: " ${AMD_SMI_INCLUDE_DIR})
|
||||
message("-------GRPC ROOT Dir: " ${GRPC_ROOT})
|
||||
message("")
|
||||
|
||||
@@ -77,7 +77,7 @@ set(RDCI_SRC_LIST
|
||||
message("RDCI_SRC_LIST=${RDCI_SRC_LIST}")
|
||||
set(RDCI_EXE "rdci")
|
||||
|
||||
link_directories(${SMI_LIB_DIR})
|
||||
link_directories(${AMD_SMI_LIB_DIR})
|
||||
|
||||
add_executable(${RDCI_EXE} "${RDCI_SRC_LIST}")
|
||||
target_compile_definitions(${RDCI_EXE} PRIVATE CURRENT_GIT_HASH=${GIT_HASH})
|
||||
|
||||
@@ -31,8 +31,8 @@ message("----------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
|
||||
message("----------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
|
||||
message("----------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
|
||||
message("----------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
|
||||
message("----------SMI Lib Dir: " ${SMI_LIB_DIR})
|
||||
message("----------SMI Inc Dir: " ${SMI_INC_DIR})
|
||||
message("----------SMI Lib Dir: " ${AMD_SMI_LIB_DIR})
|
||||
message("----------SMI Inc Dir: " ${AMD_SMI_INCLUDE_DIR})
|
||||
message("---------GRPC Root Dir: " ${GRPC_ROOT})
|
||||
message("")
|
||||
|
||||
@@ -59,7 +59,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include
|
||||
"${PROJECT_SOURCE_DIR}/include"
|
||||
"${GRPC_ROOT}/include"
|
||||
"${PROTOB_OUT_DIR}"
|
||||
"${SMI_INC_DIR}"
|
||||
"${AMD_SMI_INCLUDE_DIR}"
|
||||
"${PROJECT_SOURCE_DIR}")
|
||||
|
||||
set(SERVER_SRC_LIST
|
||||
@@ -77,7 +77,7 @@ configure_file("rdc.service.in" "${PROJECT_BINARY_DIR}/${SERVICE_FILE_NAME}" @ON
|
||||
set(SERVER_CONFIG_FILE "rdc_options")
|
||||
configure_file("${SERVER_CONFIG_FILE}" "${PROJECT_BINARY_DIR}/${SERVER_CONFIG_FILE}" COPYONLY)
|
||||
|
||||
link_directories(${SMI_LIB_DIR})
|
||||
link_directories(${AMD_SMI_LIB_DIR})
|
||||
|
||||
add_executable(${SERVER_DAEMON_EXE} "${SERVER_SRC_LIST}")
|
||||
target_compile_definitions(${SERVER_DAEMON_EXE} PRIVATE CURRENT_GIT_HASH=${GIT_HASH})
|
||||
|
||||
@@ -45,7 +45,7 @@ message("--------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
|
||||
message("--------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
|
||||
message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
|
||||
message("--------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
|
||||
message("--------SMI Inc Dir: " ${SMI_INC_DIR})
|
||||
message("--------SMI Inc Dir: " ${AMD_SMI_INCLUDE_DIR})
|
||||
message("")
|
||||
|
||||
set(SRC_DIR "${PROJECT_SOURCE_DIR}/tests/example")
|
||||
@@ -69,7 +69,7 @@ add_executable(${TEST_CLIENT_EXE} "${EXAMPLE_SRC_LIST}")
|
||||
|
||||
target_include_directories(${TEST_CLIENT_EXE} PRIVATE
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/../../client/include"
|
||||
"${SMI_INC_DIR}")
|
||||
"${AMD_SMI_INCLUDE_DIR}")
|
||||
|
||||
target_link_libraries(${TEST_CLIENT_EXE} rdc_client)
|
||||
|
||||
|
||||
@@ -39,8 +39,8 @@ message("--------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
|
||||
message("--------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
|
||||
message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
|
||||
message("--------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
|
||||
message("--------SMI Lib Dir: " ${SMI_LIB_DIR})
|
||||
message("--------SMI Inc Dir: " ${SMI_INC_DIR})
|
||||
message("--------SMI Lib Dir: " ${AMD_SMI_LIB_DIR})
|
||||
message("--------SMI Inc Dir: " ${AMD_SMI_INCLUDE_DIR})
|
||||
message("")
|
||||
|
||||
set(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
@@ -61,7 +61,7 @@ aux_source_directory(${SRC_DIR} rdctstSources)
|
||||
# Other source directories
|
||||
aux_source_directory(${SRC_DIR}/functional functionalSources)
|
||||
|
||||
link_directories(${ROCM_INSTALL_DIR} ${SMI_LIB_DIR})
|
||||
link_directories(${ROCM_INSTALL_DIR} ${AMD_SMI_LIB_DIR})
|
||||
|
||||
# Build rules
|
||||
add_executable(${RDCTST} ${rdctstSources} ${functionalSources})
|
||||
@@ -70,7 +70,7 @@ add_executable(${RDCTST} ${rdctstSources} ${functionalSources})
|
||||
target_include_directories(
|
||||
${RDCTST}
|
||||
PUBLIC ${PROJECT_SOURCE_DIR}/include
|
||||
PUBLIC ${SMI_INC_DIR}
|
||||
PUBLIC ${AMD_SMI_INCLUDE_DIR}
|
||||
PUBLIC ${SRC_DIR}/..)
|
||||
|
||||
target_link_libraries(${RDCTST}
|
||||
|
||||
In neuem Issue referenzieren
Einen Benutzer sperren