sciveo 0.0.44__tar.gz → 0.0.46__tar.gz

{sciveo-0.0.44 → sciveo-0.0.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.44
+Version: 0.0.46
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 
@@ -10,6 +10,9 @@ Provides-Extra: mon
 There are few configuration params samplers, which allows easy parameter tuning. The "auto" sampler perhaps is the easiest to use, but also
 "random" and "grid" ones are available.
 
+There is also the sciveo.monitor() which will start monitoring machine CPU/RAM/GPU etc.
+
+
 ## Features
 
 - **Experiment Tracking:** Easily log and track your machine learning experiments.
@@ -19,8 +22,12 @@ There are few configuration params samplers, which allows easy parameter tuning.
 
 ## Installation
 
+ - main sciveo
 pip install sciveo
 
+ - optional for sciveo monitoring
+pip install sciveo[mon]
+
 ## Example usage
 
 There are few public examples in sciveo.com.
@@ -30,6 +37,10 @@ The library has local and remote mode. The local one is ready to use, but for th
 When have sciveo account:
 export SCIVEO_SECRET_ACCESS_KEY='my_sciveo_user_auth_token'
 
+When using sciveo monitoring just run, using suitable python environment
+python -c "import sciveo; sciveo.monitor(period=120)"
+
+When using sciveo experimental projects management
 
 ```python
 

{sciveo-0.0.44 → sciveo-0.0.46}/README.md

@@ -4,6 +4,9 @@
 There are few configuration params samplers, which allows easy parameter tuning. The "auto" sampler perhaps is the easiest to use, but also
 "random" and "grid" ones are available.
 
+There is also the sciveo.monitor() which will start monitoring machine CPU/RAM/GPU etc.
+
+
 ## Features
 
 - **Experiment Tracking:** Easily log and track your machine learning experiments.
@@ -13,8 +16,12 @@ There are few configuration params samplers, which allows easy parameter tuning.
 
 ## Installation
 
+ - main sciveo
 pip install sciveo
 
+ - optional for sciveo monitoring
+pip install sciveo[mon]
+
 ## Example usage
 
 There are few public examples in sciveo.com.
@@ -24,6 +31,10 @@ The library has local and remote mode. The local one is ready to use, but for th
 When have sciveo account:
 export SCIVEO_SECRET_ACCESS_KEY='my_sciveo_user_auth_token'
 
+When using sciveo monitoring just run, using suitable python environment
+python -c "import sciveo; sciveo.monitor(period=120)"
+
+When using sciveo experimental projects management
 
 ```python
 

{sciveo-0.0.44 → sciveo-0.0.46}/sciveo/__init__.py

@@ -20,12 +20,11 @@ try:
   from sciveo.common.tools.daemon import TasksDaemon, __upload_content__
   from sciveo.content.runner import ProjectRunner
   from sciveo.content.dataset import Dataset
-  from sciveo.monitoring.monitor import BaseMonitor
+  from sciveo.monitoring.start import MonitorStart
   from sciveo.version import __version__
 
 
   TasksDaemon.current = TasksDaemon(num_threads=int(os.environ.get("SCIVEO_TASKS_NUM_THREADS", 1)))
-  TasksDaemon.current.start()
 
 
   # New Experiment
@@ -36,6 +35,7 @@ try:
       error("there is no started project")
 
   def start(project, function, configuration={}, **kwargs):
+    TasksDaemon.current.start()
     ProjectRunner.current = ProjectRunner(project=project, function=function, configuration=configuration, **kwargs)
     ProjectRunner.current.run()
 
@@ -44,11 +44,8 @@ try:
     return Dataset.get(info)
 
   # Monitoring start
-  def monitor(period=120):
-    mon = BaseMonitor(period=period)
-    mon.start()
-    while(True):
-      time.sleep(60)
+  def monitor(**kwargs):
+    MonitorStart(**kwargs)()
 
 except ImportError as e:
   pass

{sciveo-0.0.44 → sciveo-0.0.46}/sciveo/common/tools/hardware.py

@@ -32,19 +32,25 @@ def new_guid(num_characters=32):
 
 class HardwareInfo:
   def __init__(self):
-    self.data = {
-      "CPU": {"count": os.cpu_count()},
-      "RAM": format_memory_size(os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES'))
-    }
+    self.data = {}
 
     self.get_cpu()
+    self.get_ram()
 
   def __call__(self):
     return self.data
 
+  def get_ram(self):
+    try:
+      self.data["RAM"] = format_memory_size(os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES'))
+    except Exception:
+      pass
+
   def get_cpu(self):
     list_keys = ["model name", "stepping", "cpu MHz", "cache size", "siblings", "cpu cores", "bogomips"]
     try:
+      self.data["CPU"] = {"count": os.cpu_count()}
+
       cpu_info = {}
       with open('/proc/cpuinfo', 'r') as file:
         lines = file.readlines()

{sciveo-0.0.44 → sciveo-0.0.46}/sciveo/monitoring/monitor.py

@@ -31,9 +31,7 @@ class BaseMonitor(DaemonBase):
 
     self.data = HardwareInfo()()
     self.data.setdefault("CPU", {})
-    self.data["RAM"] = {
-      "installed": self.data["RAM"]
-    }
+    self.data["RAM"] = {}
     self.data["LOG"] = {}
     self.list_logs = []
 
@@ -46,7 +44,7 @@ class BaseMonitor(DaemonBase):
 
     machine_serial = self.getserial()
 
-    debug(type(self).__name__, "init", machine_serial, "initial_cpu_usage", initial_cpu_usage)
+    debug(type(self).__name__, f"init monitor with period={period}", machine_serial, "initial_cpu_usage", initial_cpu_usage)
 
   def __call__(self):
     return self.data
@@ -77,6 +75,7 @@ class BaseMonitor(DaemonBase):
     self.data["RAM"]["used"] = memory.used
     self.data["RAM"]["total"] = memory.total
     self.data["RAM"]["free"] = memory.free
+    self.data["RAM"]["installed"] = format_memory_size(memory.total)
     self.data["RAM"]["print"] = f"total: {format_memory_size(memory.total)} used: {format_memory_size(memory.used)}"
 
   def getserial(self):
@@ -87,7 +86,7 @@ class BaseMonitor(DaemonBase):
       pass
     if machine_serial is None:
       try:
-        machine_serial = socket.gethostname()
+        machine_serial = f"UUID-{uuid.getnode()}"
       except Exception:
         pass
     if machine_serial is None:

sciveo-0.0.46/sciveo/monitoring/start.py

@@ -0,0 +1,57 @@
+import os
+import time
+
+from sciveo.common.tools.logger import *
+from sciveo.monitoring.monitor import BaseMonitor
+
+
+class MonitorStart:
+  def __init__(self, **kwargs):
+    self.default_arguments = {
+      "period": 120,
+      "block": True,
+      "fork": False,
+      "fork_type": 0
+    }
+    self.arguments = {}
+    for k, v in self.default_arguments.items():
+      self.arguments[k] = kwargs.get(k, v)
+
+    if len(kwargs) == 0:
+      info("sciveo monitoring default options", self.default_arguments)
+
+  def __call__(self):
+    if self.arguments["fork"] and self.arguments["block"]:
+      self.fork()
+    self.start()
+
+  def start_multiprocessing(self):
+    self.start()
+  def start_fork(self):
+    os.setsid()
+    self.start()
+  def fork(self):
+    if self.arguments["fork_type"] == 0:
+      import multiprocessing
+      background_process = multiprocessing.Process(target=self.start_multiprocessing)
+      background_process.daemon = True
+      background_process.start()
+      info("monitoring service started with", self.arguments)
+      exit()
+    else:
+      pid = os.fork()
+      if pid == 0:
+        self.start_fork()
+      else:
+        info("sciveo monitor service started with pid", pid, self.arguments)
+        exit()
+
+  def start(self):
+    period = max(self.arguments["period"], 5)
+    mon = BaseMonitor(period=period)
+    mon.start()
+    mon.join()
+
+    if self.arguments["block"]:
+      while(True):
+        time.sleep(60)

sciveo-0.0.46/sciveo/version.py

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

{sciveo-0.0.44 → sciveo-0.0.46}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.0.44
+Version: 0.0.46
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 
@@ -10,6 +10,9 @@ Provides-Extra: mon
 There are few configuration params samplers, which allows easy parameter tuning. The "auto" sampler perhaps is the easiest to use, but also
 "random" and "grid" ones are available.
 
+There is also the sciveo.monitor() which will start monitoring machine CPU/RAM/GPU etc.
+
+
 ## Features
 
 - **Experiment Tracking:** Easily log and track your machine learning experiments.
@@ -19,8 +22,12 @@ There are few configuration params samplers, which allows easy parameter tuning.
 
 ## Installation
 
+ - main sciveo
 pip install sciveo
 
+ - optional for sciveo monitoring
+pip install sciveo[mon]
+
 ## Example usage
 
 There are few public examples in sciveo.com.
@@ -30,6 +37,10 @@ The library has local and remote mode. The local one is ready to use, but for th
 When have sciveo account:
 export SCIVEO_SECRET_ACCESS_KEY='my_sciveo_user_auth_token'
 
+When using sciveo monitoring just run, using suitable python environment
+python -c "import sciveo; sciveo.monitor(period=120)"
+
+When using sciveo experimental projects management
 
 ```python
 

{sciveo-0.0.44 → sciveo-0.0.46}/sciveo.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ sciveo/content/project.py
 sciveo/content/runner.py
 sciveo/monitoring/__init__.py
 sciveo/monitoring/monitor.py
+sciveo/monitoring/start.py
 test/test_configuration.py
 test/test_monitoring.py
 test/test_runner.py

sciveo-0.0.44/sciveo/version.py

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