nodeocc 1.0.14__tar.gz → 1.0.15__tar.gz

{nodeocc-1.0.14 → nodeocc-1.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nodeocc
-Version: 1.0.14
+Version: 1.0.15
 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.14 → nodeocc-1.0.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nodeocc"
-version = "1.0.14"
+version = "1.0.15"
 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.14 → nodeocc-1.0.15}/src/nodeocc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nodeocc
-Version: 1.0.14
+Version: 1.0.15
 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.14 → nodeocc-1.0.15}/src/readers/slurmreader.py

@@ -30,11 +30,15 @@ def _split_column(df, column):
     return node_flat.merge(df[[x for x in df.columns if x != column]], left_index=True, right_index=True).reset_index(drop=True)
 
 
+def _match_str_wildcard(s, w):
+    return re.match(w.replace('*', '.*'), s) is not None
+
+
 def _node_from_sinfo(x):
-    n = Node(_node_preproc(x['NODELIST']), x.n_gpu, x.m_gpu, x.reserved, None, x.CPUS, x.MEMORY)#, feature=x.AVAIL_FEATURES)
+    n = Node(_node_preproc(x['NODELIST']), x.n_gpu, x.m_gpu, x.reserved, None, x.CPUS, x.MEMORY)  # , feature=x.AVAIL_FEATURES)
     if x['STATE'] == 'drng' or 'drain' in x['STATE']:
         n.status = 'drain'
-    elif x['STATE'].upper() in ('MAINT', 'DOWN', 'DOWN*', 'FAIL', 'FAILING', 'FAIL*'):
+    elif x['STATE'].upper() in ('MAINT', 'DOWN', 'DOWN*', 'FAIL', 'FAILING', 'FAIL*') or _match_str_wildcard(x['STATE'].lower(), 'inv*'):
         n.status = 'down'
     else:
         n.status = 'ok'
@@ -56,9 +60,9 @@ def _parse_gpu_models(line):
 def _read_nodes(reservations=None, pending_res=None, return_raw=False):
     sinfo_df = pd.read_csv(StringIO(os.popen(r'sinfo -N -o "%N;%G;%t;%m;%c;%f"').read()), sep=';')
     sinfo_df = _split_column(sinfo_df, 'NODELIST').drop_duplicates()
-    sinfo_df.loc[:,'n_gpu'] = sinfo_df['GRES'].apply(lambda x: 0 if x.split('(')[0].split(':')[0] in ('(null)', '') else int(x.split('(')[0].split(':')[-1]))
+    sinfo_df.loc[:, 'n_gpu'] = sinfo_df['GRES'].apply(lambda x: 0 if x.split('(')[0].split(':')[0] in ('(null)', '') else int(x.split('(')[0].split(':')[-1]))
     # sinfo_df['m_gpu'] = sinfo_df['GRES'].str.split(':').apply(lambda x: 'n/a' if x[0] in ('(null)', '') else x[1])
-    sinfo_df.loc[:,'m_gpu'] = sinfo_df['GRES'].str.split(';').apply(_parse_gpu_models)
+    sinfo_df.loc[:, 'm_gpu'] = sinfo_df['GRES'].str.split(';').apply(_parse_gpu_models)
     sinfo_df['reserved'] = 'no'
     if reservations is not None:
         sinfo_df.loc[sinfo_df['NODELIST'].isin(reservations.Nodes.unique()), 'reserved'] = 'yes'
@@ -66,7 +70,7 @@ def _read_nodes(reservations=None, pending_res=None, return_raw=False):
         sinfo_df.loc[sinfo_df['NODELIST'].isin(pending_res.Nodes.unique()), 'reserved'] = 'pending'
     if return_raw:
         return sinfo_df
-    
+
     return sinfo_df.apply(_node_from_sinfo, axis=1).tolist()
 
 
@@ -85,8 +89,8 @@ def _read_maintenances():
     if not len(reservations):
         return [], None, None
     reservations = pd.DataFrame.from_records(reservations)
-    reservations['StartTime'] = reservations['StartTime'].apply(lambda x:str(pd.to_datetime(x)))
-    reservations['EndTime'] = reservations['EndTime'].apply(lambda x:str(pd.to_datetime(x)))
+    reservations['StartTime'] = reservations['StartTime'].apply(lambda x: str(pd.to_datetime(x)))
+    reservations['EndTime'] = reservations['EndTime'].apply(lambda x: str(pd.to_datetime(x)))
     # reservations['StartTime'] = str(pd.to_datetime(reservations['StartTime']))
     # reservations['EndTime'] = str(pd.to_datetime(reservations['EndTime']))
     reservations = _split_column(reservations, 'Nodes')

