diff --git a/constants.py b/constants.py index efad4d771f36727e7691b0d585401de8d7eb1461..8e5849197d85ae588cf0288abc8c90da7ba2f978 100644 --- a/constants.py +++ b/constants.py @@ -1,7 +1,7 @@ # This program and the accompanying materials are made available under the # terms of the MIT license (X11 license) which accompanies this distribution. -# Author: R. Schöne +# Author: R. Schoene class Bin(object): def __init__(self, racr_bin, mquat_bin): self.racr_bin = racr_bin diff --git a/fabfile.py b/fabfile.py index 519a086d56557076bf3f8b991fefa74c37dd0b1b..f146150834ea6e1bfb73ff203b8ad89fb9ebe8db 100644 --- a/fabfile.py +++ b/fabfile.py @@ -1,7 +1,7 @@ # This program and the accompanying materials are made available under the # terms of the MIT license (X11 license) which accompanies this distribution. -# Author: R. Schöne +# Author: R. Schoene import utils import ilp_test as test import ilp_measurement as measure diff --git a/fabric_workaround.py b/fabric_workaround.py index 492f827fcb117d1018ad76dce80f6bbc4f99205d..ba24973c32a4342b0abfe5f9f33e36d11078ce8d 100644 --- a/fabric_workaround.py +++ b/fabric_workaround.py @@ -1,7 +1,7 @@ # This program and the accompanying materials are made available under the # terms of the MIT license (X11 license) which accompanies this distribution. -# Author: R. Schöne +# Author: R. Schoene import os, subprocess env = { 'local_wd' : None } diff --git a/ilp_check.py b/ilp_check.py index 554084233768c35bf12a25d1aa6c2b164d9f6507..45bb489a9d0b0bd86359bce15b62ffe1f8b239cc 100644 --- a/ilp_check.py +++ b/ilp_check.py @@ -2,7 +2,7 @@ # This program and the accompanying materials are made available under the # terms of the MIT license (X11 license) which accompanies this distribution. -# Author: R. Schöne +# Author: R. Schoene import json, codecs try: diff --git a/ilp_measurement.py b/ilp_measurement.py index fdd1624938c70a90e4d589598b1d63bfe70aa040..cea63bd7babf3ed7f21d9bcae48a42942a39521b 100644 --- a/ilp_measurement.py +++ b/ilp_measurement.py @@ -3,7 +3,7 @@ # This program and the accompanying materials are made available under the # terms of the MIT license (X11 license) which accompanies this distribution. -# Author: R. Schöne +# Author: R. Schoene import sys, re, os, csv, timeit, shutil, json, threading, time from datetime import datetime @@ -575,12 +575,18 @@ def incoporate_remote_measurements(archive, dryrun = False): utils.merge_csv(os.path.join('profiling', d, name), f, dryrun = dryrun) sys.stdout.write('\n') +first_file = True @task def avg(column, *files): """ Caclulate the average of the given column for all given files. """ def get_average_value(f): + global first_file with open(f) as fd: r = csv.reader(fd) + first_row = next(r) + if first_file: + print first_row[int(column)] + first_file = False values = [float(row[int(column)]) for row in r if not row[0].isalpha()] return sum(values) * 1.0 / len(values) print { f : get_average_value(f) for f in files } diff --git a/ilp_test.py b/ilp_test.py index 10496da20bf3eceff89d8e4847625d1b2d867cfa..049b18bca7b02261f5a19ed6595dbb7763fad39c 100644 --- a/ilp_test.py +++ b/ilp_test.py @@ -3,7 +3,7 @@ # This program and the accompanying materials are made available under the # terms of the MIT license (X11 license) which accompanies this distribution. -# Author: R. Schöne +# Author: R. Schoene import re, threading, os, shutil, sys, timeit try: diff --git a/install.py b/install.py index b9aaab485659fe01d9183b6917f96f27ff1e75c8..fbce5f434d06bc5135ffb4bd673e3f9db072e856 100644 --- a/install.py +++ b/install.py @@ -1,7 +1,7 @@ # This program and the accompanying materials are made available under the # terms of the MIT license (X11 license) which accompanies this distribution. -# Author: R. Schöne +# Author: R. Schoene import os, shutil, sys try: from fabric.api import lcd, task diff --git a/properties.py b/properties.py index 76f3b6f401ce362b1852d54aa9148a64bf7b7efb..8b42e349d2c5ee552e5c26643ce794122e652d7e 100644 --- a/properties.py +++ b/properties.py @@ -1,7 +1,7 @@ # This program and the accompanying materials are made available under the # terms of the MIT license (X11 license) which accompanies this distribution. -# Author: R. Schöne +# Author: R. Schoene from utils import local_quiet properties_fname = 'scheme.properties' diff --git a/sockets.py b/sockets.py index 5bec3fddaf8faaeb2504f88cd35293f2dd71bf85..60a1de71ab809dfc819e8020e1b2cb05a4a1af50 100644 --- a/sockets.py +++ b/sockets.py @@ -1,7 +1,7 @@ # This program and the accompanying materials are made available under the # terms of the MIT license (X11 license) which accompanies this distribution. -# Author: R. Schöne +# Author: R. Schoene from fabric.api import task, local @task diff --git a/utils.py b/utils.py index c024a3116ac20f3512d60415aa0db3df193d1a3f..e3f61f261b3bde21a8f72c21d66eddd4285be83e 100644 --- a/utils.py +++ b/utils.py @@ -1,7 +1,7 @@ # This program and the accompanying materials are made available under the # terms of the MIT license (X11 license) which accompanies this distribution. -# Author: R. Schöne +# Author: R. Schoene import sys, os, csv, shutil, json try: from fabric.api import local, quiet, task, env