Skip to content

Commit

Permalink
notebooks: rebuild to remove conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@wd15
wd15 committed Aug 4, 2023
1 parent f3359ce commit 2b5a4e9
Show file tree
Hide file tree
Showing 39 changed files with 2,098 additions and 9,598 deletions.
524 changes: 111 additions & 413 deletions results/benchmark1a.1.ipynb.raw.html
View file

Large diffs are not rendered by default.

106 changes: 23 additions & 83 deletions results/benchmark1a.1.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ jupyter:
name: python3
---

<<<<<<< HEAD
```python papermill={"duration": 0.013032, "end_time": "2023-07-17T20:40:26.210064", "exception": false, "start_time": "2023-07-17T20:40:26.197032", "status": "completed"} tags=["parameters"]
=======
```python papermill={"duration": 0.013229, "end_time": "2023-07-10T17:59:01.321717", "exception": false, "start_time": "2023-07-10T17:59:01.308488", "status": "completed"} tags=["parameters"]
>>>>>>> 23b7290 (notebooks: update results to work with flake.nix)
```python papermill={"duration": 0.045677, "end_time": "2023-08-04T15:23:25.798855", "exception": false, "start_time": "2023-08-04T15:23:25.753178", "status": "completed"} tags=["parameters"]
benchmark_id = '3a.1'
line_plots = [
dict(name='free_energy', layout=dict(log_y=True, x_label=r'<i>t</i>', y_label=r'&#8497;', range_y=[1.8e6, 2.4e6], title="Free Energy v Time")),
Expand All @@ -29,11 +25,7 @@ contour_plots = []
efficiency = True
```

<<<<<<< HEAD
```python papermill={"duration": 0.008036, "end_time": "2023-07-17T20:40:26.220254", "exception": false, "start_time": "2023-07-17T20:40:26.212218", "status": "completed"} tags=["injected-parameters"]
=======
```python papermill={"duration": 0.007326, "end_time": "2023-07-10T17:59:01.332256", "exception": false, "start_time": "2023-07-10T17:59:01.324930", "status": "completed"} tags=["injected-parameters"]
>>>>>>> 23b7290 (notebooks: update results to work with flake.nix)
```python papermill={"duration": 0.019897, "end_time": "2023-08-04T15:23:25.827519", "exception": false, "start_time": "2023-08-04T15:23:25.807622", "status": "completed"} tags=["injected-parameters"]
# Parameters
benchmark_id = "1a.1"
line_plots = [
Expand All @@ -51,11 +43,7 @@ line_plots = [

```

<<<<<<< HEAD
```python papermill={"duration": 0.009381, "end_time": "2023-07-17T20:40:26.231570", "exception": false, "start_time": "2023-07-17T20:40:26.222189", "status": "completed"} tags=[]
=======
```python papermill={"duration": 0.00947, "end_time": "2023-07-10T17:59:01.343481", "exception": false, "start_time": "2023-07-10T17:59:01.334011", "status": "completed"} tags=[]
>>>>>>> 23b7290 (notebooks: update results to work with flake.nix)
```python papermill={"duration": 0.01173, "end_time": "2023-08-04T15:23:25.843793", "exception": false, "start_time": "2023-08-04T15:23:25.832063", "status": "completed"} tags=[]
from IPython.display import display_markdown

display_markdown(f'''
Expand All @@ -65,26 +53,18 @@ All results for the [{ benchmark_id } benchmark specification](../../benchmarks/
''', raw=True)
```

<<<<<<< HEAD
```python papermill={"duration": 0.006681, "end_time": "2023-07-17T20:40:26.240297", "exception": false, "start_time": "2023-07-17T20:40:26.233616", "status": "completed"} tags=[]
=======
```python papermill={"duration": 0.006666, "end_time": "2023-07-10T17:59:01.352048", "exception": false, "start_time": "2023-07-10T17:59:01.345382", "status": "completed"} tags=[]
>>>>>>> 23b7290 (notebooks: update results to work with flake.nix)
```python papermill={"duration": 0.007068, "end_time": "2023-08-04T15:23:25.853679", "exception": false, "start_time": "2023-08-04T15:23:25.846611", "status": "completed"} tags=[]
# To generate the comparison notebooks use:
#
#
# papermill template.ipynb benchmark{version}.ipynb -f bm{version}.yaml
#
```

