From a854fbe9f6357b987740ff25d64cf28281594e65 Mon Sep 17 00:00:00 2001 From: "Galantsev, Dmitrii" Date: Fri, 17 Nov 2023 15:34:29 -0600 Subject: [PATCH] Add version hash Change-Id: I6cf18b00a45ebd106f981e92681cab2ef25924e2 Signed-off-by: Galantsev, Dmitrii [ROCm/rocm_smi_lib commit: d61aaf44e12efbf92994de179215c08d29a33e99] --- projects/rocm-smi-lib/CMakeLists.txt | 11 +++++++---- projects/rocm-smi-lib/cmake_modules/utils.cmake | 1 + projects/rocm-smi-lib/python_smi_tools/rocm_smi.py | 4 +++- .../rocm-smi-lib/python_smi_tools/rsmiBindings.py.in | 2 ++ projects/rocm-smi-lib/rocm_smi/CMakeLists.txt | 7 ++++--- projects/rocm-smi-lib/src/rocm_smi64Config.in | 3 ++- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/projects/rocm-smi-lib/CMakeLists.txt b/projects/rocm-smi-lib/CMakeLists.txt index d56e4d177b..bd268bd7e5 100755 --- a/projects/rocm-smi-lib/CMakeLists.txt +++ b/projects/rocm-smi-lib/CMakeLists.txt @@ -37,10 +37,13 @@ find_program (GIT NAMES git) set(PKG_VERSION_GIT_TAG_PREFIX "rsmi_pkg_ver") get_package_version_number("6.1.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT) message("Package version: ${PKG_VERSION_STR}") -set(${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR "${VERSION_MAJOR}") -set(${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR "${VERSION_MINOR}") -set(${ROCM_SMI_LIBS_TARGET}_VERSION_PATCH "0") +set(${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}") +set(${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}") +set(${ROCM_SMI_LIBS_TARGET}_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}") set(${ROCM_SMI_LIBS_TARGET}_VERSION_BUILD "0") +set(${ROCM_SMI_LIBS_TARGET}_VERSION_HASH "${PKG_VERSION_HASH}") + +set(${ROCM_SMI_LIBS_TARGET}_VERSION_STRING "${${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR}.${${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR}.${${ROCM_SMI_LIBS_TARGET}_VERSION_PATCH}+${${ROCM_SMI_LIBS_TARGET}_VERSION_HASH}") # The following default version values should be updated as appropriate for # ABI breaks (update MAJOR and MINOR), and ABI/API additions (update MINOR). @@ -48,7 +51,7 @@ set(${ROCM_SMI_LIBS_TARGET}_VERSION_BUILD "0") # by git tags (through "git describe") when they are present. set(PKG_VERSION_MAJOR "${VERSION_MAJOR}") set(PKG_VERSION_MINOR "${VERSION_MINOR}") -set(PKG_VERSION_PATCH 0) +set(PKG_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}") set(PKG_VERSION_NUM_COMMIT 0) ## Define default variable and variables for the optional build target diff --git a/projects/rocm-smi-lib/cmake_modules/utils.cmake b/projects/rocm-smi-lib/cmake_modules/utils.cmake index afaa442e59..7131761b67 100755 --- a/projects/rocm-smi-lib/cmake_modules/utils.cmake +++ b/projects/rocm-smi-lib/cmake_modules/utils.cmake @@ -159,6 +159,7 @@ function(get_package_version_number DEFAULT_VERSION_STRING VERSION_PREFIX GIT) endif() set(PKG_VERSION_STR "${PKG_VERSION_STR}-${VERSION_HASH}") set(PKG_VERSION_STR ${PKG_VERSION_STR} PARENT_SCOPE) + set(PKG_VERSION_HASH ${VERSION_HASH} PARENT_SCOPE) set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR} PARENT_SCOPE) set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR} PARENT_SCOPE) set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH} PARENT_SCOPE) diff --git a/projects/rocm-smi-lib/python_smi_tools/rocm_smi.py b/projects/rocm-smi-lib/python_smi_tools/rocm_smi.py index 2d0944ace9..294e078620 100755 --- a/projects/rocm-smi-lib/python_smi_tools/rocm_smi.py +++ b/projects/rocm-smi-lib/python_smi_tools/rocm_smi.py @@ -29,10 +29,12 @@ from rsmiBindings import * # Major version - Increment when backwards-compatibility breaks # Minor version - Increment when adding a new feature, set to 0 when major is incremented # Patch version - Increment when adding a fix, set to 0 when minor is incremented +# Hash version - Shortened commit hash. Print here and not with lib for consistency with amd-smi SMI_MAJ = 1 SMI_MIN = 5 SMI_PAT = 0 -__version__ = '%s.%s.%s' % (SMI_MAJ, SMI_MIN, SMI_PAT) +# SMI_HASH is provided by rsmiBindings +__version__ = '%s.%s.%s+%s' % (SMI_MAJ, SMI_MIN, SMI_PAT, SMI_HASH) # Set to 1 if an error occurs RETCODE = 0 diff --git a/projects/rocm-smi-lib/python_smi_tools/rsmiBindings.py.in b/projects/rocm-smi-lib/python_smi_tools/rsmiBindings.py.in index ee0ec76124..884793468f 100644 --- a/projects/rocm-smi-lib/python_smi_tools/rsmiBindings.py.in +++ b/projects/rocm-smi-lib/python_smi_tools/rsmiBindings.py.in @@ -55,6 +55,8 @@ dv_id = c_uint64() # GPU ID gpu_id = c_uint32(0) +SMI_HASH = '@PKG_VERSION_HASH@' + # Policy enums RSMI_MAX_NUM_FREQUENCIES = 33 diff --git a/projects/rocm-smi-lib/rocm_smi/CMakeLists.txt b/projects/rocm-smi-lib/rocm_smi/CMakeLists.txt index ee53412e09..645e598965 100755 --- a/projects/rocm-smi-lib/rocm_smi/CMakeLists.txt +++ b/projects/rocm-smi-lib/rocm_smi/CMakeLists.txt @@ -48,10 +48,11 @@ if ( ${ROCM_PATCH_VERSION} ) else() set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}") endif () -set(${ROCM_SMI}_VERSION_MAJOR "${VERSION_MAJOR}") -set(${ROCM_SMI}_VERSION_MINOR "${VERSION_MINOR}") -set(${ROCM_SMI}_VERSION_PATCH "0") +set(${ROCM_SMI}_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}") +set(${ROCM_SMI}_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}") +set(${ROCM_SMI}_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}") set(${ROCM_SMI}_VERSION_BUILD "0") +set(${ROCM_SMI}_VERSION_HASH "${PKG_VERSION_HASH}") message("SOVERSION: ${SO_VERSION_STRING}") # Configure rsmiBindings.py.in with SO major version: diff --git a/projects/rocm-smi-lib/src/rocm_smi64Config.in b/projects/rocm-smi-lib/src/rocm_smi64Config.in index bde279ced1..a3b26311d5 100755 --- a/projects/rocm-smi-lib/src/rocm_smi64Config.in +++ b/projects/rocm-smi-lib/src/rocm_smi64Config.in @@ -52,5 +52,6 @@ #define rocm_smi_VERSION_MINOR @rocm_smi_VERSION_MINOR@ #define rocm_smi_VERSION_PATCH @rocm_smi_VERSION_PATCH@ #define rocm_smi_VERSION_BUILD "@rocm_smi_VERSION_BUILD@" +#define rocm_smi_VERSION_HASH "@rocm_smi_VERSION_HASH@" -#endif // INCLUDE_ROCM_SMI_ROCM_SMI64CONFIG_H_ \ No newline at end of file +#endif // INCLUDE_ROCM_SMI_ROCM_SMI64CONFIG_H_