From 56971568665350fd2f240a02eb5163d833c64469 Mon Sep 17 00:00:00 2001
From: Janosh Riebesell <janosh.riebesell@gmail.com>
Date: Wed, 20 Sep 2023 17:25:34 -0700
Subject: [PATCH] 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
---
 matbench_discovery/slurm.py           |  7 +++----
 models/alignn/test_alignn.py          |  2 ++
 models/alignn/train_alignn.py         |  1 -
 models/alignn_ff/metadata_aborted.yml |  2 +-
 models/chgnet/metadata.yml            |  2 +-
 models/mace/metadata.yml              |  2 +-
 models/mace/test_mace.py              |  1 -
 site/src/lib/Footer.svelte            |  4 ++--
 site/src/lib/ModelCard.svelte         | 10 +++++-----
 site/src/lib/Nav.svelte               |  4 ++--
 site/src/routes/+layout.svelte        |  6 ++++--
 site/src/routes/models/+page.svelte   | 13 ++++++++++---
 12 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/matbench_discovery/slurm.py b/matbench_discovery/slurm.py
index 6cfa8dbd..66f35679 100644
--- a/matbench_discovery/slurm.py
+++ b/matbench_discovery/slurm.py
@@ -55,10 +55,9 @@ def slurm_submit(
         array (str, optional): Slurm array specifier. Defaults to None. Example:
             '9' (for SLURM_ARRAY_TASK_ID from 0-9 inclusive), '1-10' or '1-10%2', etc.
         pre_cmd (str, optional): Things like `module load` commands and environment
-            variables to set when running the python script go here. Example:
-            pre_cmd='ENV_VAR=42' or 'module load rhel8/default-amp;'. Defaults to "".
-            If running on CPU, pre_cmd="unset OMP_NUM_THREADS" allows PyTorch to use
-            all cores https://docs.hpc.cam.ac.uk/hpc/software-packages/pytorch.html
+            variables to set before running the python script go here. Example:
+            pre_cmd='ENV_VAR=42' or 'module load pytorch;'. Defaults to "". If running
+            on CPU, pre_cmd="unset OMP_NUM_THREADS" allows PyTorch to use all cores.
 
     Raises:
         SystemExit: Exit code will be subprocess.run(['sbatch', ...]).returncode.
diff --git a/models/alignn/test_alignn.py b/models/alignn/test_alignn.py
index 22f6f612..60606851 100644
--- a/models/alignn/test_alignn.py
+++ b/models/alignn/test_alignn.py
@@ -67,6 +67,8 @@
     time="12:0:0",
     out_dir=out_dir,
     slurm_flags="--nodes 1 --gpus-per-node 1",
+    # pre_cmd is platform specific, remove when running on other systems
+    # just left here for reference
     pre_cmd=". /etc/profile.d/modules.sh; module load rhel8/default-amp;"
     "module load cuda/11.8",
 )
diff --git a/models/alignn/train_alignn.py b/models/alignn/train_alignn.py
index baa99d13..02c23095 100644
--- a/models/alignn/train_alignn.py
+++ b/models/alignn/train_alignn.py
@@ -53,7 +53,6 @@
     time="4:0:0",
     out_dir=out_dir,
     slurm_flags="--qos regular --constraint gpu --gpus 1",
-    pre_cmd="module load pytorch/2.0.1;",
 )
 
 
diff --git a/models/alignn_ff/metadata_aborted.yml b/models/alignn_ff/metadata_aborted.yml
index 0c60dfe0..c89a734d 100644
--- a/models/alignn_ff/metadata_aborted.yml
+++ b/models/alignn_ff/metadata_aborted.yml
@@ -44,6 +44,6 @@ trained_for_benchmark: true
 
 training_set:
   title: MPTrj
-  url: https://figshare.com/articles/dataset/19470599
+  url: https://figshare.com/articles/dataset/23713842
   size: 1_580_395
 # hyperparams: see align-config.json
diff --git a/models/chgnet/metadata.yml b/models/chgnet/metadata.yml
index 006861cb..39e07f4e 100644
--- a/models/chgnet/metadata.yml
+++ b/models/chgnet/metadata.yml
@@ -35,7 +35,7 @@ trained_for_benchmark: false
 
 training_set:
   title: MPTrj
-  url: https://figshare.com/articles/dataset/19470599
+  url: https://figshare.com/articles/dataset/23713842
   size: 1_580_395
 
 hyperparams:
diff --git a/models/mace/metadata.yml b/models/mace/metadata.yml
index 8fb4f3fd..bd833382 100644
--- a/models/mace/metadata.yml
+++ b/models/mace/metadata.yml
@@ -32,7 +32,7 @@ trained_for_benchmark: true
 
 training_set:
   title: MPTrj
-  url: https://figshare.com/articles/dataset/19470599
+  url: https://figshare.com/articles/dataset/23713842
   size: 1_580_395
 
 hyperparams:
diff --git a/models/mace/test_mace.py b/models/mace/test_mace.py
index 17341edc..61f714f1 100644
--- a/models/mace/test_mace.py
+++ b/models/mace/test_mace.py
@@ -46,7 +46,6 @@
     time="12:0:0",
     array=f"1-{slurm_array_task_count}",
     slurm_flags="--qos regular --constraint gpu --gpus 1",
-    pre_cmd="module load pytorch/2.0.1; . ~/.venv/py311/bin/activate;",
 )
 
 
