Quellcode durchsuchen

Adjust run_all_experiments autodetection of experiment sizes to new EPC requirements

Ian Goldberg vor 8 Monaten
Ursprung
Commit
ef84c8d48c
1 geänderte Dateien mit 11 neuen und 8 gelöschten Zeilen
  1. 11 8
      run_all_experiments.py

+ 11 - 8
run_all_experiments.py

@@ -39,18 +39,18 @@ B = 256
 N_MAX = 1<<20
 M_MAX = 72
 
-# For 1<<20 clients and 72 servers, we need 3.65 GiB of EPC and 20 GiB
+# For 1<<20 clients and 72 servers, we need 4.92 GiB of EPC and 20 GiB
 # of free RAM.
 # If we don't have that, abort, unless the SHRINK_TO_MEM env var is set
 # to 1, in which case perform smaller experiments that should fit in the
 # available resources.
-if epc_gib < 3.65 or free_gib < 20:
+if epc_gib < 4.92 or free_gib < 20:
     shrink_to_mem = \
         os.getenv("SHRINK_TO_MEM", '0').lower() in ('true', '1', 't')
     if not shrink_to_mem:
-        if epc_gib < 3.65:
+        if epc_gib < 4.92:
             print(f"""
-*** Available EPC appears to be {epc_gib:.2f} GiB; 3.65 GiB is
+*** Available EPC appears to be {epc_gib:.2f} GiB; 4.92 GiB is
 *** needed to run the full set of experiments.
 """)
         if free_gib < 20:
@@ -64,12 +64,15 @@ if epc_gib < 3.65 or free_gib < 20:
 """)
         sys.exit(1)
     # Typical EPC sizes are slightly less than a power of 2.
-    if epc_gib > 1.9 and free_gib > 14:
+    if epc_gib > 3.97 and free_gib > 14:
+        N_MAX = 1<<19
+        M_MAX = 72
+    if epc_gib > 1.97 and free_gib > 14:
         N_MAX = 1<<19
-        M_MAX = 64
-    elif epc_gib > 0.9 and free_gib > 7.5:
-        N_MAX = 1<<18
         M_MAX = 36
+    elif epc_gib > 0.98 and free_gib > 7.5:
+        N_MAX = 1<<18
+        M_MAX = 24
     elif epc_gib > 0.9 and free_gib > 4.2:
         N_MAX = 1<<17
         M_MAX = 48