cubestat: lint again

cubestat/cubestat.py

@@ -142,5 +142,6 @@ def main():
     args = parser.parse_args()
     curses.wrapper(start, get_platform(args.refresh_ms), args)
 
+
 if __name__ == '__main__':
     main()

cubestat/metrics/base_metric.py

@@ -2,6 +2,7 @@
 
 from cubestat.common import SimpleMode
 
+
 # TODO: make this one metric_set or metric_group.
 # each individual metric would be able to pick the implementation
 # for formatting, etc.
@@ -44,7 +45,7 @@ def hotkey(self):
     def configure_argparse(cls, parser):
         pass
 
-    # help message to be used for this metric. 
+    # help message to be used for this metric.
     @classmethod
     def help(self):
         return None

cubestat/metrics/cpu.py

@@ -66,6 +66,7 @@ def read(self, _context):
 
         return res
 
+
 @cubestat_metric('darwin')
 class macos_cpu_metric(cpu_metric):
     def read(self, context):
@@ -85,4 +86,3 @@ def read(self, context):
             res[cluster_title] = 100.0 - 100.0 * idle_cluster / total_cluster
 
         return res
-

cubestat/metrics/disk.py

@@ -4,12 +4,13 @@
 from cubestat.metrics.base_metric import base_metric
 from cubestat.metrics.registry import cubestat_metric
 
+
 class disk_metric(base_metric):
     def pre(self, title):
         if self.mode == SimpleMode.hide:
             return False, ''
         return True, ''
-    
+
     def format(self, title, values, idxs):
         return label_bytes_per_sec(values, idxs)
 
@@ -29,19 +30,21 @@ def configure(self, conf):
         self.rate_reader = RateReader(conf.refresh_ms)
         return self
 
+
 @cubestat_metric('darwin')
 class macos_disc_metric(disk_metric):
     def read(self, context):
         res = {}
-        res['disk read']  = context['disk']['rbytes_per_s']
+        res['disk read'] = context['disk']['rbytes_per_s']
         res['disk write'] = context['disk']['wbytes_per_s']
         return res
-
+
+
 @cubestat_metric('linux')
 class linux_disc_metric(disk_metric):
     def read(self, _context):
         res = {}
         disk_io = psutil.disk_io_counters()
-        res['disk read']  = self.rate_reader.next('disk read', disk_io.read_bytes)
-        res['disk write']  = self.rate_reader.next('disk write', disk_io.write_bytes)
+        res['disk read'] = self.rate_reader.next('disk read', disk_io.read_bytes)
+        res['disk write'] = self.rate_reader.next('disk write', disk_io.write_bytes)
         return res

cubestat/metrics/gpu.py

@@ -5,11 +5,13 @@
 from cubestat.metrics.base_metric import base_metric
 from cubestat.metrics.registry import cubestat_metric
 
+
 class GPUMode(DisplayMode):
     collapsed = 'collapsed'
     load_only = 'load_only'
     load_and_vram = 'load_and_vram'
 
+
 class gpu_metric(base_metric):
     def pre(self, title):
         if self.n_gpus > 0 and self.mode == GPUMode.collapsed and "Total GPU" not in title:
@@ -19,7 +21,7 @@ def pre(self, title):
         if self.n_gpus > 1 and "Total GPU" not in title:
             return True, '  '
         return True, ''
-    
+
     def format(self, title, values, idxs):
         return 100.0, [f'{values[i]:3.0f}%' for i in idxs]
 
@@ -38,11 +40,12 @@ def hotkey(self):
     def configure_argparse(cls, parser):
         parser.add_argument('--gpu', type=GPUMode, default=GPUMode.load_only, choices=list(GPUMode), help='GPU mode - hidden, showing all GPUs load, or showing load and vram usage. Can be toggled by pressing g.')
 
+
 @cubestat_metric('linux')
 class nvidia_gpu_metric(gpu_metric):
     def __init__(self) -> None:
         self.has_nvidia = False
-        self.n_gpus     = 0
+        self.n_gpus = 0
         try:
             subprocess.check_output('nvidia-smi')
             nvspec = find_spec('pynvml')
@@ -71,7 +74,8 @@ def read(self, _context):
                     combined[k] = v
                 return combined
         return res
-
+
+
 @cubestat_metric('darwin')
 class macos_gpu_metric(gpu_metric):
     def read(self, context):

cubestat/metrics/memory.py

@@ -5,9 +5,11 @@
 from cubestat.common import label_bytes
 from cubestat.common import DisplayMode
 
+
 class RAMMode(DisplayMode):
     percent = 'percent'
-    all  = 'all'
+    all = 'all'
+
 
 class ram_metric(base_metric):
     def configure(self, _conf):
@@ -16,14 +18,14 @@ def configure(self, _conf):
 
     def hotkey(self):
         return 'm'
-    
+
     def pre(self, title):
         if title == 'RAM used %':
             return True, ''
         if self.mode == RAMMode.all:
             return True, '  '
         return False, ''
-    
+
     def format(self, title, values, idxs):
         if title == 'RAM used %':
             return 100.0, [f'{values[i]:3.0f}%' for i in idxs]
@@ -33,24 +35,26 @@ def format(self, title, values, idxs):
     def key(cls):
         return 'ram'
 
+
 @cubestat_metric('darwin')
 class ram_metric_macos(ram_metric):
     def read(self, _context):
         vm = psutil.virtual_memory()
         return {
-            'RAM used %' : vm.percent,
-            'RAM used'   : vm.used,
-            'RAM wired'  : vm.wired,
+            'RAM used %': vm.percent,
+            'RAM used': vm.used,
+            'RAM wired': vm.wired,
         }
 