{nodeocc-1.0.14 → nodeocc-1.0.15}/src/view/curses_multiwindow.py

@@ -24,7 +24,7 @@ BUTTON_ACTIONS = {
     'right_1': [ord('d'), curses.KEY_RIGHT, ord('l')],
     'up_tab': [curses.KEY_NPAGE],
     'down_tab': [curses.KEY_PPAGE],
-    'quit': [ord('q'), 'q'],
+    'quit': [ord('q'), 'q', 27],  # 27 is ESC
     'sort_prio': [ord('S')],
     'res_view_mode': [ord('g')],
     'job_id_type': [ord('b')],
@@ -403,7 +403,7 @@ def handle_keys(stdscr, instance):
     elif k in BUTTON_ACTIONS['sort_prio']:
         instance.sort_by_prio = not instance.sort_by_prio
     elif k in BUTTON_ACTIONS['res_view_mode']:
-        instance.view_mode = {"gpu": "ram", "ram": "cpu", "cpu": "gpu"}[instance.view_mode]
+        instance.view_mode = {"gpu": "ram", "ram": "cpu", "cpu": "gpu", "info": "gpu"}[instance.view_mode]
         instance.right_width = 33 if instance.view_mode != 'info' else 39
         stdscr.clear()
     elif k in BUTTON_ACTIONS['job_id_type']:
@@ -446,7 +446,7 @@ def update_screen(stdscr, instance):
         totsize += 10
     if instance.show_prio:
         totsize += 8
-    totsize += 10  # from /etc/update-motd.d/02-wait-times
+    # totsize += 10  # from /etc/update-motd.d/02-wait-times
 
     if columns < totsize:
         stdscr.addstr(1, 1, "MINIMUM TERM. WIDTH")
@@ -532,7 +532,7 @@ def update_screen(stdscr, instance):
     instance.add_button(lines - 1, xoffset + 50 + 2, '[T:ACCOUNT]', BUTTON_ACTIONS['show_account'][0])
 
     # get slurm user partition
-    stdscr.addstr(lines - 1, xoffset + 62 + 2, f'(Avg time {instance.avg_wait_time})', curses.color_pair(2))
+    # stdscr.addstr(lines - 1, xoffset + 62 + 2, f'(Avg time {instance.avg_wait_time})', curses.color_pair(2))
 
     signature = instance.signature if instance.updated else f'{instance.version} -> {instance.newest_version}'
     stdscr.addstr(lines - 1, columns - 2 - len(signature), signature, curses.color_pair(2) if instance.updated else curses.color_pair(3))

{nodeocc-1.0.14 → nodeocc-1.0.15}/src/view/slurm_viz.py

@@ -111,6 +111,33 @@ def get_cpu_block(cpus):
     return cpus // cpu_size
 
 
+def get_node_status(node, jobs):
+    ram_occs = 0
+    cpu_occs = 0
+    for j in sorted(jobs, key=lambda x: (x.partition, x.user)):
+        for jj in j.joblets:
+            if node.name == jj.node:
+                ram_occs += jj.mem
+                cpu_occs += jj.cpus
+
+    node_total_ram = node.mem
+    node_total_cpus = node.cpus
+
+    # compute the usage percentage for both ram and cpu
+    ram_usage = (ram_occs / node_total_ram)
+    cpu_usage = (cpu_occs / node_total_cpus)
+
+    # get worst case usage
+    usage = max(ram_usage, cpu_usage)
+
+    if usage > 0.9:
+        return 'RED'
+    elif usage > 0.7:
+        return 'YELLOW'
+    else:
+        return None  # white?
+
+
 def view_viz(infrastructure, jobs, work=True, stylefn=cmdstyle, current_user=None, mode='gpu'):
     if mode == 'gpu':
         return view_viz_gpu(infrastructure, jobs, work, stylefn, current_user)
@@ -294,6 +321,7 @@ def view_viz_gpu(infrastructure, jobs, work=True, stylefn=cmdstyle, current_user
 
             joblet_icons = [(ji[0] + (' ' if i != len(joblet_icons) - 1 else ''), ji[1]) for i, ji in enumerate(joblet_icons)]
 
+            node_status = get_node_status(n, jobs)
             jobsplit = [""]
             count = 0
             for ic, c in joblet_icons:
@@ -301,7 +329,12 @@ def view_viz_gpu(infrastructure, jobs, work=True, stylefn=cmdstyle, current_user
                     if count == gpu_box_chars:
                         jobsplit.append("")
                         count = 0
-                    jobsplit[-1] += stylefn(c, i) if c is not None else i
+                    if c is not None:
+                        jobsplit[-1] += stylefn(c, i)
+                    elif node_status is not None:
+                        jobsplit[-1] += stylefn(node_status, i)
+                    else:
+                        jobsplit[-1] += i
                     count += 1
 
             for i, l in enumerate(jobsplit):
@@ -323,7 +356,8 @@ def view_viz_gpu(infrastructure, jobs, work=True, stylefn=cmdstyle, current_user
             cust_print('')
 
         # print summary
-        cust_print(''.join([' [' + gpu_occ + 'run', gpu_paused + 'hld', gpu_drain + 'drn', gpu_pendr + 'pnd', gpu_down + 'dwn', '()res]']))
+        cust_print(''.join([' [' + gpu_occ + 'run ()resv ', stylefn('YELLOW', gpu_avail) + '>70% ', stylefn('RED', gpu_avail), '>90%]']))
+        cust_print(''.join([' [', gpu_paused + 'hld ', gpu_drain + 'drn ', gpu_pendr + 'pnd ', gpu_down + 'dwn', ']']))
         gpuc = 'RED'
         if infrastructure.gpu_limit_pu > 3:
             gpuc = 'YELLOW'

nodeocc-1.0.15/src/view/styles.py

@@ -0,0 +1,79 @@
+def _format_to(st, width, dir='left'):
+    ts = str(st)[:width]
+    if dir == 'left':
+        return ts + ' ' * (width - len(ts))
+    else:
+        return ' ' * (width - len(ts)) + ts
+
+
+def cmdstyle(color, string):
+    """
+    style formatting function for unix terminals
+    """
+    strings = string.split('\n')
+    styles = {
+        'RED': lambda x: '\033[31m' + str(x) + '\033[0m',
+        'YELLOW': lambda x: '\033[33m' + str(x) + '\033[0m',
+        'GREEN': lambda x: '\033[32m' + str(x) + '\033[0m',
+        'MAGENTA': lambda x: '\033[35m' + str(x) + '\033[0m',
+        'BLUE': lambda x: '\033[34m' + str(x) + '\033[0m',
+
+        'LRED': lambda x: '\033[91m' + str(x) + '\033[0m',
+        'LYELLOW': lambda x: '\033[93m' + str(x) + '\033[0m',
+        'LGREEN': lambda x: '\033[92m' + str(x) + '\033[0m',
+        'LMAGENTA': lambda x: '\033[95m' + str(x) + '\033[0m',
+        'LBLUE': lambda x: '\033[94m' + str(x) + '\033[0m',
+        'LCYAN': lambda x: '\033[96m' + str(x) + '\033[0m',
+        'LWHITE': lambda x: '\033[97m' + str(x) + '\033[0m',
+
+        'CYAN': lambda x: '\033[36m' + str(x) + '\033[0m',
+        'BG_CYAN': lambda x: '\033[33m' + str(x) + '\033[0m',
+        'WHITE': lambda x: '\033[37m' + str(x) + '\033[0m',
+
+        'BG_RED': lambda x: '\033[41m\033[37m' + str(x) + '\033[0m',
+        'BG_GREEN': lambda x: '\033[42m\033[37m' + str(x) + '\033[0m',
+        'BG_YELLOW': lambda x: '\033[43m' + str(x) + '\033[0m',
+        'BG_MAGENTA': lambda x: '\033[45m\033[37m' + str(x) + '\033[0m'
+
+    }
+    return '\n'.join([styles[color](x) for x in strings])
+
+
+def crsstyler(color, string):
+    """
+    custom style formatting function for curses applications
+    """
+    strings = string.split('\n')
+    styles = {
+        'RED': lambda x: '<*3~' + str(x) + ':*>',
+        'YELLOW': lambda x: '<*4~' + str(x) + ':*>',
+        'GREEN': lambda x: '<*5~' + str(x) + ':*>',
+        'MAGENTA': lambda x: '<*6~' + str(x) + ':*>',
+        'BLUE': lambda x: '<*7~' + str(x) + ':*>',
+
+        'LRED': str,
+        'LYELLOW': str,
+        'LGREEN': str,
+        'LMAGENTA': str,
+        'LBLUE': str,
+        'LCYAN': str,
+        'LWHITE': str,
+        'LBG_CYAN': str,
+
+        'CYAN': lambda x: '<*8~' + str(x) + ':*>',
+        'BG_CYAN': lambda x: '<*15~' + str(x) + ':*>',
+        'WHITE': lambda x: '<*2~' + str(x) + ':*>',
+
+        'BG_RED': lambda x: '<*10~' + str(x) + ':*>',
+        'BG_GREEN': lambda x: '<*11~' + str(x) + ':*>',
+        'BG_YELLOW': lambda x: '<*12~' + str(x) + ':*>',
+        'BG_MAGENTA': lambda x: '<*13~' + str(x) + ':*>',
+    }
+    return '\n'.join([styles[color](x) for x in strings])
+
+
+def mockstyler(color, string):
+    """
+    mock style formatting function for debug purposes
+    """
+    return string

nodeocc-1.0.14/src/view/styles.py

@@ -1,76 +0,0 @@
-def _format_to(st, width, dir='left'):
-        ts = str(st)[:width]
-        if dir == 'left':
-            return ts + ' ' * (width - len(ts))
-        else:
-            return ' ' * (width - len(ts)) + ts
-
-def cmdstyle(color, string):
-    """
-    style formatting function for unix terminals
-    """
-    strings = string.split('\n')
-    styles = {
-        'RED' : lambda x: '\033[31m' + str(x) + '\033[0m',
-        'YELLOW' : lambda x: '\033[33m' + str(x) + '\033[0m',
-        'GREEN' : lambda x: '\033[32m' + str(x) + '\033[0m',
-        'MAGENTA' : lambda x: '\033[35m' + str(x) + '\033[0m',
-        'BLUE' : lambda x: '\033[34m' + str(x) + '\033[0m',
-
-        'LRED' : lambda x: '\033[91m' + str(x) + '\033[0m',
-        'LYELLOW' : lambda x: '\033[93m' + str(x) + '\033[0m',
-        'LGREEN' : lambda x: '\033[92m' + str(x) + '\033[0m',
-        'LMAGENTA' : lambda x: '\033[95m' + str(x) + '\033[0m',
-        'LBLUE' : lambda x: '\033[94m' + str(x) + '\033[0m',
-        'LCYAN' : lambda x: '\033[96m' + str(x) + '\033[0m',
-        'LWHITE' : lambda x: '\033[97m' + str(x) + '\033[0m',
-
-        'CYAN' : lambda x: '\033[36m' + str(x) + '\033[0m',
-        'BG_CYAN': lambda x: '\033[33m' + str(x) + '\033[0m',
-        'WHITE' : lambda x: '\033[37m' + str(x) + '\033[0m',
-
-        'BG_RED': lambda x: '\033[41m\033[37m' + str(x) + '\033[0m',
-        'BG_GREEN': lambda x: '\033[42m\033[37m' + str(x) + '\033[0m',
-        'BG_YELLOW': lambda x: '\033[43m' + str(x) + '\033[0m',
-        'BG_MAGENTA': lambda x: '\033[45m\033[37m' + str(x) + '\033[0m'
-
-    }
-    return '\n'.join([styles[color](x) for x in strings])
-
-def crsstyler(color, string):
-    """
-    custom style formatting function for curses applications
-    """
-    strings = string.split('\n')
-    styles = {
-        'RED' : lambda x: '<*3~' + str(x) + ':*>',
-        'YELLOW' : lambda x: '<*4~' + str(x) + ':*>',
-        'GREEN' : lambda x: '<*5~' + str(x) + ':*>',
-        'MAGENTA' : lambda x: '<*6~' + str(x) + ':*>',
-        'BLUE' : lambda x: '<*7~' + str(x) + ':*>',
-
-        'LRED' : str,
-        'LYELLOW' : str,
-        'LGREEN' : str,
-        'LMAGENTA' : str,
-        'LBLUE' : str,
-        'LCYAN' : str,
-        'LWHITE' : str,
-        'LBG_CYAN' : str,
-
-        'CYAN' : lambda x: '<*8~' + str(x) + ':*>',
-        'BG_CYAN': lambda x: '<*15~' + str(x) + ':*>',
-        'WHITE' : lambda x: '<*2~' + str(x) + ':*>',
-
-        'BG_RED':       lambda x: '<*10~' + str(x) + ':*>',
-        'BG_GREEN':     lambda x: '<*11~' + str(x) + ':*>',
-        'BG_YELLOW':    lambda x: '<*12~' + str(x) + ':*>',
-        'BG_MAGENTA':   lambda x: '<*13~' + str(x) + ':*>'
-    }
-    return '\n'.join([styles[color](x) for x in strings])
-
-def mockstyler(color, string):
-    """
-    mock style formatting function for debug purposes
-    """
-    return string