nodeocc 1.0.3__tar.gz → 1.0.4__tar.gz

{nodeocc-1.0.3 → nodeocc-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nodeocc
-Version: 1.0.3
+Version: 1.0.4
 Summary: TUI application for viewing the status of GPU allocations on a Slurm cluster
 Author: Matteo Boschini
 Maintainer: Lorenzo Bonicelli, Aniello Panariello

{nodeocc-1.0.3 → nodeocc-1.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nodeocc"
-version = "1.0.3"
+version = "1.0.4"
 authors = [{ name = "Matteo Boschini" }]
 maintainers = [{ name = "Lorenzo Bonicelli" }, { name = "Aniello Panariello" }]
 description = "TUI application for viewing the status of GPU allocations on a Slurm cluster"

{nodeocc-1.0.3 → nodeocc-1.0.4}/src/controller/controller.py

@@ -57,6 +57,7 @@ try:
     print(END, end='')
 except Exception as e:
     print(f"{BBLUE}Could not get newest version from pip, check if {program_name} is up to date{END}")
+    newest_version = '?.?.?'
     time.sleep(5)
 
 

{nodeocc-1.0.3 → nodeocc-1.0.4}/src/nodeocc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nodeocc
-Version: 1.0.3
+Version: 1.0.4
 Summary: TUI application for viewing the status of GPU allocations on a Slurm cluster
 Author: Matteo Boschini
 Maintainer: Lorenzo Bonicelli, Aniello Panariello

{nodeocc-1.0.3 → nodeocc-1.0.4}/src/readers/slurmreader.py

@@ -151,27 +151,29 @@ def _load_joblet_meta(line):
 
 
 def _gpus_per_joblet(line):
-    if pd.isna(line['ALL_JOB_NODES']):
+    try:
+        if 'node=1' in line['TRES_ALLOC']:
+            return line['TRES_ALLOC'].split('gpu=')[-1].split(',')[0] if 'gpu=' in line['TRES_ALLOC'] else 0
+        else:
+            node = line['NODELIST']
+            node_idx = line['ALL_JOB_NODES'].split(',').index(node)
+            return int(re.findall(r'gpu:(\d+)', line['TRES_PER_NODE'])[node_idx]) if 'gpu:' in line['TRES_PER_NODE'] else 0
+    except BaseException as e:
         return 0
-    if line['ALL_JOB_NODES'].count(',') == 0:
-        return line['TRES_ALLOC'].split('gpu=')[-1].split(',')[0] if 'gpu=' in line['TRES_ALLOC'] else 0
-    else:
-        node = line['NODELIST']
-        node_idx = line['ALL_JOB_NODES'].split(',').index(node)
-        return int(re.findall(r'gpu:(\d+)', line['TRES_PER_NODE'])[node_idx]) if 'gpu:' in line['TRES_PER_NODE'] else 0
 
 
 def _cpus_per_joblet(line):
-    if pd.isna(line['ALL_JOB_NODES']):
+    try:
+        if 'node=1' in line['TRES_ALLOC']:
+            return int(str(line['TRES_ALLOC']).split('cpu=')[-1].split(',')[0])
+        else:
+            nodes = line['NODES']
+            tot_gpu = int(str(line['TRES_ALLOC']).split('gpu=')[-1].split(',')[0]) if 'gpu=' in str(line['TRES_ALLOC']) else 0
+            tot_cpus = int(str(line['TRES_ALLOC']).split('cpu=')[-1].split(',')[0])
+            n_gpus = line['joblet_gpus']
+            return int(tot_cpus) // int(nodes) if tot_gpu == 0 else int(tot_cpus) // tot_gpu * n_gpus
+    except BaseException as e:
         return 0
-    if line['ALL_JOB_NODES'].count(',') == 0:
-        return int(str(line['TRES_ALLOC']).split('cpu=')[-1].split(',')[0])
-    else:
-        nodes = line['NODES']
-        tot_gpu = int(str(line['TRES_ALLOC']).split('gpu=')[-1].split(',')[0]) if 'gpu=' in str(line['TRES_ALLOC']) else 0
-        tot_cpus = int(str(line['TRES_ALLOC']).split('cpu=')[-1].split(',')[0])
-        n_gpus = line['joblet_gpus']
-        return int(tot_cpus) // int(nodes) if tot_gpu == 0 else int(tot_cpus) // tot_gpu * n_gpus
 
 
 memunits = {
@@ -192,8 +194,6 @@ def parse_mem(thing):
 
 
 def _mem_per_joblet(line):
-    if pd.isna(line['ALL_JOB_NODES']):
-        return 0
     try:
         mem = line['TRES_ALLOC'].split('mem=')[-1].split(',')[0]
         if 'G' in mem:
@@ -205,7 +205,7 @@ def _mem_per_joblet(line):
     except BaseException:
         return 0
 
-    if line['ALL_JOB_NODES'].count(',') == 0:
+    if 'node=1' in line['TRES_ALLOC']:
         return mem
     else:
         nodes = line['NODES']

{nodeocc-1.0.3 → nodeocc-1.0.4}/src/view/slurm_list.py

@@ -47,7 +47,7 @@ def _joblet_format(instance, job, width=74, jobid_type='agg'):
         if instance.view_mode in ('gpu', 'ram'):
             joblet_repr += _format_to((f'{joblet.n_gpus}gp' if joblet.n_gpus > 0 else " - "), 3, 'left')
         elif instance.view_mode == 'cpu':
-            joblet_repr += _format_to((f'{joblet.cpus}cp' if joblet.cpus > 0 else "-"), 3, 'left')
+            joblet_repr += _format_to((f'{joblet.cpus}cp' if joblet.cpus > 0 else " - "), 3, 'left')
         joblet_repr += ' '
         joblet_repr += _format_to(joblet.node if joblet.node is not None else job.reason, 11)
         joblet_reprs.append(joblet_repr)