Skip to content

Commit 5697156

Browse files
committed
fix wrong MPtrj training_set URL in chgnet, mace, alignn_ff metadata.yml
hide ToC on /models page delete pre_cmd `module load pytorch/2.0.1`, wasn't used, was using torch from venv
1 parent 71d77f4 commit 5697156

File tree

12 files changed

+31
-23
lines changed

12 files changed

+31
-23
lines changed

matbench_discovery/slurm.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,9 @@ def slurm_submit(
5555
array (str, optional): Slurm array specifier. Defaults to None. Example:
5656
'9' (for SLURM_ARRAY_TASK_ID from 0-9 inclusive), '1-10' or '1-10%2', etc.
5757
pre_cmd (str, optional): Things like `module load` commands and environment
58-
variables to set when running the python script go here. Example:
59-
pre_cmd='ENV_VAR=42' or 'module load rhel8/default-amp;'. Defaults to "".
60-
If running on CPU, pre_cmd="unset OMP_NUM_THREADS" allows PyTorch to use
61-
all cores https://docs.hpc.cam.ac.uk/hpc/software-packages/pytorch.html
58+
variables to set before running the python script go here. Example:
59+
pre_cmd='ENV_VAR=42' or 'module load pytorch;'. Defaults to "". If running
60+
on CPU, pre_cmd="unset OMP_NUM_THREADS" allows PyTorch to use all cores.
6261
6362
Raises:
6463
SystemExit: Exit code will be subprocess.run(['sbatch', ...]).returncode.

models/alignn/test_alignn.py

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@
6767
time="12:0:0",
6868
out_dir=out_dir,
6969
slurm_flags="--nodes 1 --gpus-per-node 1",
70+
# pre_cmd is platform specific, remove when running on other systems
71+
# just left here for reference
7072
pre_cmd=". /etc/profile.d/modules.sh; module load rhel8/default-amp;"
7173
"module load cuda/11.8",
7274
)

models/alignn/train_alignn.py

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
time="4:0:0",
5454
out_dir=out_dir,
5555
slurm_flags="--qos regular --constraint gpu --gpus 1",
56-
pre_cmd="module load pytorch/2.0.1;",
5756
)
5857

5958

models/alignn_ff/metadata_aborted.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ trained_for_benchmark: true
4444

4545
training_set:
4646
title: MPTrj
47-
url: https://figshare.com/articles/dataset/19470599
47+
url: https://figshare.com/articles/dataset/23713842
4848
size: 1_580_395
4949
# hyperparams: see align-config.json

models/chgnet/metadata.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ trained_for_benchmark: false
3535

3636
training_set:
3737
title: MPTrj
38-
url: https://figshare.com/articles/dataset/19470599
38+
url: https://figshare.com/articles/dataset/23713842
3939
size: 1_580_395
4040

4141
hyperparams:

models/mace/metadata.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ trained_for_benchmark: true
3232

3333
training_set:
3434
title: MPTrj
35-
url: https://figshare.com/articles/dataset/19470599
35+
url: https://figshare.com/articles/dataset/23713842
3636
size: 1_580_395
3737

3838
hyperparams:

models/mace/test_mace.py

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
time="12:0:0",
4747
array=f"1-{slurm_array_task_count}",
4848
slurm_flags="--qos regular --constraint gpu --gpus 1",
49-
pre_cmd="module load pytorch/2.0.1; . ~/.venv/py311/bin/activate;",
5049
)
5150

5251

site/src/lib/Footer.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
<dialog bind:this={dialog} open={show_tips}>
4848
<h3>{tips_title}</h3>
4949
<p title="For keyboard-only site navigation">
50-
Use <kbd>cmd+k</kbd> to bring up a nav palette.
50+
<kbd>cmd+k</kbd> to bring up a nav palette.
5151
</p>
5252
<p title="For keyboard-only site navigation">
53-
Use <kbd>cmd+j</kbd> to bring up these site options.
53+
<kbd>cmd+j</kbd> to bring up these site options.
5454
</p>
5555
</dialog>
5656

site/src/lib/ModelCard.svelte

