diff --git a/CMakeLists.txt b/CMakeLists.txt index 29ae34a2c3..5ef2ecda89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,15 +133,6 @@ find_package( find_library(NUMA NAME numa REQUIRED) link_libraries(${NUMA}) -find_program( - ROCMINFO_EXEC - NAMES "rocminfo" - PATHS ${ROCM_PATH} ${CMAKE_INSTALL_PREFIX} "/usr/local" "/usr" - PATH_SUFFIXES bin) -set(ORIGINAL_SCRIPT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin/tblextr.py) -set(OUTPUT_SCRIPT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin/tblextr.py) -configure_file(${ORIGINAL_SCRIPT_PATH} ${OUTPUT_SCRIPT_PATH} @ONLY) - get_property( HSA_RUNTIME_INCLUDE_DIRECTORIES TARGET hsa-runtime64::hsa-runtime64 @@ -227,6 +218,11 @@ if(DEFINED CPACK_PACKAGING_INSTALL_PREFIX) else() set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) endif() + +set(ORIGINAL_SCRIPT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin/tblextr.py) +set(OUTPUT_SCRIPT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin/tblextr.py) +configure_file(${ORIGINAL_SCRIPT_PATH} ${OUTPUT_SCRIPT_PATH} @ONLY) + message("CMake-install-prefix: ${CMAKE_INSTALL_PREFIX}") message("CPack-install-prefix: ${CPACK_PACKAGING_INSTALL_PREFIX}") message("-----------Dest-name: ${DEST_NAME}") diff --git a/bin/tblextr.py b/bin/tblextr.py index a8e51caca1..c498b1fd70 100755 --- a/bin/tblextr.py +++ b/bin/tblextr.py @@ -1110,7 +1110,7 @@ else: copy_statfile = re.sub(r"\.stats\.csv$", r".copy_stats.csv", statfile) memcopy_info_file = re.sub(r"\.stats\.csv$", r".memcopy_info.csv", statfile) sysinfo_file = re.sub(r"\.stats\.csv$", r".sysinfo.txt", statfile) - metadata_gen(sysinfo_file, "@ROCMINFO_EXEC@") + metadata_gen(sysinfo_file, "@CPACK_PACKAGING_INSTALL_PREFIX@/bin/rocminfo") with open(dbfile, mode="w") as fd: fd.truncate()