sciveo 0.0.31__tar.gz → 0.0.32__tar.gz

{sciveo-0.0.31 → sciveo-0.0.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.31
+Version: 0.0.32
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 

{sciveo-0.0.31 → sciveo-0.0.32}/sciveo/common/tools/hardware.py

@@ -10,11 +10,13 @@
 #
 
 import os
+import subprocess
 import datetime
 import uuid
 import random
 import string
 
+from sciveo.common.tools.logger import *
 from sciveo.common.tools.formating import format_memory_size
 
 
@@ -36,12 +38,13 @@ class HardwareInfo:
       "RAM": format_memory_size(os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES'))
     }
 
-    self.get_cpuinfo()
+    self.get_cpu()
+    self.get_gpu()
 
   def __call__(self):
     return self.data
 
-  def get_cpuinfo(self):
+  def get_cpu(self):
     list_keys = ["model name", "stepping", "cpu MHz", "cache size", "siblings", "cpu cores", "bogomips"]
     try:
       cpu_info = {}
@@ -57,3 +60,43 @@ class HardwareInfo:
       self.data["CPU"]["info"] = cpu_info
     except Exception:
       return
+
+  # Currently simple nvidia-smi wrapper impl
+  def get_gpu(self):
+    try:
+      result = subprocess.run(
+        [
+          'nvidia-smi',
+          '--query-gpu=gpu_uuid,gpu_name,index,power.draw,fan.speed,memory.total,memory.used,memory.free,utilization.gpu,utilization.memory,temperature.gpu',
+          '--format=csv'
+        ],
+        capture_output=True, text=True, check=True
+      )
+
+      lines = result.stdout.strip().split('\n')
+      header = lines[0].split(", ")
+
+      keys = []
+      units = {}
+      for k in header:
+        k_split = k.split(' ')
+        key = k_split[0]
+        keys.append(key)
+        if len(k_split) >= 2:
+          units[key] = k_split[1].replace('[', '').replace(']', '')
+
+      for i in range(1, len(lines)):
+        line_values = lines[i].split(", ")
+        line_data = {}
+        for j, value in enumerate(line_values):
+          value = value.split(' ')[0]
+          line_data[keys[j]] = value
+        self.data.setdefault("GPU", [])
+        self.data["GPU"].append(line_data)
+    except subprocess.CalledProcessError as e:
+      pass
+
+
+if __name__ == "__main__":
+  hw = HardwareInfo()
+  hw()

{sciveo-0.0.31 → sciveo-0.0.32}/sciveo/monitoring/monitor.py

@@ -33,15 +33,19 @@ class BaseMonitor(DaemonBase):
       "installed": self.data["RAM"]
     }
 
-    self.initial_cpu_usage = psutil.cpu_percent(interval=5, percpu=True)
-    cpuserial = self.getserial()
-
     self.data["logs"] = {}
     self.list_logs = []
 
     self.api = APIRemoteClient()
 
-    debug(type(self).__name__, "init", cpuserial, "initial_cpu_usage", self.initial_cpu_usage)
+    # Warmup the psutil cpu usage
+    psutil.cpu_percent(interval=0.3, percpu=True)
+    initial_cpu_usage = psutil.cpu_percent(interval=None, percpu=True)
+    time.sleep(1)
+
+    cpuserial = self.getserial()
+
+    debug(type(self).__name__, "init", cpuserial, "initial_cpu_usage", initial_cpu_usage)
 
   def __call__(self):
     return self.data
@@ -62,11 +66,7 @@ class BaseMonitor(DaemonBase):
       self.data["logs"][log_name] = self.tail_file(log_path)[-3:]
 
   def get_cpu_usage(self):
-    if self.initial_cpu_usage is None:
-      self.data["CPU"]["usage_per_core"] = psutil.cpu_percent(interval=None, percpu=True)
-    else:
-      self.data["CPU"]["usage_per_core"] = self.initial_cpu_usage
-      self.initial_cpu_usage = None
+    self.data["CPU"]["usage_per_core"] = psutil.cpu_percent(interval=None, percpu=True)
     # self.data["CPU"]["usage_per_core"] = (np.array(self.data["CPU"]["usage_per_core"]) / 100.0).tolist()
     self.data["CPU"]["usage"] = np.array(self.data["CPU"]["usage_per_core"]).mean()
 
@@ -107,6 +107,7 @@ class BaseMonitor(DaemonBase):
     return result
 
 
+
 if __name__ == "__main__":
   mon = BaseMonitor(period=60)
   mon.start()

sciveo-0.0.32/sciveo/version.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.0.32'

{sciveo-0.0.31 → sciveo-0.0.32}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.31
+Version: 0.0.32
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 

sciveo-0.0.31/sciveo/version.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.0.31'