Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added median #19

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

added median #19

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7489770
added median
PirosB3 Jul 4, 2014
670d613
added median color
PirosB3 Jul 4, 2014
bcbd53a
inversed order
PirosB3 Jul 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions djangobench/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
def run_benchmarks(control, experiment, benchmark_dir, benchmarks, trials,
vcs=None, record_dir=None, profile_dir=None,
continue_on_error=False, control_python=sys.executable,
experiment_python=sys.executable):
experiment_python=sys.executable, show_median=False):
if benchmarks:
print("Running benchmarks: %s" % " ".join(benchmarks))
else:
Expand Down Expand Up @@ -104,7 +104,7 @@ def run_benchmarks(control, experiment, benchmark_dir, benchmarks, trials,
control_data=control_data,
experiment_data=experiment_data,
)
print(format_benchmark_result(result, len(control_data.runtimes)))
print(format_benchmark_result(result, len(control_data.runtimes), control_data.runtimes, experiment_data.runtimes, show_median))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is getting pretty long - perhaps it'd be best to break it on the new trailing comma so it'd be easier to scan – maybe like this?

print(format_benchmark_result(result, len(control_data.runtimes),
                              control_data.runtimes, …

print('')


Expand All @@ -114,6 +114,13 @@ def discover_benchmarks(benchmark_dir):
os.path.exists(os.path.join(benchmark_dir, app, 'settings.py')):
yield app

def get_median(runs):
sorted_runs = sorted(runs)
middle = len(runs) / 2
if len(runs) % 2 == 0:
return sum(sorted_runs[middle-1:middle+1])/2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I generally find this a little easier to read with spaces around the operators

else:
return sorted_runs[middle]

def print_benchmarks(benchmark_dir):
for app in discover_benchmarks(benchmark_dir):
Expand Down Expand Up @@ -209,8 +216,7 @@ def insignificant(cls, text):
def bad(cls, text):
return cls.colorize(cls.BAD, text)


def format_benchmark_result(result, num_points):
def format_benchmark_result(result, num_points, control_data, experiment_data, show_median):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering whether show_median should be a keyword argument here as well - that list is getting a bit long but it's not too bad.

if isinstance(result, perf.BenchmarkResult):
output = ''
delta_min = result.delta_min
Expand All @@ -227,6 +233,15 @@ def format_benchmark_result(result, num_points):
delta_avg = colorize.bad(delta_avg)
output += "Avg: %f -> %f: %s\n" % (result.avg_base, result.avg_changed, delta_avg)

if show_median:
median = get_median(control_data) - get_median(experiment_data)
median_text = "%0.10f" % median
if median > .0:
median_body = colorize.good(median_text)
else:
median_body = colorize.bad(median_text)
output += "Median: %s\n" % median_body

t_msg = result.t_msg
if 'Not significant' in t_msg:
t_msg = colorize.insignificant(t_msg)
Expand Down Expand Up @@ -366,6 +381,14 @@ def main():
action='store_true',
help='List all available benchmarks and exit.',
)
parser.add_argument(
'-m',
'--median',
dest='show_median',
default=False,
action='store_true',
help='Show median in resulting benchmarks',
)
parser.add_argument(
'--log',
dest='loglevel',
Expand Down Expand Up @@ -395,6 +418,7 @@ def main():
continue_on_error=args.continue_on_error,
control_python=args.control_python,
experiment_python=args.experiment_python,
show_median=args.show_median,
)

if __name__ == '__main__':
Expand Down