Fix missing f's.

[python_utils.git] / executors.py

diff --git a/executors.py b/executors.py
index e092e1058bac0d7ba754aaefbfefcfe51f3ffcec..3786954a418c257bd2c7d0ae81d1455c0d8ea1cc 100644 (file)
--- a/executors.py
+++ b/executors.py
@@ -63,7 +63,7 @@ parser.add_argument(
 )
 
 SSH = '/usr/bin/ssh -oForwardX11=no'
-SCP = '/usr/bin/scp'
+SCP = '/usr/bin/scp -C'
 
 
 def make_cloud_pickle(fun, *args, **kwargs):
@@ -248,8 +248,9 @@ class BundleDetails:
 
 class RemoteExecutorStatus:
     def __init__(self, total_worker_count: int) -> None:
-        self.worker_count = total_worker_count
+        self.worker_count: int = total_worker_count
         self.known_workers: Set[RemoteWorkerRecord] = set()
+        self.start_time: float = time.time()
         self.start_per_bundle: Dict[str, float] = defaultdict(float)
         self.end_per_bundle: Dict[str, float] = defaultdict(float)
         self.finished_bundle_timings_per_worker: Dict[
@@ -259,11 +260,11 @@ class RemoteExecutorStatus:
         self.bundle_details_by_uuid: Dict[str, BundleDetails] = {}
         self.finished_bundle_timings: List[float] = []
         self.last_periodic_dump: Optional[float] = None
-        self.total_bundles_submitted = 0
+        self.total_bundles_submitted: int = 0
 
         # Protects reads and modification using self.  Also used
         # as a memory fence for modifications to bundle.
-        self.lock = threading.Lock()
+        self.lock: threading.Lock = threading.Lock()
 
     def record_acquire_worker(self, worker: RemoteWorkerRecord, uuid: str) -> None:
         with self.lock:
@@ -338,13 +339,14 @@ class RemoteExecutorStatus:
         if len(self.finished_bundle_timings) > 1:
             qall = numpy.quantile(self.finished_bundle_timings, [0.5, 0.95])
             ret += (
-                f'⏱=∀p50:{qall[0]:.1f}s, ∀p95:{qall[1]:.1f}s, '
+                f'⏱=∀p50:{qall[0]:.1f}s, ∀p95:{qall[1]:.1f}s, total={ts-self.start_time:.1f}s, '
                 f'✅={total_finished}/{self.total_bundles_submitted}, '
                 f'💻n={total_in_flight}/{self.worker_count}\n'
             )
         else:
             ret += (
-                f' ✅={total_finished}/{self.total_bundles_submitted}, '
+                f'⏱={ts-self.start_time:.1f}s, '
+                f'✅={total_finished}/{self.total_bundles_submitted}, '
                 f'💻n={total_in_flight}/{self.worker_count}\n'
             )
 
@@ -1100,7 +1102,7 @@ class DefaultExecutors(object):
                     RemoteWorkerRecord(
                         username='scott',
                         machine='cheetah.house',
-                        weight=25,
+                        weight=34,
                         count=6,
                     ),
                 )
@@ -1120,7 +1122,7 @@ class DefaultExecutors(object):
                     RemoteWorkerRecord(
                         username='scott',
                         machine='wannabe.house',
-                        weight=30,
+                        weight=25,
                         count=10,
                     ),
                 )