sciveo 0.0.32__tar.gz → 0.0.34__tar.gz

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

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

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

@@ -10,7 +10,6 @@
 #
 
 import os
-import subprocess
 import datetime
 import uuid
 import random
@@ -39,7 +38,6 @@ class HardwareInfo:
     }
 
     self.get_cpu()
-    self.get_gpu()
 
   def __call__(self):
     return self.data
@@ -60,43 +58,3 @@ 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.32 → sciveo-0.0.34}/sciveo/monitoring/monitor.py

@@ -10,6 +10,7 @@
 #
 
 import os
+import subprocess
 import time
 import datetime
 import socket
@@ -53,6 +54,7 @@ class BaseMonitor(DaemonBase):
   def loop(self):
     self.get_cpu_usage()
     self.get_memory()
+    self.get_gpu()
 
     self.tail_logs()
     self.data["local_time"] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -106,10 +108,51 @@ class BaseMonitor(DaemonBase):
       error(e, "tail_file", file_path)
     return result
 
+  # 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(']', '')
+
+      data = []
+      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
+        data.append(line_data)
+
+      self.data.setdefault("GPU", {})
+      self.data["GPU"]["units"] = units
+      self.data["GPU"]["data"] = data
+
+    except subprocess.CalledProcessError as e:
+      pass
+
+
 
 
 if __name__ == "__main__":
-  mon = BaseMonitor(period=60)
+  mon = BaseMonitor(period=10)
   mon.start()
 
   while(True):

sciveo-0.0.34/sciveo/version.py

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

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

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

sciveo-0.0.32/sciveo/version.py

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