<<<<<<< HEAD
```python papermill={"duration": 0.012842, "end_time": "2023-07-17T20:40:26.255229", "exception": false, "start_time": "2023-07-17T20:40:26.242387", "status": "completed"} tags=[]
=======
```python papermill={"duration": 0.011353, "end_time": "2023-07-10T17:59:01.367666", "exception": false, "start_time": "2023-07-10T17:59:01.356313", "status": "completed"} tags=[]
>>>>>>> 23b7290 (notebooks: update results to work with flake.nix)
```python papermill={"duration": 0.009401, "end_time": "2023-08-04T15:23:25.865184", "exception": false, "start_time": "2023-08-04T15:23:25.855783", "status": "completed"} tags=[]
from IPython.display import HTML

HTML('''<script>
code_show=true;
code_show=true;
function code_toggle() {
if (code_show){
$('div.input').hide();
Expand All @@ -94,17 +74,13 @@ function code_toggle() {
$('div.prompt').show();
}
code_show = !code_show
}
}
$( document ).ready(code_toggle);
</script>
<form action="javascript:code_toggle()"><input type="submit" value="Code Toggle"></form>''')
```

<<<<<<< HEAD
```python papermill={"duration": 0.657095, "end_time": "2023-07-17T20:40:26.914609", "exception": false, "start_time": "2023-07-17T20:40:26.257514", "status": "completed"} tags=[]
=======
```python papermill={"duration": 0.672693, "end_time": "2023-07-10T17:59:02.043640", "exception": false, "start_time": "2023-07-10T17:59:01.370947", "status": "completed"} tags=[]
>>>>>>> 23b7290 (notebooks: update results to work with flake.nix)
```python papermill={"duration": 0.547806, "end_time": "2023-08-04T15:23:26.415262", "exception": false, "start_time": "2023-08-04T15:23:25.867456", "status": "completed"} tags=[]
#from IPython.display import HTML, display
#from time import sleep

Expand Down Expand Up @@ -134,31 +110,27 @@ from itables import init_notebook_mode
init_notebook_mode(all_interactive=False)
```

<<<<<<< HEAD
```python papermill={"duration": 6.559328, "end_time": "2023-07-17T20:40:33.476706", "exception": false, "start_time": "2023-07-17T20:40:26.917378", "status": "completed"} tags=[]
colors = dict()

=======
```python papermill={"duration": 0.00784, "end_time": "2023-07-10T17:59:02.054080", "exception": false, "start_time": "2023-07-10T17:59:02.046240", "status": "completed"} tags=[]
```python papermill={"duration": 0.009808, "end_time": "2023-08-04T15:23:26.427644", "exception": false, "start_time": "2023-08-04T15:23:26.417836", "status": "completed"} tags=[]
from pathlib import Path

cwd = Path().resolve()
benchmark_path = f'{cwd}/../_data/simulation_list.yaml'
```

```python papermill={"duration": 3.897803, "end_time": "2023-07-10T17:59:05.954313", "exception": false, "start_time": "2023-07-10T17:59:02.056510", "status": "completed"} tags=[]
>>>>>>> 23b7290 (notebooks: update results to work with flake.nix)
```python papermill={"duration": 7.253329, "end_time": "2023-08-04T15:23:33.683158", "exception": false, "start_time": "2023-08-04T15:23:26.429829", "status": "completed"} tags=[]
colors = dict()

for x in line_plots:
fig = line_plot(
data_name=x['name'],
benchmark_id=benchmark_id,
layout=x['layout'],
<<<<<<< HEAD
columns=x.get('columns', ('x', 'y'))
columns=x.get('columns', ('x', 'y')),
benchmark_path=benchmark_path
)
if 'extra_lines' in x:
for kwargs in x['extra_lines']:
fig.add_scatter(**kwargs)
fig.add_scatter(**kwargs)
for datum in fig['data']:
name = datum['name']
color = datum['line']['color']
Expand All @@ -167,15 +139,7 @@ for x in line_plots:
fig.show()
```

```python papermill={"duration": 0.298481, "end_time": "2023-07-17T20:40:34.063363", "exception": false, "start_time": "2023-07-17T20:40:33.764882", "status": "completed"} tags=[]
=======
columns=x.get('columns', ('x', 'y')),
benchmark_path=benchmark_path
).show()
```

```python papermill={"duration": 0.442561, "end_time": "2023-07-10T17:59:06.737335", "exception": false, "start_time": "2023-07-10T17:59:06.294774", "status": "completed"} tags=[]
>>>>>>> 23b7290 (notebooks: update results to work with flake.nix)
```python papermill={"duration": 0.319939, "end_time": "2023-08-04T15:23:34.311115", "exception": false, "start_time": "2023-08-04T15:23:33.991176", "status": "completed"} tags=[]
for x in contour_plots:
data = get_result_data([x['name']], [benchmark_id], x['columns'], benchmark_path=benchmark_path)

Expand All @@ -187,56 +151,32 @@ for x in contour_plots:
).show()
```

