diff --git a/projects/amdsmi/CMakeLists.txt b/projects/amdsmi/CMakeLists.txt index a22bb04d1d..ae080f8768 100755 --- a/projects/amdsmi/CMakeLists.txt +++ b/projects/amdsmi/CMakeLists.txt @@ -28,7 +28,7 @@ find_program(GIT NAMES git) ## Setup the package version based on git tags. set(PKG_VERSION_GIT_TAG_PREFIX "amdsmi_pkg_ver") -get_package_version_number("24.3.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT) +get_package_version_number("24.4.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT) message("Package version: ${PKG_VERSION_STR}") set(${AMD_SMI_LIBS_TARGET}_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}") set(${AMD_SMI_LIBS_TARGET}_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}") diff --git a/projects/amdsmi/amdsmi_cli/README.md b/projects/amdsmi/amdsmi_cli/README.md index 24d2a6a1de..abded835a8 100644 --- a/projects/amdsmi/amdsmi_cli/README.md +++ b/projects/amdsmi/amdsmi_cli/README.md @@ -79,7 +79,7 @@ amd-smi will report the version and current platform detected when running the c ~$ amd-smi usage: amd-smi [-h] ... -AMD System Management Interface | Version: 23.4.2.0 | ROCm version: 6.1.0 | Platform: Linux Baremetal +AMD System Management Interface | Version: 24.4.0.0 | ROCm version: 6.1.0 | Platform: Linux Baremetal options: -h, --help show this help message and exit diff --git a/projects/amdsmi/amdsmi_cli/amdsmi_commands.py b/projects/amdsmi/amdsmi_cli/amdsmi_commands.py index 2d6464813b..9a531d722f 100644 --- a/projects/amdsmi/amdsmi_cli/amdsmi_commands.py +++ b/projects/amdsmi/amdsmi_cli/amdsmi_commands.py @@ -800,7 +800,9 @@ class AMDSMICommands(): cpu_attributes = ["smu", "interface_ver"] for attr in cpu_attributes: if hasattr(args, attr): - cpu_args_enabled |= bool(getattr(args, attr)) + if getattr(args, attr) is not None: + cpu_args_enabled = True + break # Check if a GPU argument has been set gpu_args_enabled = False @@ -809,7 +811,9 @@ class AMDSMICommands(): "dfc_ucode", "fb_info", "num_vf"] for attr in gpu_attributes: if hasattr(args, attr): - gpu_args_enabled |= bool(getattr(args, attr)) + if getattr(args, attr) is not None: + gpu_args_enabled = True + break # Handle CPU and GPU intialization cases if self.helpers.is_amd_hsmp_initialized() and self.helpers.is_amdgpu_initialized(): @@ -2251,7 +2255,9 @@ class AMDSMICommands(): "guard", "guest_data", "fb_usage", "xgmi"] for attr in gpu_attributes: if hasattr(args, attr): - gpu_args_enabled |= bool(getattr(args, attr)) + if getattr(args, attr) is not None: + gpu_args_enabled = True + break # Check if a CPU argument has been set cpu_args_enabled = False @@ -2262,14 +2268,18 @@ class AMDSMICommands(): "cpu_dimm_pow_consumption", "cpu_dimm_thermal_sensor"] for attr in cpu_attributes: if hasattr(args, attr): - cpu_args_enabled |= bool(getattr(args, attr)) + if getattr(args, attr) is not None: + cpu_args_enabled = True + break # Check if a Core argument has been set core_args_enabled = False core_attributes = ["core_boost_limit", "core_curr_active_freq_core_limit", "core_energy"] for attr in core_attributes: if hasattr(args, attr): - core_args_enabled |= bool(getattr(args, attr)) + if getattr(args, attr) is not None: + core_args_enabled = True + break # Handle CPU and GPU driver intialization cases if self.helpers.is_amd_hsmp_initialized() and self.helpers.is_amdgpu_initialized(): @@ -3281,7 +3291,8 @@ class AMDSMICommands(): Return: Nothing """ - # Mutually exculsive args + # These are the only args checked at this point, the other args will be passed + # in through the applicable function set_gpu, set_cpu, or set_core function if gpu: args.gpu = gpu if cpu: @@ -3295,7 +3306,9 @@ class AMDSMICommands(): "memory_partition", "power_cap"] for attr in gpu_attributes: if hasattr(args, attr): - gpu_args_enabled |= bool(getattr(args, attr)) + if getattr(args, attr) is not None: + gpu_args_enabled = True + break # Check if a CPU argument has been set cpu_args_enabled = False @@ -3304,14 +3317,18 @@ class AMDSMICommands(): "cpu_enable_apb", "cpu_disable_apb", "soc_boost_limit"] for attr in cpu_attributes: if hasattr(args, attr): - cpu_args_enabled |= bool(getattr(args, attr)) + if getattr(args, attr) is not None: + cpu_args_enabled = True + break # Check if a Core argument has been set core_args_enabled = False core_attributes = ["core_boost_limit"] for attr in core_attributes: if hasattr(args, attr): - core_args_enabled |= bool(getattr(args, attr)) + if getattr(args, attr) is not None: + core_args_enabled = True + break # Only allow one device's arguments to be set at a time if gpu_args_enabled == cpu_args_enabled == core_args_enabled == False: diff --git a/projects/amdsmi/docs/doxygen/Doxyfile b/projects/amdsmi/docs/doxygen/Doxyfile index c6b85d5a86..ff7a8a18df 100644 --- a/projects/amdsmi/docs/doxygen/Doxyfile +++ b/projects/amdsmi/docs/doxygen/Doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = AMD SMI # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "24.3.0.0" +PROJECT_NUMBER = "24.4.0.0" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index 7a4b209124..57c83eada6 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -151,7 +151,7 @@ typedef enum { #define AMDSMI_LIB_VERSION_YEAR 24 //! Major version should be changed for every header change (adding/deleting APIs, changing names, fields of structures, etc.) -#define AMDSMI_LIB_VERSION_MAJOR 3 +#define AMDSMI_LIB_VERSION_MAJOR 4 //! Minor version should be updated for each API change, but without changing headers #define AMDSMI_LIB_VERSION_MINOR 0