Skip to content

Commit a2e4c94

Browse files
committed
fix ModelCard not handling multiple training sets correctly
plus other minor fixes
1 parent d4406ec commit a2e4c94

10 files changed

+43
-26
lines changed

scripts/model_figs/metrics_tables.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,14 @@
9595
)
9696

9797
if n_materials_total != n_structs_total:
98-
title = "Number of materials (and structures) in training set"
98+
title = (
99+
"Number of materials in training set
In parenthesis=number of "
100+
"structures, usually from multiple DFT relaxation frames per material"
101+
)
99102
train_size_str = (
100103
f"<span {title=} data-sort-value={n_materials_total}>"
101104
f"{si_fmt(n_materials_total, fmt='.0f')}</span>"
102-
f"<small {title=}> ({si_fmt(n_structs_total, fmt='.1f')})</small>"
105+
f" <small {title=}> ({si_fmt(n_structs_total, fmt='.1f')})</small>"
103106
)
104107

105108
dataset_links = []
@@ -112,7 +115,7 @@
112115
dataset_links += [key]
113116
dataset_str = "+".join(dataset_links)
114117

115-
tooltip = "\\n".join(tooltip_lines)
118+
tooltip = "&#013;".join(tooltip_lines)
116119
train_size_str = (
117120
f"<span title='{tooltip}'>{train_size_str} ({dataset_str})</span>"
118121
)

scripts/model_figs/rolling_mae_vs_hull_dist_models.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
df_rolling_err=df_err,
4545
df_err_std=df_std,
4646
show_dummy_mae=False,
47+
height=600,
4748
)
4849

4950
if backend == MATPLOTLIB:
@@ -55,7 +56,7 @@
5556
for line in fig.lines:
5657
line._linewidth *= 2 # noqa: SLF001
5758
else:
58-
show_n_best_models = len(models)
59+
show_n_best_models = 8
5960
for trace in fig.data:
6061
model = trace.name.split(" MAE=")[0]
6162
if model in df_metrics.T.sort_values("MAE").index[show_n_best_models:]:

site/src/figs/each-parity-models-7x2.svelte

-1
This file was deleted.

site/src/figs/each-parity-models-8x2.svelte

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

site/src/figs/hist-clf-pred-hull-dist-models-7x2.svelte

-1
This file was deleted.

site/src/figs/hist-clf-pred-hull-dist-models-8x2.svelte

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

site/src/figs/metrics-table-uniq-protos.svelte

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

site/src/figs/rolling-mae-vs-hull-dist-models.svelte

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

site/src/lib/ModelCard.svelte

+23-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script lang="ts">
22
import type { ModelData, ModelStatLabel } from '$lib'
33
import { AuthorBrief } from '$lib'
4+
import TRAINING_SETS from '$root/data/training-sets.yml'
45
import { repository } from '$site/package.json'
56
import Icon from '@iconify/svelte'
67
import { pretty_num } from 'elementari'
@@ -91,17 +92,27 @@
9192
{/if}
9293
</span>
9394
{#if training_set}
94-
{@const { n_structures, url, title, n_materials } = training_set}
95-
{@const pretty_n_mat =
96-
typeof n_materials == `number` ? pretty_num(n_materials) : n_materials}
97-
{@const n_mat_str = n_materials ? ` from ${pretty_n_mat} materials` : ``}
95+
{@const training_sets = Array.isArray(training_set) ? training_set : [training_set]}
9896
<span style="grid-column: span 2;">
9997
<Icon icon="mdi:database" inline />
10098
Training set:
101-
<a href={url}>{title}</a>
102-
<small>
103-
({pretty_num(n_structures)} structures{n_mat_str})
104-
</small>
99+
{#each training_sets as training_set_or_key, idx}
100+
{#if idx > 0}
101+
&nbsp;+&nbsp;
102+
{/if}
103+
{@const training_set =
104+
typeof training_set_or_key == `string`
105+
? TRAINING_SETS[training_set_or_key]
106+
: training_set_or_key}
107+
{@const { n_structures, url, title, n_materials } = training_set}
108+
{@const pretty_n_mat =
109+
typeof n_materials == `number` ? pretty_num(n_materials) : n_materials}
110+
{@const n_mat_str = n_materials ? ` from ${pretty_n_mat} materials` : ``}
111+
<a href={url}>{title}</a>
112+
<small>
113+
({pretty_num(n_structures)} structures{n_mat_str})
114+
</small>
115+
{/each}
105116
</span>
106117
{/if}
107118
</p>
@@ -127,7 +138,10 @@
127138
</ul>
128139
{/if}
129140
</section>
130-
<section transition:slide={{ duration: 200 }}>
141+
<section
142+
transition:slide={{ duration: 200 }}
143+
style="overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
144+
>
131145
<h3>Package versions</h3>
132146
<ul>
133147
{#each Object.entries(data.requirements ?? {}) as [name, version]}

site/src/routes/preprint/+page.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import BoxHullDistErrors from '$figs/box-hull-dist-errors.svelte'
66
import CumulativeMae from '$figs/cumulative-mae.svelte'
77
import CumulativePrecisionRecall from '$figs/cumulative-precision-recall.svelte'
8-
import EachParityModels from '$figs/each-parity-models-7x2.svelte'
8+
import EachParityModels from '$figs/each-parity-models-8x2.svelte'
99
import ElementPrevalenceVsError from '$figs/element-prevalence-vs-error.svelte'
10-
import HistClfPredHullDistModels from '$figs/hist-clf-pred-hull-dist-models-7x2.svelte'
10+
import HistClfPredHullDistModels from '$figs/hist-clf-pred-hull-dist-models-8x2.svelte'
1111
import HullDistParityWrenformerFailures from '$figs/hull-dist-parity-wrenformer-failures.svelte'
1212
import LargestErrorScatterSelect from './largest-error-scatter-select.svelte'
1313
import MetricsTableUniqProtos from '$figs/metrics-table-uniq-protos.svelte'

0 commit comments

Comments
 (0)