+
 @cubestat_metric('linux')
 class ram_metric_linux(ram_metric):
     def __init__(self):
         # how to get metric from meminfo data
         self.rows = {
-            'RAM used %' : lambda mi: 100.0 * (mi['MemTotal'] - mi['MemAvailable']) / mi['MemTotal'],
-            'RAM used'   : lambda mi: mi['MemTotal'] - mi['MemAvailable'],
-            'RAM mapped' : lambda mi: mi['Mapped'],
+            'RAM used %': lambda mi: 100.0 * (mi['MemTotal'] - mi['MemAvailable']) / mi['MemTotal'],
+            'RAM used': lambda mi: mi['MemTotal'] - mi['MemAvailable'],
+            'RAM mapped': lambda mi: mi['Mapped'],
         }
 
     def read(self, _context):

cubestat/metrics/network.py

@@ -4,12 +4,13 @@
 from cubestat.metrics.base_metric import base_metric
 from cubestat.metrics.registry import cubestat_metric
 
+
 class network_metric(base_metric):
     def pre(self, title):
         if self.mode == SimpleMode.hide:
             return False, ''
         return True, ''
-    
+
     def format(self, title, values, idxs):
         return label_bytes_per_sec(values, idxs)
 
@@ -29,6 +30,7 @@ def configure(self, conf):
     def configure_argparse(cls, parser):
         parser.add_argument('--network', type=SimpleMode, default=SimpleMode.show, choices=list(SimpleMode), help="Show network io. Can be toggled by pressing n.")
 
+
 @cubestat_metric('darwin')
 class macos_network_metric(network_metric):
     def read(self, context):
@@ -37,6 +39,7 @@ def read(self, context):
         res['network tx'] = context['network']['obyte_rate']
         return res
 
+
 @cubestat_metric('linux')
 class linux_network_metric(network_metric):
     def read(self, _context):

cubestat/metrics/registry.py

@@ -23,5 +23,6 @@ def get_metrics(args):
         for key, cls in _metrics
     }
 
+
 # to run the annotations and register metrics
 from cubestat.metrics import cpu, gpu, memory, accel, swap, network, disk, power

cubestat/platforms/factory.py

@@ -1,8 +1,10 @@
+import logging
 import sys
 
 from cubestat.platforms.linux import LinuxPlatform
 from cubestat.platforms.macos import MacOSPlatform
 
+
 def get_platform(refresh_ms):
     if sys.platform == "darwin":
         return MacOSPlatform(refresh_ms)

cubestat/platforms/linux.py

@@ -1,9 +1,10 @@
 import time
 
+
 class LinuxPlatform:
     def __init__(self, interval_ms):
         self.interval_ms = interval_ms
-        self.platform    = 'linux'
+        self.platform = 'linux'
 
     def loop(self, do_read_cb):
         # TODO: should this be monotonic?

cubestat/platforms/macos.py

@@ -6,11 +6,11 @@ class MacOSPlatform:
     def __init__(self, interval_ms) -> None:
         cmd = ['sudo', 'powermetrics', '-f', 'plist', '-i', str(interval_ms), '-s', 'cpu_power,gpu_power,ane_power,network,disk']
         self.powermetrics = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        # getting first line here to allow user to enter sudo credentials before 
+        # getting first line here to allow user to enter sudo credentials before
         # curses initialization.
         self.firstline = self.powermetrics.stdout.readline()
         self.platform = 'macos'
-    
+
     def loop(self, do_read_cb):
         buf = bytearray()
         buf.extend(self.firstline)

cubestat/tests/test_prepare_cells.py

@@ -3,12 +3,14 @@
 from unittest.mock import patch
 import unittest
 
+
 class TestPrepareCells(unittest.TestCase):
     @patch('curses.init_pair')
     def test_prepare_cells(self, mock_init_pair):
         cells = prepare_cells()
         self.assertEqual(len(cells['green']), 27)
         self.assertEqual(mock_init_pair.call_count, 18)
 
+
 if __name__ == '__main__':
     unittest.main()

scripts/apple_loadgen.py

@@ -10,6 +10,7 @@
 n = 8
 layers = 30
 
+
 class Convs(nn.Module):
     def __init__(self, channels, layers):
         super(Convs, self).__init__()
@@ -19,7 +20,8 @@ def __init__(self, channels, layers):
 
     def forward(self, x):
         return self.blocks(x)
-
+
+
 class TestModel(nn.Module):
     def __init__(self):
         super(TestModel, self).__init__()
@@ -30,6 +32,7 @@ def __init__(self):
             nn.Flatten(),
             nn.LogSoftmax(dim=1)
         )
+
     def forward(self, x):
         return self.action(x)
 
@@ -76,4 +79,3 @@ def to_coreml(torch_model, batch_size, compute_units):
     ms_per_sample = 1000.0 * duration / total_ranked
 
     print(f'{batch_size},{duration:.3f},{total_ranked},{ms_per_sample:.3f}')
-

scripts/cuda_loadgen.py

@@ -8,6 +8,7 @@
     print("This script requires at least two GPUs")
     exit()
 
+
 # Set up a simple neural network model
 class SimpleModel(nn.Module):
     def __init__(self):
@@ -17,6 +18,7 @@ def __init__(self):
     def forward(self, x):
         return self.fc(x)
 
+
 # Create model and wrap it with DataParallel to utilize multiple GPUs
 model = SimpleModel().cuda()
 model = DataParallel(model)