Experiments with small numbers of single-core servers (<= 3) for 2^20 clients don't work

because the TCP windows close when the receiver can't decrypt the data
fast enough.  That's not a setting we really care about, though, so just
skip those combinations of settings.

gen_manifest.py

@@ -59,11 +59,6 @@ def generate_manifest(N, M, T, B, PRIVATE_ROUTE = True, priv_out=1, priv_in=1, p
     numa_limit = 36
     numa_start = numa_base
 
-    # For small numbers of servers, use extra cores to handle
-    # communication (but not computation)
-    if M < 4 and T < 2:
-        T = 2
-
     for s in range(1, M+1):
         numa_end = numa_start + T -1
         if(numa_start <= numa_limit and numa_end > numa_limit):

run_all_experiments.py

@@ -32,7 +32,7 @@ run_exp(LOG_FOLDER, PRIVATE_ROUTE, NUM_EPOCHS, N, M, T, B, PRIV_OUT, PRIV_IN, PU
 ## Figure 8 Public
 PRIVATE_ROUTE = False
 N = [1<<20]
-M = [72, 64, 48, 36, 32, 24, 16, 8, 6, 4, 3, 2, 1]
+M = [72, 64, 48, 36, 32, 24, 16, 8, 6, 4]
 T = [1]
 
 run_exp(LOG_FOLDER, PRIVATE_ROUTE, NUM_EPOCHS, N, M, T, B, PRIV_OUT, PRIV_IN, PUB_OUT, PUB_IN)
@@ -48,7 +48,7 @@ run_exp(LOG_FOLDER, PRIVATE_ROUTE, NUM_EPOCHS, N, M, T, B, PRIV_OUT, PRIV_IN, PU
 ## Figure 8 Private
 PRIVATE_ROUTE = True
 N = [1<<20]
-M = [72, 64, 48, 36, 32, 24, 16, 8, 6, 4, 3, 2, 1]
+M = [72, 64, 48, 36, 32, 24, 16, 8, 6, 4]
 T = [1]
 
 run_exp(LOG_FOLDER, PRIVATE_ROUTE, NUM_EPOCHS, N, M, T, B, PRIV_OUT, PRIV_IN, PUB_OUT, PUB_IN)