Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Use the proper key for CPython data

Update default baseline
Increase width of second graph
  • Loading branch information...
commit 224babeaf27a9a0cbb6599d1adf2fb1f468b490a 1 parent eaea00d
@tobami authored
View
4 codespeed/views.py
@@ -935,6 +935,7 @@ def get_home_data(request):
cp_exe = Executable.objects.get(name="cpython")
cp_lastrev = Revision.objects.filter(
branch__project=cp_exe.project).order_by('-date')[0]
+ data['baseline'] = 'CPython ' + cp_lastrev.tag
cp_results = Result.objects.filter(
executable=cp_exe, revision=cp_lastrev, environment=env)
@@ -969,8 +970,7 @@ def get_home_data(request):
if res == 0:
continue
benchmarks.append(res.benchmark.name)
- key = 'CPython ' + cp_lastrev.tag
- data['results'][res.benchmark.name] = {key: res.value}
+ data['results'][res.benchmark.name] = {data['baseline']: res.value}
for rev_name in pp_results:
val = 0
for pp_res in pp_results[rev_name]:
View
2  example/settings.py
@@ -124,7 +124,7 @@ def process_exception(self, request, exception):
#DEF_ENVIRONMENT = None #Name of the environment which should be selected as default
-DEF_BASELINE = {'executable': 'cpython', 'revision': '100'} # Which executable + revision should be default as a baseline
+DEF_BASELINE = {'executable': 'cpython', 'revision': '101'} # Which executable + revision should be default as a baseline
# Given as the name of the executable and commitid of the revision
# Example: defaultbaseline = {'executable': 'myexe', 'revision': '21'}
View
12 example/templates/home.html
@@ -38,7 +38,7 @@
add_to_tagged_data = false;
}
if (add_to_tagged_data === false) { break; }
- relative_value = data['results'][benchname][rev]/data['results'][benchname]['CPython 2.6.2'];
+ relative_value = data['results'][benchname][rev]/data['results'][benchname][data['baseline']];
tagged_data[i].push(relative_value)
}
// Only add benchmark if there are no 0 values
@@ -46,7 +46,7 @@
// First add benchmark
benchmarks.push(benchname);
// Add PyPy trunk and CPython's 1.0 value
- relative_value = data['results'][benchname]['PyPy trunk']/data['results'][benchname]['CPython 2.6.2'];
+ relative_value = data['results'][benchname]['PyPy trunk']/data['results'][benchname][data['baseline']];
plotdata[0].push(relative_value);
plotdata[1].push(1.0);
labels.push(relative_value.toFixed(2));
@@ -73,7 +73,7 @@
pointLabels:{labels:labels}
},
{
- label: 'CPython',
+ label: data['baseline'],
pointLabels:{show:false}
}
],
@@ -84,7 +84,7 @@
tickOptions: {angle: -40}
},
yaxis:{
- ticks: [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5],
+ ticks: [0, 0.25, 0.5, 0.75, 1, 1.25],
tickOptions:{formatString:'%.2f'}
}
}
@@ -104,7 +104,7 @@
geomeans.push(tempgeo);
}
geomeans.push(trunk_geomean);
- var ticks = ['CPython 2.6.2'];
+ var ticks = [data['baseline']];
for (var i in data['tagged_revs']) {
ticks.push(data['tagged_revs'][i]);
}
@@ -195,7 +195,7 @@
<p>It depends greatly on the type of task being performed. The geometric average of all benchmarks is <span id="geomean"></span> or <strong id="geofaster"></strong> times <em>faster</em> than CPython</p>
<h3>How has PyPy performance evolved over time?</h3>
- <div id="cpythonplot2" style="width:500px;height:400px;margin: 0 auto;"></div>
+ <div id="cpythonplot2" style="width:600px;height:400px;margin: 0 auto;"></div>
<p style="font-size:smaller;">Plot 2: Geometric averages of normalized times, out of <span id="num_of_benchs"></span> benchmarks. Smaller is better. "times faster" inside parenthesis</p>
</div>
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.