Skip to content

Commit 9eb099c

Browse files
yifanmaiyifanmai
authored
Merge pull request stanford-crfm#1152 from stanford-crfm/yifanmai/77-url-root
Switch root URL of benchmark_output JSON files
2 parents c945233 + 6261f1b commit 9eb099c

File tree

4 files changed

+74
-28
lines changed

4 files changed

+74
-28
lines changed

‎src/benchmark/static/benchmarking.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ $(function () {
320320
function renderGroupHeader(scenario) {
321321
const $output = $('<div>');
322322
if (urlParams.group) {
323-
$.getJSON(`benchmark_output/runs/${suite}/groups_metadata.json`, {}, (response) => {
323+
$.getJSON(groupsMetadataJsonUrl(suite), {}, (response) => {
324324
const group = response[urlParams.group];
325325
if (group) {
326326
let groupName = group.display_name;
@@ -622,19 +622,19 @@ $(function () {
622622

623623
// Paths (parallel arrays corresponding to `runSpecs`)
624624
const statsPaths = runSpecs.map((runSpec) => {
625-
return `benchmark_output/runs/${suite}/${runSpec.name}/stats.json`;
625+
return statsJsonUrl(suite, runSpec.name);
626626
});
627627
const perInstanceStatsPaths = runSpecs.map((runSpec) => {
628-
return `benchmark_output/runs/${suite}/${runSpec.name}/per_instance_stats_slim.json`;
628+
return perInstanceStatsJsonUrl(suite, runSpec.name);
629629
});
630630
const scenarioPaths = runSpecs.map((runSpec) => {
631-
return `benchmark_output/runs/${suite}/${runSpec.name}/scenario.json`;
631+
return scenarioJsonUrl(suite, runSpec.name);
632632
});
633633
const scenarioStatePaths = runSpecs.map((runSpec) => {
634-
return `benchmark_output/runs/${suite}/${runSpec.name}/scenario_state_slim.json`;
634+
return scenarioStateJsonUrl(suite, runSpec.name);
635635
});
636636
const runSpecPaths = runSpecs.map((runSpec) => {
637-
return `benchmark_output/runs/${suite}/${runSpec.name}/run_spec.json`;
637+
return runSpecJsonUrl(suite, runSpec.name);
638638
});
639639

640640
// Figure out short names for the runs based on where they differ
@@ -1047,7 +1047,7 @@ $(function () {
10471047
console.log('schema', raw);
10481048
schema = new Schema(raw);
10491049
}),
1050-
$.get(`benchmark_output/runs/${suite}/summary.json`, {}, (response) => {
1050+
$.get(summaryJsonUrl(suite), {}, (response) => {
10511051
console.log('summary', response);
10521052
summary = response;
10531053
$summary.append(`${summary.suite} (last updated ${summary.date})`);
@@ -1061,7 +1061,7 @@ $(function () {
10611061
} else if (urlParams.runSpec || urlParams.runSpecs || urlParams.runSpecRegex) {
10621062
// Predictions for a set of run specs (matching a regular expression)
10631063
$main.text('Loading runs...');
1064-
$.getJSON(`benchmark_output/runs/${suite}/run_specs.json`, {}, (response) => {
1064+
$.getJSON(runSpecsJsonUrl(suite), {}, (response) => {
10651065
$main.empty();
10661066
const runSpecs = response;
10671067
console.log('runSpecs', runSpecs);
@@ -1091,15 +1091,15 @@ $(function () {
10911091
} else if (urlParams.runs) {
10921092
// All runs (with search)
10931093
$main.text('Loading runs...');
1094-
$.getJSON(`benchmark_output/runs/${suite}/run_specs.json`, {}, (runSpecs) => {
1094+
$.getJSON(runSpecsJsonUrl(suite), {}, (runSpecs) => {
10951095
$main.empty();
10961096
console.log('runSpecs', runSpecs);
10971097
$main.append(renderHeader('Runs', renderRunsOverview(runSpecs)));
10981098
});
10991099
} else if (urlParams.groups) {
11001100
// All groups
11011101
$main.text('Loading groups...');
1102-
const path = `benchmark_output/runs/${suite}/groups.json`;
1102+
const path = groupsJsonUrl(suite);
11031103
$.getJSON(path, {}, (tables) => {
11041104
$main.empty();
11051105
console.log('groups', tables);
@@ -1109,7 +1109,7 @@ $(function () {
11091109
} else if (urlParams.group) {
11101110
// Specific group
11111111
$main.text('Loading group...');
1112-
const path = `benchmark_output/runs/${suite}/groups/${urlParams.group}.json`;
1112+
const path = groupJsonUrl(suite, urlParams.group);
11131113
$.getJSON(path, {}, (tables) => {
11141114
$main.empty();
11151115
console.log('group', tables);

‎src/benchmark/static/index.html

+19-17
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<title>CRFM Benchmarking</title>
5-
<meta charset="utf-8">
6-
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
7-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
8-
<link rel="stylesheet" type="text/css" href="benchmarking.css">
9-
</head>
3+
<head>
4+
<title>CRFM Benchmarking</title>
5+
<meta charset="utf-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
7+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
8+
<link rel="stylesheet" type="text/css" href="benchmarking.css">
9+
</head>
1010

11-
<body>
12-
<div class="container-fluid">
11+
<body>
12+
<div class="container-fluid">
1313
<nav class="navbar navbar-expand-sm navbar-light bg-faded">
1414
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#nav-content" aria-controls="nav-content" aria-expanded="false" aria-label="Toggle navigation">
1515
<span class="navbar-toggler-icon"></span>
@@ -33,16 +33,18 @@
3333
<div class="col-sm-12" id="main">
3434
</div>
3535
</div>
36-
</div>
36+
</div>
3737

38-
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
39-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
40-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
38+
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
39+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
40+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
4141
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.29.0/js/jquery.tablesorter.min.js"></script>
4242
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-yaml/4.1.0/js-yaml.min.js"></script>
4343
<script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/2.0.3/showdown.min.js"></script>
44-
<script src="general.js"></script>
45-
<script src="utils.js"></script>
46-
<script src="benchmarking.js"></script>
47-
</body>
44+
<script src="general.js"></script>
45+
<script src="utils.js"></script>
46+
<script src="json-urls-root.js"></script>
47+
<script src="json-urls.js"></script>
48+
<script src="benchmarking.js"></script>
49+
</body>
4850
</html>

‎src/benchmark/static/json-urls-root.js

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// Base URL for benchmark_output JSON files
2+
const BENCHMARK_OUTPUT_BASE_URL = "benchmark_output";

‎src/benchmark/static/json-urls.js

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
////////////////////////////////////////////////////////////
2+
// Helper functions for getting URLs of JSON files
3+
4+
function summaryJsonUrl(suite) {
5+
return `${BENCHMARK_OUTPUT_BASE_URL}/runs/${suite}/summary.json`;
6+
}
7+
8+
function runSpecsJsonUrl(suite) {
9+
return `${BENCHMARK_OUTPUT_BASE_URL}/runs/${suite}/run_specs.json`;
10+
}
11+
12+
function groupsMetadataJsonUrl(suite) {
13+
return `${BENCHMARK_OUTPUT_BASE_URL}/runs/${suite}/groups_metadata.json`;
14+
}
15+
16+
function groupsJsonUrl(suite) {
17+
return `${BENCHMARK_OUTPUT_BASE_URL}/runs/${suite}/groups.json`;
18+
}
19+
20+
function groupJsonUrl(suite, groupName) {
21+
return `${BENCHMARK_OUTPUT_BASE_URL}/runs/${suite}/groups/${groupName}.json`;
22+
}
23+
24+
function perInstanceStatsJsonUrl(suite, runSpecName) {
25+
return `${BENCHMARK_OUTPUT_BASE_URL}/runs/${suite}/${runSpecName}/per_instance_stats_slim.json`;
26+
}
27+
28+
function runSpecJsonUrl(suite, runSpecName) {
29+
return `${BENCHMARK_OUTPUT_BASE_URL}/runs/${suite}/${runSpecName}/run_spec.json`
30+
}
31+
32+
function scenarioJsonUrl(suite, runSpecName) {
33+
return `${BENCHMARK_OUTPUT_BASE_URL}/runs/${suite}/${runSpecName}/scenario.json`;
34+
}
35+
36+
function scenarioStateJsonUrl(suite, runSpecName) {
37+
return `${BENCHMARK_OUTPUT_BASE_URL}/runs/${suite}/${runSpecName}/scenario_state_slim.json`;
38+
}
39+
40+
function statsJsonUrl(suite, runSpecName) {
41+
return `${BENCHMARK_OUTPUT_BASE_URL}/runs/${suite}/${runSpecName}/stats.json`;
42+
}

0 commit comments

Comments
 (0)