make results/ a package and unify typecheck targets

experiments/rules.mk

@@ -27,16 +27,10 @@ lint-python:
 		--ignore-paths experiments/simbricks/utils/graphlib.py \
 	  	experiments/ results/
 
-typecheck-python: typecheck-experiments typecheck-results
-
-typecheck-experiments:
+typecheck-python:
 	pytype -j 0 --keep-going \
 		--exclude experiments/pyexps/ae/ \
 			experiments/simbricks/utils/graphlib.py \
-		-- experiments/
-
-
-typecheck-results:
-	pytype -j 0 --keep-going results/
+		-- experiments/ results/
 
 include mk/subdir_post.mk

results/__init__.py

+# Copyright 2022 Max Planck Institute for Software Systems, and
+# National University of Singapore
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

results/dctcp.py

@@ -23,7 +23,7 @@
 import itertools
 import sys
 
-import utils.iperf
+from results.utils.iperf import parse_iperf
 
 if len(sys.argv) != 2:
     print('Usage: dctcp.py OUTDIR')
@@ -44,7 +44,7 @@ for k_val in range(0, max_k + 1, k_step):
     line = [str(k_val)]
     for h, mtu in configs:
         path_pat = f'{basedir}{h}-ib-dumbbell-DCTCPm{k_val}-{mtu}'
-        res = utils.iperf.parse_iperf(path_pat)
+        res = parse_iperf(path_pat)
 
         if res['avg'] is None:
             line.append('')

results/netperf.py

@@ -23,7 +23,7 @@
 import sys
 from time import gmtime, strftime
 
-from utils.netperf import parse_netperf_run
+from results.utils.netperf import parse_netperf_run
 
 
 def fmt_lat(lat):

results/nopaxos.py

@@ -22,7 +22,7 @@
 
 import sys
 
-import utils.parse_nopaxos
+from results.utils.parse_nopaxos import parse_nopaxos_run
 
 if len(sys.argv) != 2:
     print('Usage: nopaxos.py OUTDIR')
@@ -43,7 +43,7 @@ for num_c in num_clients:
     for seq in types_of_seq:
 
         path_pat = f'{basedir}nopaxos-gt-ib-{seq}-{num_c}-1.json'
-        res = utils.parse_nopaxos.parse_nopaxos_run(num_c, path_pat)
+        res = parse_nopaxos_run(num_c, path_pat)
         #print(path_pat)
 
         if ((res['throughput'] is None) or (res['latency'] is None)):

results/pcilat.py

@@ -22,7 +22,7 @@
 
 import sys
 
-import utils.iperf
+from results.utils.iperf import parse_iperf
 
 if len(sys.argv) != 2:
     print('Usage: pcilat.py OUTDIR')
@@ -45,7 +45,7 @@ for (ht, nt, lab) in configs:
     cols = [str(lab)]
     for lat in lats:
         path_pat = f'{basedir}pcilat-{ht}-{nt}-switch-{lat}'
-        res = utils.iperf.parse_iperf(path_pat)
+        res = parse_iperf(path_pat)
 
         if res['avg'] is None:
             cols.append('')