+5-5
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
{#if show_details}
7575
<div transition:fade|fly={{ duration: 200 }}>
7676
<section transition:slide={{ duration: 200 }}>
77-
<h3 class="toc-exclude">Authors</h3>
77+
<h3>Authors</h3>
7878
<ul>
7979
{#each data.authors as { name, email, orcid, affiliation, url }}
8080
<li>
@@ -93,7 +93,7 @@
9393
</ul>
9494
</section>
9595
<section transition:slide={{ duration: 200 }}>
96-
<h3 class="toc-exclude">Package versions</h3>
96+
<h3>Package versions</h3>
9797
<ul>
9898
{#each Object.entries(data.requirements ?? {}) as [name, version]}
9999
<li>
@@ -110,7 +110,7 @@
110110
</div>
111111
{/if}
112112
<section class="metrics" style={metrics_style}>
113-
<h3 class="toc-exclude">Metrics</h3>
113+
<h3>Metrics</h3>
114114
<ul>
115115
{#each stats as { key, label, unit }}
116116
<li class:active={sort_by == key}>
@@ -122,7 +122,7 @@
122122
</section>
123123
{#if hyperparams && show_details}
124124
<section>
125-
<h3 class="toc-exclude">Hyperparameters</h3>
125+
<h3>Hyperparameters</h3>
126126
<ul>
127127
{#each Object.entries(hyperparams) as [key, value]}
128128
<li>
@@ -143,7 +143,7 @@
143143
{/if}
144144
{#if notes && show_details}
145145
<section>
146-
<h3 class="toc-exclude">Notes</h3>
146+
<h3>Notes</h3>
147147
<ul>
148148
{#each [`description`, `training`].filter((key) => key in (notes ?? {})) as key}
149149
<li>{@html notes[key]}</li>

site/src/lib/Nav.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts">
22
import { page } from '$app/stores'
33
4-
export let routes: string[]
4+
export let routes: (string | [string, string])[]
55
export let style: string | null = null
66
77
$: is_current = (path: string) => {
@@ -24,7 +24,7 @@
2424
display: flex;
2525
gap: 1em 1ex;
2626
place-content: center;
27-
margin: 1em auto 3em;
27+
margin: 2em auto 3em;
2828
max-width: 45em;
2929
flex-wrap: wrap;
3030
font-size: 1.1em;

site/src/routes/+layout.svelte

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
1515
$: url = $page.url.pathname
1616
$: headingSelector = `main :is(${
17-
url === `/api` ? `h1, ` : ``
17+
{ '/api': `h1, ` }[url] ?? ``
1818
}h2, h3, h4):not(.toc-exclude)`
1919
2020
$: description = {
@@ -68,7 +68,9 @@
6868
<meta name="description" content={description} />
6969
</svelte:head>
7070

71-
<Toc {headingSelector} breakpoint={1250} minItems={3} />
71+
{#if url !== `/models`}
72+
<Toc {headingSelector} breakpoint={1250} minItems={3} />
73+
{/if}
7274

7375
<GitHubCorner href={repository} />
7476

site/src/routes/models/+page.svelte

+10-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@
5959
</script>
6060

6161
<div style="margin: 3vw;">
62-
<h1>Models</h1>
62+
<h1>Interactive Leaderboard</h1>
63+
64+
<p style="text-align: center;">
65+
Sort models by stability classification metrics, by their tun time or regressions
66+
metrics for predicted convex hull distance.
67+
</p>
6368

6469
<span>
6570
Sort
@@ -70,7 +75,9 @@
7075
<ul>
7176
{#each [{ key: `model_name`, label: `Model Name` }, ...stats] as { key, label, tooltip }}
7277
<li class:active={key == sort_by}>
73-
<button id={key} on:click={() => (sort_by = key)}>{@html label ?? key}</button>
78+
<button id={key} on:click={() => (sort_by = key)} style="font-size: large;">
79+
{@html label ?? key}
80+
</button>
7481
{#if tooltip}
7582
<Tooltip
7683
text={tooltip}
@@ -142,7 +149,7 @@
142149
display: flex;
143150
flex-wrap: wrap;
144151
gap: 9pt;
145-
margin: 1em auto 2em;
152+
margin: 2.5ex auto 3ex;
146153
place-content: center;
147154
}
148155
ul > li button {

0 commit comments

Comments
 (0)