Skip to content

Commit 3ee7d20

Browse files
hodgestarhodgestar
authored
Merge pull request #61 from Langhaarzombie/website
Benchmark Website Redesign
2 parents e5a7091 + a520430 commit 3ee7d20

File tree

12 files changed

+124
-72
lines changed

12 files changed

+124
-72
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,22 @@ jobs:
5757
# Download resources from qutip.github.io repository
5858
mkdir css
5959
cd css
60-
wget https://raw.githubusercontent.com/qutip/qutip.github.io/master/css/bootstrap.css
6160
wget https://raw.githubusercontent.com/qutip/qutip.github.io/master/css/site.css
6261
cd ..
6362
6463
mkdir _includes
6564
cd _includes
66-
wget https://raw.githubusercontent.com/qutip/qutip.github.io/master/_includes/footer.html
67-
wget https://raw.githubusercontent.com/qutip/qutip.github.io/master/_includes/header.html
65+
wget https://raw.githubusercontent.com/qutip/qutip.github.io/master/_includes/head.html
6866
wget https://raw.githubusercontent.com/qutip/qutip.github.io/master/_includes/navbar.html
67+
wget https://raw.githubusercontent.com/qutip/qutip.github.io/master/_includes/footer.html
68+
wget https://raw.githubusercontent.com/qutip/qutip.github.io/master/_includes/scripts.html
6969
cd ..
7070
71-
# Add additional includes
72-
cp -r _includes_extra/* _includes
71+
mkdir images
72+
cd images
73+
wget https://raw.githubusercontent.com/qutip/qutip.github.io/master/images/favicon.ico
74+
wget https://raw.githubusercontent.com/langhaarzombie/langhaarzombie.github.io/develop/images/logo_small.png
75+
cd ..
7376
7477
# build the website
7578
bundle config path .gems

‎qutip_benchmark/benchmarks/bench_linear_algebra.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""This file contains the benchmarks that are run the benchmark.py script."""
2+
23
import pytest
34
import qutip
45
import scipy

‎qutip_benchmark/benchmarks/bench_qobjevo.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""This file contains the benchmarks that are run the benchmark.py script."""
2+
23
import pytest
34
import qutip
45
import numpy as np

‎website/_includes_extra/navbar.html‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎website/index.html‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
22
title: QuTiP Benchmarks
33
---
4-
{% include header.html %}
5-
{% include navbar.html %}
64

7-
<div class="row">
5+
<!DOCTYPE html>
6+
<html lang="en">
7+
8+
{% include head.html %}
89

9-
<div class="col-md-12">
10-
<div class="alert alert-info" role="alert">
11-
Benchmarks are currently only available for QuTiP 5, which is the
12-
upcoming major release of QuTiP.
13-
</div>
14-
</div>
10+
<body>
11+
<header> {% include navbar.html %} </header>
12+
13+
<main class="my-content">
14+
<div class="row">
1515

1616
<div class="col-md-9">
1717

@@ -87,5 +87,10 @@ <h3>Contributing</h3>
8787

8888
</div> <!-- col-md-9 main content div -->
8989
</div> <!-- main row div -->
90+
</main>
91+
92+
<footer>{% include footer.html %}</footer>
93+
{% include scripts.html %}
9094

91-
{% include footer.html %}
95+
</body>
96+
</html>

‎website/ops/add.html‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
---
22
title: QuTiP Historical Benchmarks: Qobj Add
33
---
4-
{% include header.html %}
5-
{% include navbar.html %}
64

5+
<!DOCTYPE html>
6+
<html lang="en">
7+
8+
{% include head.html %}
9+
10+
<body>
11+
<header> {% include navbar.html %} </header>
12+
13+
<main class="my-content">
714
<div class="container">
815
<div class="row">
916
<div>
@@ -50,5 +57,10 @@ <h3 class="text-center">Historical Benchmarks: Qobj Add</h3>
5057
</div> <!-- col-md-6 left content div -->
5158
</div><!-- main row div -->
5259
</div>
60+
</main>
61+
62+
<footer>{% include footer.html %}</footer>
63+
{% include scripts.html %}
5364

54-
{% include footer.html %}
65+
</body>
66+
</html>

‎website/ops/matmul.html‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
---
22
title: QuTiP Historical Benchmarks: Qobj Matmul
33
---
4-
{% include header.html %}
5-
{% include navbar.html %}
64

5+
<!DOCTYPE html>
6+
<html lang="en">
77

8+
{% include head.html %}
9+
10+
<body>
11+
<header> {% include navbar.html %} </header>
12+
13+
<main class="my-content">
814
<div class="container">
915
<div class="row">
1016
<div>
@@ -96,5 +102,10 @@ <h4 class="text-center">Operator @ Ket</h4>
96102
</div><!-- main row div -->
97103

98104
</div>
105+
</main>
106+
107+
<footer>{% include footer.html %}</footer>
108+
{% include scripts.html %}
99109

100-
{% include footer.html %}
110+
</body>
111+
</html>

‎website/ops/qobjevo.html‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
---
22
title: QuTiP Historical Benchmarks: QobjEvo Matmul
33
---
4-
{% include header.html %}
5-
{% include navbar.html %}
64

5+
<!DOCTYPE html>
6+
<html lang="en">
77

8+
{% include head.html %}
9+
10+
<body>
11+
<header> {% include navbar.html %} </header>
12+
13+
<main class="my-content">
814
<div class="container">
915
<div class="row">
1016
<div>
@@ -51,5 +57,10 @@ <h3 class="text-center">Historical Benchmarks: QobjEvo Matmul</h3>
5157
</div> <!-- col-md-6 left content div -->
5258
</div><!-- main row div -->
5359
</div>
60+
</main>
61+
62+
<footer>{% include footer.html %}</footer>
63+
{% include scripts.html %}
5464

55-
{% include footer.html %}
65+
</body>
66+
</html>

‎website/ops/s_add_qobjevo.html‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
---
22
title: QuTiP Scaling Benchmarks: Qobj Add and QobjEvo Matmul
33
---
4-
{% include header.html %}
5-
{% include navbar.html %}
64

5+
<!DOCTYPE html>
6+
<html lang="en">
77

8+
{% include head.html %}
9+
10+
<body>
11+
<header> {% include navbar.html %} </header>
12+
13+
<main class="my-content">
814
<div class="container">
915
<div class="row">
1016
<div>
@@ -59,8 +65,11 @@ <h4 class="text-center">QobjEvo Matmul</h4>
5965

6066
</div> <!-- col-md-6 left content div -->
6167
</div><!-- main row div -->
62-
63-
6468
</div>
69+
</main>
70+
71+
<footer>{% include footer.html %}</footer>
72+
{% include scripts.html %}
6573

66-
{% include footer.html %}
74+
</body>
75+
</html>

‎website/ops/s_matmul.html‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
---
22
title: QuTiP Scaling Benchmarks: Qobj Matmul
33
---
4-
{% include header.html %}
5-
{% include navbar.html %}
64

5+
<!DOCTYPE html>
6+
<html lang="en">
77

8+
{% include head.html %}
9+
10+
<body>
11+
<header> {% include navbar.html %} </header>
12+
13+
<main class="my-content">
814
<div class="container">
915
<div class="row">
1016
<div>
@@ -59,5 +65,10 @@ <h4 class="text-center">Operator @ Ket</h4>
5965
</div> <!-- col-md-6 left content div -->
6066
</div><!-- main row div -->
6167
</div>
68+
</main>
69+
70+
<footer>{% include footer.html %}</footer>
71+
{% include scripts.html %}
6272

63-
{% include footer.html %}
73+
</body>
74+
</html>

0 commit comments

Comments
 (0)