diff --git a/CHANGELOG.md b/CHANGELOG.md index b988324881..fb707bda42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -114,6 +114,7 @@ Full documentation for ROCm Compute Profiler is available at [https://rocm.docs. ### Removed * Roofline support for Ubuntu 20.04 and SLES below 15.6 +* Usage of rocm-smi ## ROCm Compute Profiler 3.1.0 for ROCm 6.4.0 diff --git a/src/rocprof_compute_soc/soc_base.py b/src/rocprof_compute_soc/soc_base.py index b1ff73254a..84c5594647 100644 --- a/src/rocprof_compute_soc/soc_base.py +++ b/src/rocprof_compute_soc/soc_base.py @@ -166,7 +166,7 @@ class OmniSoC_Base: ) ) - # we get the max mclk from rocm-smi --showmclkrange + # we get the max mclk from amd-smi --showmclkrange # Regular expression to extract the max memory clock (third frequency level in MEM) memory_clock_pattern = ( r"MEM:\s*[^:]*FREQUENCY_LEVELS:\s*(?:\d+: \d+ MHz\s*){2}(\d+)\s*MHz" diff --git a/src/utils/specs.py b/src/utils/specs.py index 0bedf479be..cb2c8081e8 100644 --- a/src/utils/specs.py +++ b/src/utils/specs.py @@ -158,30 +158,11 @@ def generate_machine_specs(args, sysinfo: dict = None): accelerator_partition_pattern = r"ACCELERATOR_PARTITION:\s*(\S+)" memory_partition_pattern = r"MEMORY_PARTITION:\s*(\S+)" - rocm_smi_compute_partition_output = run( - ["rocm-smi", "--showcomputepartition"], exit_on_error=True - ) - rocm_smi_compute_partition_pattern = r"Compute Partition:\s*(\S+)" - vbios = search(vbios_pattern, amd_smi_output) # Non-high-frequency System Patterns - # Option 1. Try amd-smi (default) compute_partition = search(compute_partition_pattern, amd_smi_output) console_debug(f"amd-smi compute partition: {compute_partition}") - # Option 2. Try rocm-smi (DEPRECATION NOTE: rocm-smi removal in ROCm 7.1) - if compute_partition is None: - compute_partition = search( - rocm_smi_compute_partition_pattern, rocm_smi_compute_partition_output - ) - if compute_partition: - console_warning( - "DEPRECATION WARNING: rocm-smi is deprecated in ROCm 7.0 and will be " - "removed from rocprof-compute in ROCm 7.1. Please migrate to amd-smi " - "for compute partition parsing. For migration help, see https://github.com/ROCm/amdsmi" - ) - - console_debug(f"rocm-smi compute partition: {compute_partition}") # High-frequency System Pattern using keyword accelerator if compute_partition is None: @@ -190,9 +171,7 @@ def generate_machine_specs(args, sysinfo: dict = None): # Apply default compute partition is above fails if compute_partition is None: - console_warning( - f"Can not detect compute/accelerator partition from amd-smi and rocm-smi." - ) + console_warning(f"Can not detect compute/accelerator partition from amd-smi.") console_warning(f"Applying default compute partition: SPX") compute_partition = "SPX"