Remove frequency stuff for now.

wookayin · Aug 2, 2024 · 3e0c2b1 · 3e0c2b1
1 parent c2ea30e
commit 3e0c2b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 34 deletions.
diff --git a/gpustat/core.py b/gpustat/core.py
@@ -206,20 +206,6 @@ def processes(self) -> Optional[List[ProcessInfo]]:
         """Get the list of running processes on the GPU."""
         return self.entry['processes']
 
-    @property
-    def clk_freq(self) -> Optional[int]:
-        """
-        """
-        v = self.entry['clk_freq']
-        return int(v) if v is not None else None
-
-    @property
-    def clk_freq_max(self) -> Optional[int]:
-        """
-        """
-        v = self.entry['clk_freq_max']
-        return int(v) if v is not None else None
-
     def print_to(self, fp, *,
                  with_colors=True,    # deprecated arg
                  show_cmd=False,
@@ -349,12 +335,6 @@ def __getattr__(self, name):  # type: ignore
             if show_power is True or 'limit' in show_power:
                 _write(" / ")
                 _write(rjustify(safe_self.power_limit, 3), ' W', color='CPowL')
-
-        _write(",  ")
-        _write(rjustify(safe_self.clk_freq, 3), color='CPowU')
-        _write(" / ")
-        _write(rjustify(safe_self.clk_freq_max, 3), color='CPowU')
-        _write(" MHz")
 
         # Memory
         _write(" | ")
@@ -566,16 +546,10 @@ def _wrapped(*args, **kwargs):
 
             # Power
             power = safenvml(N.nvmlDeviceGetPowerUsage)(handle)
-            gpu_info['power.draw'] = power if power is not None else None
+            gpu_info['power.draw'] = power // 1000 if power is not None else None
 
             power_limit = safenvml(N.nvmlDeviceGetEnforcedPowerLimit)(handle)
-            gpu_info['enforced.power.limit'] = power_limit if power_limit is not None else None
-
-            # Frequency
-            freq = safenvml(N.nvmlDeviceGetClkFreq)(handle)
-            gpu_info['clk_freq'] = freq if freq is not None else None
-            freq_max = safenvml(N.nvmlDeviceGetClkFreqMax)(handle)
-            gpu_info['clk_freq_max'] = freq_max if freq_max is not None else None
+            gpu_info['enforced.power.limit'] = power_limit // 1000 if power_limit is not None else None
 
             # Processes
             nv_comp_processes = safenvml(N.nvmlDeviceGetComputeRunningProcesses)(handle)

diff --git a/gpustat/rocml.py b/gpustat/rocml.py
@@ -107,10 +107,10 @@ def nvmlDeviceGetDecoderUtilization(dev):
     return None
 
 def nvmlDeviceGetPowerUsage(dev):
-    return amdsmi_get_power_info(dev)["current_socket_power"]
+    return amdsmi_get_power_info(dev)["current_socket_power"] * 1000
 
 def nvmlDeviceGetEnforcedPowerLimit(dev):
-    return amdsmi_get_power_info(dev)["power_limit"]
+    return amdsmi_get_power_info(dev)["power_limit"] * 1000
 
 ComputeProcess = namedtuple('ComputeProcess', ['pid', 'usedGpuMemory'])
 
@@ -124,15 +124,15 @@ def nvmlDeviceGetComputeRunningProcesses(dev):
 def nvmlDeviceGetGraphicsRunningProcesses(dev):
     return None
 
-def nvmlDeviceGetClkFreq(dev):
-    result = amdsmi_get_clock_info(dev, AmdSmiClkType.SYS)
+def nvmlDeviceGetClockInfo(dev, clk_type=AmdSmiClkType.SYS):
+    result = amdsmi_get_clock_info(dev, clk_type)
     if "clk" in result:
         return result["clk"]
     else:
         return result["cur_clk"]
 
-def nvmlDeviceGetClkFreqMax(dev):
-    result = amdsmi_get_clock_info(dev, AmdSmiClkType.SYS)
+def nvmlDeviceGetMaxClockInfo(dev, clk_type=AmdSmiClkType.SYS):
+    result = amdsmi_get_clock_info(dev, clk_type)
     return result["max_clk"]
 
 # Upon importing this module, let amdsmi be initialized and remain active