<<<<<<< HEAD
```python papermill={"duration": 2.296371, "end_time": "2023-07-17T20:40:36.645557", "exception": false, "start_time": "2023-07-17T20:40:34.349186", "status": "completed"} tags=[]
```python papermill={"duration": 2.287289, "end_time": "2023-08-04T15:23:36.920742", "exception": false, "start_time": "2023-08-04T15:23:34.633453", "status": "completed"} tags=[]
if efficiency:
efficiency_plot(benchmark_id).show()
efficiency_plot(benchmark_id, benchmark_path=benchmark_path).show()
display_markdown("<span class='plotly-footnote' >* Wall time divided by the total simulated time.</span>", raw=True)

```

```python papermill={"duration": 0.302589, "end_time": "2023-07-17T20:40:37.240572", "exception": false, "start_time": "2023-07-17T20:40:36.937983", "status": "completed"} tags=[]
=======
```python papermill={"duration": 2.652945, "end_time": "2023-07-10T17:59:09.860138", "exception": false, "start_time": "2023-07-10T17:59:07.207193", "status": "completed"} tags=[]
efficiency_plot(benchmark_id, benchmark_path=benchmark_path).show()

display_markdown("<span class='plotly-footnote' >* Wall time divided by the total simulated time.</span>", raw=True)

```

```python papermill={"duration": 0.330109, "end_time": "2023-07-10T17:59:10.527198", "exception": false, "start_time": "2023-07-10T17:59:10.197089", "status": "completed"} tags=[]
>>>>>>> 23b7290 (notebooks: update results to work with flake.nix)
```python papermill={"duration": 0.330637, "end_time": "2023-08-04T15:23:37.546925", "exception": false, "start_time": "2023-08-04T15:23:37.216288", "status": "completed"} tags=[]
display_markdown(f'''
# Table of Results
Table of { benchmark_id } benchmark result uploads.
''', raw=True)
```

<<<<<<< HEAD
```python papermill={"duration": 0.29134, "end_time": "2023-07-17T20:40:37.828110", "exception": false, "start_time": "2023-07-17T20:40:37.536770", "status": "completed"} tags=[]

```

```python papermill={"duration": 1.309486, "end_time": "2023-07-17T20:40:39.434756", "exception": false, "start_time": "2023-07-17T20:40:38.125270", "status": "completed"} tags=[]
=======
```python papermill={"duration": 0.34004, "end_time": "2023-07-10T17:59:11.199126", "exception": false, "start_time": "2023-07-10T17:59:10.859086", "status": "completed"} tags=[]
```python papermill={"duration": 0.347607, "end_time": "2023-08-04T15:23:38.255321", "exception": false, "start_time": "2023-08-04T15:23:37.907714", "status": "completed"} tags=[]

```

```python papermill={"duration": 1.270854, "end_time": "2023-07-10T17:59:12.803263", "exception": false, "start_time": "2023-07-10T17:59:11.532409", "status": "completed"} tags=[]
>>>>>>> 23b7290 (notebooks: update results to work with flake.nix)
```python papermill={"duration": 1.30419, "end_time": "2023-08-04T15:23:39.933751", "exception": false, "start_time": "2023-08-04T15:23:38.629561", "status": "completed"} tags=[]
## Currently switching off interactive tables as these are not converted to HTML properly.
## This might improve when jupyter-nbcovert is updated to a later version.

init_notebook_mode(all_interactive=False)
get_table_data_style(benchmark_id, pfhub_path='../..', benchmark_path=benchmark_path)
```

<<<<<<< HEAD
```python papermill={"duration": 0.292175, "end_time": "2023-07-17T20:40:40.039591", "exception": false, "start_time": "2023-07-17T20:40:39.747416", "status": "completed"} tags=[]
=======
```python papermill={"duration": 0.313151, "end_time": "2023-07-10T17:59:13.472697", "exception": false, "start_time": "2023-07-10T17:59:13.159546", "status": "completed"} tags=[]
>>>>>>> 23b7290 (notebooks: update results to work with flake.nix)
```python papermill={"duration": 0.294828, "end_time": "2023-08-04T15:23:40.550198", "exception": false, "start_time": "2023-08-04T15:23:40.255370", "status": "completed"} tags=[]

```
609 changes: 136 additions & 473 deletions results/benchmark1b.1.ipynb.raw.html
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 2b5a4e9

Please sign in to comment.