Skip to content

Commit

Permalink
Deploying to gh-pages from @ 12d1293 🚀
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremykubica committed Oct 9, 2024
1 parent 1c9b080 commit 1e01714
Show file tree
Hide file tree
Showing 31 changed files with 107 additions and 104 deletions.
28 changes: 14 additions & 14 deletions asv.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
$(document).ready(function() {
/* GLOBAL STATE */
/* The index.json content as returned from the server */
var master_timestamp = '';
var master_json = {};
var main_timestamp = '';
var main_json = {};
/* Extra pages: {name: show_function} */
var loaded_pages = {};
/* Previous window scroll positions */
Expand Down Expand Up @@ -284,7 +284,7 @@ $(document).ready(function() {
}
else {
$.ajax({
url: url + '?timestamp=' + $.asv.master_timestamp,
url: url + '?timestamp=' + $.asv.main_timestamp,
dataType: "json",
cache: true
}).done(function(data) {
Expand Down Expand Up @@ -417,17 +417,17 @@ $(document).ready(function() {
}

function get_commit_hash(revision) {
var commit_hash = master_json.revision_to_hash[revision];
var commit_hash = main_json.revision_to_hash[revision];
if (commit_hash) {
// Return printable commit hash
commit_hash = commit_hash.slice(0, master_json.hash_length);
commit_hash = commit_hash.slice(0, main_json.hash_length);
}
return commit_hash;
}

function get_revision(commit_hash) {
var rev = null;
$.each(master_json.revision_to_hash, function(revision, full_commit_hash) {
$.each(main_json.revision_to_hash, function(revision, full_commit_hash) {
if (full_commit_hash.startsWith(commit_hash)) {
rev = revision;
// break the $.each loop
Expand All @@ -438,15 +438,15 @@ $(document).ready(function() {
}

function init_index() {
/* Fetch the master index.json and then set up the page elements
/* Fetch the main index.json and then set up the page elements
based on it. */
$.ajax({
url: "index.json" + '?timestamp=' + $.asv.master_timestamp,
url: "index.json" + '?timestamp=' + $.asv.main_timestamp,
dataType: "json",
cache: true
}).done(function (index) {
master_json = index;
$.asv.master_json = index;
main_json = index;
$.asv.main_json = index;

/* Page title */
var project_name = $("#project-name")[0];
Expand Down Expand Up @@ -475,8 +475,8 @@ $(document).ready(function() {
dataType: "json",
cache: false
}).done(function (info) {
master_timestamp = info['timestamp'];
$.asv.master_timestamp = master_timestamp;
main_timestamp = info['timestamp'];
$.asv.main_timestamp = main_timestamp;
init_index();
}).fail(function () {
$.asv.ui.network_error();
Expand All @@ -503,8 +503,8 @@ $(document).ready(function() {
this.get_commit_hash = get_commit_hash;
this.get_revision = get_revision;

this.master_timestamp = master_timestamp; /* Updated after info.json loads */
this.master_json = master_json; /* Updated after index.json loads */
this.main_timestamp = main_timestamp; /* Updated after info.json loads */
this.main_json = main_json; /* Updated after index.json loads */

this.format_date_yyyymmdd = format_date_yyyymmdd;
this.format_date_yyyymmdd_hhmm = format_date_yyyymmdd_hhmm;
Expand Down
2 changes: 1 addition & 1 deletion asv_ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ $(document).ready(function() {
$.asv.load_graph_data(
graph_url
).done(function (data) {
var params = $.asv.master_json.benchmarks[benchmark_basename].params;
var params = $.asv.main_json.benchmarks[benchmark_basename].params;
data = $.asv.filter_graph_data_idx(data, 0, parameter_idx, params);
var options = {
colors: ['#000'],
Expand Down
48 changes: 24 additions & 24 deletions graphdisplay.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ $(document).ready(function() {

function get_x_from_revision(rev) {
if (date_scale) {
return $.asv.master_json.revision_to_date[rev];
return $.asv.main_json.revision_to_date[rev];
} else {
return rev;
}
Expand Down Expand Up @@ -150,12 +150,12 @@ $(document).ready(function() {
var stack = [tree];

/* Sort keys for tree construction */
var benchmark_keys = Object.keys($.asv.master_json.benchmarks);
var benchmark_keys = Object.keys($.asv.main_json.benchmarks);
benchmark_keys.sort();

/* Build tree */
$.each(benchmark_keys, function(i, bm_name) {
var bm = $.asv.master_json.benchmarks[bm_name];
var bm = $.asv.main_json.benchmarks[bm_name];
var parts = bm_name.split('.');
var i = 0;
var j;
Expand Down Expand Up @@ -299,7 +299,7 @@ $(document).ready(function() {
var y = item.datapoint[1];
var commit_hash = get_commit_hash(item.datapoint[0]);
if (commit_hash) {
var unit = $.asv.master_json.benchmarks[current_benchmark].unit;
var unit = $.asv.main_json.benchmarks[current_benchmark].unit;
showTooltip(
item.pageX, item.pageY,
$.asv.pretty_unit(y, unit) + " @ " + commit_hash);
Expand Down Expand Up @@ -328,7 +328,7 @@ $(document).ready(function() {
if (previous_hash !== commit_hash) {
previous_hash = commit_hash;
window.open(
$.asv.master_json.show_commit_url + previous_hash,
$.asv.main_json.show_commit_url + previous_hash,
'_blank');
}
}
Expand All @@ -348,7 +348,7 @@ $(document).ready(function() {
/*
Generic parameter selections
*/
var index = $.asv.master_json;
var index = $.asv.main_json;
if (!state || state_selection !== null) {
/*
Setup the default configuration on first load,
Expand Down Expand Up @@ -428,7 +428,7 @@ $(document).ready(function() {

function update_state_url(params) {
var info = $.asv.parse_hash_string(window.location.hash);
$.each($.asv.master_json.params, function(param, values) {
$.each($.asv.main_json.params, function(param, values) {
if (values.length > 1) {
if (state[param].length != values.length || param == 'branch') {
info.params[param] = state[param];
Expand All @@ -445,7 +445,7 @@ $(document).ready(function() {
}

function replace_params_ui() {
var index = $.asv.master_json;
var index = $.asv.main_json;

var nav = $('#graphdisplay-state-params');
nav.empty();
Expand Down Expand Up @@ -521,8 +521,8 @@ $(document).ready(function() {
}

function replace_benchmark_params_ui() {
var params = $.asv.master_json.benchmarks[current_benchmark].params;
var param_names = $.asv.master_json.benchmarks[current_benchmark].param_names;
var params = $.asv.main_json.benchmarks[current_benchmark].params;
var param_names = $.asv.main_json.benchmarks[current_benchmark].param_names;

/* Parameter selection UI */
var nav = $('#graphdisplay-navigation-params');
Expand Down Expand Up @@ -574,7 +574,7 @@ $(document).ready(function() {
if (rev === null) {
button.text("last");
} else {
var date_fmt = new Date($.asv.master_json.revision_to_date[rev]);
var date_fmt = new Date($.asv.main_json.revision_to_date[rev]);
button.text($.asv.get_commit_hash(rev)
+ " "
+ date_fmt.toUTCString());
Expand Down Expand Up @@ -659,7 +659,7 @@ $(document).ready(function() {
return;
}

var params = $.asv.master_json.benchmarks[current_benchmark].params;
var params = $.asv.main_json.benchmarks[current_benchmark].params;
x_coordinate_is_category = false;
if (x_coordinate_axis != 0) {
for (var j = 0; j < params[x_coordinate_axis-1].length; ++j) {
Expand Down Expand Up @@ -754,7 +754,7 @@ $(document).ready(function() {
if (current_benchmark) {
/* For the current set of enabled parameters, generate a
list of all the permutations we need to load. */
var state_permutations = $.grep($.asv.master_json.graph_param_list, function (params) {
var state_permutations = $.grep($.asv.main_json.graph_param_list, function (params) {
var ok = true;
$.each(state, function (key, values) {
if ($.inArray(params[key], values) == -1) {
Expand All @@ -767,14 +767,14 @@ $(document).ready(function() {
/* Find where the parameters are different. */
var different = find_different_properties(state_permutations);
/* For parameterized tests: names of benchmark parameters */
var params = $.asv.master_json.benchmarks[current_benchmark].params;
var param_names = $.asv.master_json.benchmarks[current_benchmark].param_names;
var params = $.asv.main_json.benchmarks[current_benchmark].params;
var param_names = $.asv.main_json.benchmarks[current_benchmark].param_names;
/* Selected permutations of benchmark parameters, omitting x-axis */
var selection = obj_copy(param_selection);
selection[x_coordinate_axis] = [null]; /* value not referenced, set to null */
var param_permutations = permutations(selection);

/* Generate a master list of URLs and legend labels for
/* Generate a main list of URLs and legend labels for
the graphs. */
var all = [];
$.each(state_permutations, function (i, perm) {
Expand Down Expand Up @@ -852,7 +852,7 @@ $(document).ready(function() {
series = $.asv.filter_graph_data(data,
x_coordinate_axis,
graph_content[0],
$.asv.master_json.benchmarks[current_benchmark].params);
$.asv.main_json.benchmarks[current_benchmark].params);
orig_graphs.push({
data: series,
label: graph_content[1],
Expand Down Expand Up @@ -980,11 +980,11 @@ $(document).ready(function() {
options.yaxis.max = Math.pow(10, max) * reference;

if (!reference_scale) {
options.yaxis.axisLabel = $.asv.master_json.benchmarks[current_benchmark].unit;
options.yaxis.axisLabel = $.asv.main_json.benchmarks[current_benchmark].unit;
}
}
else {
var unit = $.asv.master_json.benchmarks[current_benchmark].unit;
var unit = $.asv.main_json.benchmarks[current_benchmark].unit;
var unit_list = null;

if (unit == "seconds") {
Expand Down Expand Up @@ -1080,7 +1080,7 @@ $(document).ready(function() {
date_to_revision = {};
$.each(graphs, function(i, graph) {
$.each(graph.data, function(j, point) {
var date = $.asv.master_json.revision_to_date[point[0]];
var date = $.asv.main_json.revision_to_date[point[0]];
date_to_revision[date] = point[0];
point[0] = date;
});
Expand Down Expand Up @@ -1110,7 +1110,7 @@ $(document).ready(function() {
else {
graphs = orig_graphs;
}
var param_names = $.asv.master_json.benchmarks[current_benchmark].param_names;
var param_names = $.asv.main_json.benchmarks[current_benchmark].param_names;
options.xaxis.axisLabel = param_names[x_coordinate_axis-1];
}
}
Expand All @@ -1125,7 +1125,7 @@ $(document).ready(function() {
var markings = [];

if (x_coordinate_axis == 0) {
$.each($.asv.master_json.tags, function(tag, revision) {
$.each($.asv.main_json.tags, function(tag, revision) {
var x = get_x_from_revision(revision);
markings.push(
{ color: "#ddd", lineWidth: 1, xaxis: { from: x, to: x } }
Expand Down Expand Up @@ -1157,7 +1157,7 @@ $(document).ready(function() {
if (reference_scale) {
unit = 'relative';
} else {
unit = $.asv.master_json.benchmarks[current_benchmark].unit;
unit = $.asv.main_json.benchmarks[current_benchmark].unit;
}

var options = {
Expand Down Expand Up @@ -1342,7 +1342,7 @@ $(document).ready(function() {
var canvas = plot.getCanvas();
var xmin = plot.getAxes().xaxis.min;
var xmax = plot.getAxes().xaxis.max;
$.each($.asv.master_json.tags, function(tag, revision) {
$.each($.asv.main_json.tags, function(tag, revision) {
var x = get_x_from_revision(revision);
if (x >= xmin && x <= xmax) {
var p = plot.pointOffset({x: x, y: 0});
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[10, 217489408.0], [16, 216461312.0], [18, 215425024.0], [20, 201510912.0], [21, 215633920.0], [22, 215433216.0], [28, 216764416.0], [33, 209735680.0], [39, 213835776.0], [40, 217817088.0], [50, 205885440.0], [53, 215711744.0], [55, 218824704.0], [56, 208506880.0], [61, 206045184.0], [63, 220311552.0], [64, 213782528.0], [67, 217948160.0], [69, 216715264.0], [78, 262762496.0], [80, 255270912.0], [86, 256143360.0], [87, 257470464.0], [90, 256495616.0], [92, 258957312.0], [93, 255053824.0], [97, 254844928.0], [103, 255295488.0], [104, 257495040.0], [107, 255602688.0], [112, 255152128.0], [114, 259629056.0], [115, 255447040.0], [120, 261545984.0], [125, 258088960.0], [126, 255033344.0], [127, 256802816.0], [129, 257646592.0], [131, 259362816.0], [139, 255172608.0], [141, 257425408.0], [142, 254414848.0], [143, 255295488.0], [145, 258670592.0], [149, 254779392.0], [154, 257490944.0], [155, 256917504.0], [158, 257396736.0], [162, 257310720.0], [165, 255610880.0], [170, 257159168.0], [171, 254783488.0], [173, 259854336.0], [177, 257310720.0], [181, 255160320.0], [184, 255389696.0], [188, 258351104.0], [193, 259731456.0], [197, 260493312.0], [198, 262598656.0], [204, 259637248.0], [207, 261976064.0], [208, 260403200.0], [212, 262602752.0], [218, 264646656.0], [221, 260009984.0], [223, 262307840.0], [226, 255684608.0]]
[[10, 217489408.0], [16, 216461312.0], [18, 215425024.0], [20, 201510912.0], [21, 215633920.0], [22, 215433216.0], [28, 216764416.0], [33, 209735680.0], [39, 213835776.0], [40, 217817088.0], [50, 205885440.0], [53, 215711744.0], [55, 218824704.0], [56, 208506880.0], [61, 206045184.0], [63, 220311552.0], [64, 213782528.0], [67, 217948160.0], [69, 216715264.0], [78, 262762496.0], [80, 255270912.0], [86, 256143360.0], [87, 257470464.0], [90, 256495616.0], [92, 258957312.0], [93, 255053824.0], [97, 254844928.0], [103, 255295488.0], [104, 257495040.0], [107, 255602688.0], [112, 255152128.0], [114, 259629056.0], [115, 255447040.0], [120, 261545984.0], [125, 258088960.0], [126, 255033344.0], [127, 256802816.0], [129, 257646592.0], [131, 259362816.0], [139, 255172608.0], [141, 257425408.0], [142, 254414848.0], [143, 255295488.0], [145, 258670592.0], [149, 254779392.0], [154, 257490944.0], [155, 256917504.0], [158, 257396736.0], [162, 257310720.0], [165, 255610880.0], [170, 257159168.0], [171, 254783488.0], [173, 259854336.0], [177, 257310720.0], [181, 255160320.0], [184, 255389696.0], [188, 258351104.0], [193, 259731456.0], [197, 260493312.0], [198, 262598656.0], [204, 259637248.0], [207, 261976064.0], [208, 260403200.0], [212, 262602752.0], [218, 264646656.0], [221, 260009984.0], [223, 262307840.0], [225, 255684608.0], [229, 255455232.0], [231, 255430656.0], [234, 257683456.0]]
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[10, 0.0058233531666852896], [16, 0.006752349833315444], [18, 0.006732995499987737], [20, 0.006092584500000461], [21, 0.007151801499996206], [22, 0.006726330666651847], [28, 0.0072823881666674115], [33, 0.0065567314999839255], [39, 0.005890044833355053], [40, 0.0062841859999878125], [50, 0.005939881666677138], [53, 0.006260144666669021], [55, 0.007565512249982476], [56, 0.005832501999994596], [61, 0.006306313333330611], [63, 0.008006480666675012], [64, 0.005488724333332584], [67, 0.006054079999993671], [69, 0.006773052500003965], [78, 0.035905586500021514], [80, 0.031237577500007774], [86, 0.0321762030000059], [87, 0.035553195000005644], [90, 0.034723282499996344], [92, 0.03398099700000046], [93, 0.029935248499995737], [97, 0.03160073150000642], [103, 0.028064383000000248], [104, 0.03320319050000364], [107, 0.03289068299999087], [112, 0.03253270349999582], [114, 0.03383914200000504], [115, 0.03426729050001143], [120, 0.03773862250000093], [125, 0.029659968000004255], [126, 0.0314913825000076], [127, 0.03311112250000292], [129, 0.03132028299999945], [131, 0.03346203649998358], [139, 0.03232568650000189], [141, 0.03351551000000086], [142, 0.0347199880000062], [143, 0.03202265399998794], [145, 0.03441520399999831], [149, 0.031664949499997874], [154, 0.030360146999996118], [155, 0.03446843199999705], [158, 0.03142116349999924], [162, 0.030983153500017124], [165, 0.03298890099999596], [170, 0.031581149000004416], [171, 0.030528305999993677], [173, 0.032079268000018146], [177, 0.0343321519999904], [181, 0.03156894800000032], [184, 0.03187668850000591], [188, 0.032524332500003084], [193, 0.03365758749998804], [197, 0.032160973499998136], [198, 0.032859234000000015], [204, 0.029992352000007827], [207, 0.035817690000016], [208, 0.02989658149999741], [212, 0.032999941499994634], [218, 0.03240084899999829], [221, 0.03470207049998919], [223, 0.0350191145000025], [226, 0.029889100000005442]]
[[10, 0.0058233531666852896], [16, 0.006752349833315444], [18, 0.006732995499987737], [20, 0.006092584500000461], [21, 0.007151801499996206], [22, 0.006726330666651847], [28, 0.0072823881666674115], [33, 0.0065567314999839255], [39, 0.005890044833355053], [40, 0.0062841859999878125], [50, 0.005939881666677138], [53, 0.006260144666669021], [55, 0.007565512249982476], [56, 0.005832501999994596], [61, 0.006306313333330611], [63, 0.008006480666675012], [64, 0.005488724333332584], [67, 0.006054079999993671], [69, 0.006773052500003965], [78, 0.035905586500021514], [80, 0.031237577500007774], [86, 0.0321762030000059], [87, 0.035553195000005644], [90, 0.034723282499996344], [92, 0.03398099700000046], [93, 0.029935248499995737], [97, 0.03160073150000642], [103, 0.028064383000000248], [104, 0.03320319050000364], [107, 0.03289068299999087], [112, 0.03253270349999582], [114, 0.03383914200000504], [115, 0.03426729050001143], [120, 0.03773862250000093], [125, 0.029659968000004255], [126, 0.0314913825000076], [127, 0.03311112250000292], [129, 0.03132028299999945], [131, 0.03346203649998358], [139, 0.03232568650000189], [141, 0.03351551000000086], [142, 0.0347199880000062], [143, 0.03202265399998794], [145, 0.03441520399999831], [149, 0.031664949499997874], [154, 0.030360146999996118], [155, 0.03446843199999705], [158, 0.03142116349999924], [162, 0.030983153500017124], [165, 0.03298890099999596], [170, 0.031581149000004416], [171, 0.030528305999993677], [173, 0.032079268000018146], [177, 0.0343321519999904], [181, 0.03156894800000032], [184, 0.03187668850000591], [188, 0.032524332500003084], [193, 0.03365758749998804], [197, 0.032160973499998136], [198, 0.032859234000000015], [204, 0.029992352000007827], [207, 0.035817690000016], [208, 0.02989658149999741], [212, 0.032999941499994634], [218, 0.03240084899999829], [221, 0.03470207049998919], [223, 0.0350191145000025], [225, 0.029889100000005442], [229, 0.031199788500003933], [231, 0.03024726399999622], [234, 0.029167470499999126]]
Loading

0 comments on commit 1e01714

Please sign in to comment.