diff --git a/site/src/lib/Footer.svelte b/site/src/lib/Footer.svelte
index b886539a..18701fce 100644
--- a/site/src/lib/Footer.svelte
+++ b/site/src/lib/Footer.svelte
@@ -47,10 +47,10 @@
 <dialog bind:this={dialog} open={show_tips}>
   <h3>{tips_title}</h3>
   <p title="For keyboard-only site navigation">
-    Use <kbd>cmd+k</kbd> to bring up a nav palette.
+    <kbd>cmd+k</kbd> to bring up a nav palette.
   </p>
   <p title="For keyboard-only site navigation">
-    Use <kbd>cmd+j</kbd> to bring up these site options.
+    <kbd>cmd+j</kbd> to bring up these site options.
   </p>
 </dialog>
 
diff --git a/site/src/lib/ModelCard.svelte b/site/src/lib/ModelCard.svelte
index d2910517..f3e28ab4 100644
--- a/site/src/lib/ModelCard.svelte
+++ b/site/src/lib/ModelCard.svelte
@@ -74,7 +74,7 @@
 {#if show_details}
   <div transition:fade|fly={{ duration: 200 }}>
     <section transition:slide={{ duration: 200 }}>
-      <h3 class="toc-exclude">Authors</h3>
+      <h3>Authors</h3>
       <ul>
         {#each data.authors as { name, email, orcid, affiliation, url }}
           <li>
@@ -93,7 +93,7 @@
       </ul>
     </section>
     <section transition:slide={{ duration: 200 }}>
-      <h3 class="toc-exclude">Package versions</h3>
+      <h3>Package versions</h3>
       <ul>
         {#each Object.entries(data.requirements ?? {}) as [name, version]}
           <li>
@@ -110,7 +110,7 @@
   </div>
 {/if}
 <section class="metrics" style={metrics_style}>
-  <h3 class="toc-exclude">Metrics</h3>
+  <h3>Metrics</h3>
   <ul>
     {#each stats as { key, label, unit }}
       <li class:active={sort_by == key}>
@@ -122,7 +122,7 @@
 </section>
 {#if hyperparams && show_details}
   <section>
-    <h3 class="toc-exclude">Hyperparameters</h3>
+    <h3>Hyperparameters</h3>
     <ul>
       {#each Object.entries(hyperparams) as [key, value]}
         <li>
@@ -143,7 +143,7 @@
 {/if}
 {#if notes && show_details}
   <section>
-    <h3 class="toc-exclude">Notes</h3>
+    <h3>Notes</h3>
     <ul>
       {#each [`description`, `training`].filter((key) => key in (notes ?? {})) as key}
         <li>{@html notes[key]}</li>
diff --git a/site/src/lib/Nav.svelte b/site/src/lib/Nav.svelte
index cdd0a990..2d14aafa 100644
--- a/site/src/lib/Nav.svelte
+++ b/site/src/lib/Nav.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { page } from '$app/stores'
 
-  export let routes: string[]
+  export let routes: (string | [string, string])[]
   export let style: string | null = null
 
   $: is_current = (path: string) => {
@@ -24,7 +24,7 @@
     display: flex;
     gap: 1em 1ex;
     place-content: center;
-    margin: 1em auto 3em;
+    margin: 2em auto 3em;
     max-width: 45em;
     flex-wrap: wrap;
     font-size: 1.1em;
diff --git a/site/src/routes/+layout.svelte b/site/src/routes/+layout.svelte
index 7b7a1035..ea5d2afa 100644
--- a/site/src/routes/+layout.svelte
+++ b/site/src/routes/+layout.svelte
@@ -14,7 +14,7 @@
 
   $: url = $page.url.pathname
   $: headingSelector = `main :is(${
-    url === `/api` ? `h1, ` : ``
+    { '/api': `h1, ` }[url] ?? ``
   }h2, h3, h4):not(.toc-exclude)`
 
   $: description = {
@@ -68,7 +68,9 @@
   <meta name="description" content={description} />
 </svelte:head>
 
-<Toc {headingSelector} breakpoint={1250} minItems={3} />
+{#if url !== `/models`}
+  <Toc {headingSelector} breakpoint={1250} minItems={3} />
+{/if}
 
 <GitHubCorner href={repository} />
 
diff --git a/site/src/routes/models/+page.svelte b/site/src/routes/models/+page.svelte
index 9477e3b9..a9bf4ab7 100644
--- a/site/src/routes/models/+page.svelte
+++ b/site/src/routes/models/+page.svelte
@@ -59,7 +59,12 @@
 </script>
 
 <div style="margin: 3vw;">
-  <h1>Models</h1>
+  <h1>Interactive Leaderboard</h1>
+
+  <p style="text-align: center;">
+    Sort models by stability classification metrics, by their tun time or regressions
+    metrics for predicted convex hull distance.
+  </p>
 
   <span>
     Sort
@@ -70,7 +75,9 @@
   <ul>
     {#each [{ key: `model_name`, label: `Model Name` }, ...stats] as { key, label, tooltip }}
       <li class:active={key == sort_by}>
-        <button id={key} on:click={() => (sort_by = key)}>{@html label ?? key}</button>
+        <button id={key} on:click={() => (sort_by = key)} style="font-size: large;">
+          {@html label ?? key}
+        </button>
         {#if tooltip}
           <Tooltip
             text={tooltip}
@@ -142,7 +149,7 @@
     display: flex;
     flex-wrap: wrap;
     gap: 9pt;
-    margin: 1em auto 2em;
+    margin: 2.5ex auto 3ex;
     place-content: center;
   }
   ul > li button {