Skip to content

Commit 6fd20bf

Browse files
committed
v1.1.2
1 parent 0249327 commit 6fd20bf

File tree

10 files changed

+46
-18
lines changed

10 files changed

+46
-18
lines changed

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ default_install_hook_types: [pre-commit, commit-msg]
88

99
repos:
1010
- repo: https://github.com/astral-sh/ruff-pre-commit
11-
rev: v0.4.4
11+
rev: v0.4.6
1212
hooks:
1313
- id: ruff
1414
args: [--fix]
@@ -37,7 +37,7 @@ repos:
3737
additional_dependencies: [types-pyyaml, types-requests]
3838

3939
- repo: https://github.com/codespell-project/codespell
40-
rev: v2.2.6
40+
rev: v2.3.0
4141
hooks:
4242
- id: codespell
4343
stages: [commit, commit-msg]
@@ -57,7 +57,7 @@ repos:
5757
exclude: ^(site/src/figs/.+\.svelte|data/wbm/20.+\..+|site/src/(routes|figs).+\.(yaml|json)|changelog.md)$
5858

5959
- repo: https://github.com/pre-commit/mirrors-eslint
60-
rev: v9.2.0
60+
rev: v9.3.0
6161
hooks:
6262
- id: eslint
6363
types: [file]
@@ -71,15 +71,15 @@ repos:
7171
- typescript-eslint
7272

7373
- repo: https://github.com/python-jsonschema/check-jsonschema
74-
rev: 0.28.3
74+
rev: 0.28.4
7575
hooks:
7676
- id: check-jsonschema
7777
files: ^models/(.+)/\1.*\.yml$
7878
args: [--schemafile, tests/model-schema.yml]
7979
- id: check-github-actions
8080

8181
- repo: https://github.com/RobertCraigie/pyright-python
82-
rev: v1.1.363
82+
rev: v1.1.365
8383
hooks:
8484
- id: pyright
8585
args: [--level, error]

changelog.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,35 @@
22

33
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
44

5+
#### [v1.1.2](https://github.com/janosh/matbench-discovery/compare/v1.1.1...v1.1.2)
6+
7+
> 15 May 2024
8+
9+
- Add `pyright` pre-commit hook and fix possibly unbound variables [`#93`](https://github.com/janosh/matbench-discovery/pull/93)
10+
- Fix landing page vs model page metrics mismatch [`#92`](https://github.com/janosh/matbench-discovery/pull/92)
11+
- Fill 3% missing MACE preds [`#90`](https://github.com/janosh/matbench-discovery/pull/90)
12+
- doc: add prototype description [`#89`](https://github.com/janosh/matbench-discovery/pull/89)
13+
- Rough solution to recreating plots for unique proto set [`#88`](https://github.com/janosh/matbench-discovery/pull/88)
14+
- Pass preds rather than err to v-plots [`#87`](https://github.com/janosh/matbench-discovery/pull/87)
15+
- Extend model metadata schema [`#86`](https://github.com/janosh/matbench-discovery/pull/86)
16+
- Model metadata schema validation [`#85`](https://github.com/janosh/matbench-discovery/pull/85)
17+
- Add GNoME model [`#84`](https://github.com/janosh/matbench-discovery/pull/84)
18+
- Fix test scripts raising `wandb.Table` `AssertionError`: columns argument expects list of strings or ints [`#82`](https://github.com/janosh/matbench-discovery/pull/82)
19+
- Fix landing page vs model page metrics mismatch (#92) [`#91`](https://github.com/janosh/matbench-discovery/issues/91)
20+
- fix CaptionedMetricsTable proprietary models toggle [`64e97af`](https://github.com/janosh/matbench-discovery/commit/64e97af41f6e08e4c51cef394fb9c914b0af3830)
21+
- hide test_set_std_key from <Select /> in Per-Element Model Error Heatmaps on /models page [`07555b5`](https://github.com/janosh/matbench-discovery/commit/07555b54733164090c033bb8c186c7ef1443d605)
22+
- fix pymatviz bin_df_cols util imports + ruff fixes + bump site deps [`a3b4362`](https://github.com/janosh/matbench-discovery/commit/a3b43624b5bba0562bdbf5b0fb9fc15cefb8ffbe)
23+
- bump ruff target-version = "py311" [`e8a4444`](https://github.com/janosh/matbench-discovery/commit/e8a4444741da9996fcc2fa83f73b035ad219fab8)
24+
- add module doc string with installation instructions to train_mace.py [`29eecf2`](https://github.com/janosh/matbench-discovery/commit/29eecf28f756289e4b8a286d00e7c20d219e496a)
25+
- plot script fixes [`202a305`](https://github.com/janosh/matbench-discovery/commit/202a3058d428dc7867ba6b0105d087cf29c7e130)
26+
- change TL;DR to MP non-endorsement disclaimer [`016e71f`](https://github.com/janosh/matbench-discovery/commit/016e71fac0040edaad2b73df8aeea61e5097d453)
27+
- fix and unignore ruff DTZ005 FBT001 FBT002 [`0249327`](https://github.com/janosh/matbench-discovery/commit/0249327b6b5a1eb7578b99ea95613d50d2465392)
28+
- fix email and MP DB version used for convex hull construction in list of WBM processing steps [`1cc9fe6`](https://github.com/janosh/matbench-discovery/commit/1cc9fe614f431fd9fdae96512dc7bbde5137c81c)
29+
- fix model stats JSON export in compile_model_stats.py and use model-stats-uniq-protos.json on landing page to match metrics table [`4d40cd6`](https://github.com/janosh/matbench-discovery/commit/4d40cd61eb529d0242756ccb5a0cd87f732e4b59)
30+
- bump ruff pre-commit to 0.3.0 + auto-fixes [`71a5edc`](https://github.com/janosh/matbench-discovery/commit/71a5edc666a50bcab757bd5211886610677ab24e)
31+
- fix metrics-table horizontal scrolling [`a5a7bda`](https://github.com/janosh/matbench-discovery/commit/a5a7bdaefc781a14453aa604689e5131425ee67a)
32+
- fix copy-paste error of trained_by section in gnome.yml [`0ade5d6`](https://github.com/janosh/matbench-discovery/commit/0ade5d65a3544502649b00f756c984125463fe38)
33+
534
#### [v1.1.1](https://github.com/janosh/matbench-discovery/compare/v1.1.0...v1.1.1)
635

736
> 28 January 2024

matbench_discovery/metrics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def stable_metrics(
122122
if TPR + FNR != 1: # sanity check: true positives + false negatives = all positives
123123
raise ValueError(f"{TPR=} {FNR=} don't add up to 1")
124124

125-
# Drop NaNs to calculat the regression metrics
125+
# Drop NaNs to calculate regression metrics
126126
is_nan = np.isnan(each_true) | np.isnan(each_pred)
127127
each_true, each_pred = np.array(each_true)[~is_nan], np.array(each_pred)[~is_nan]
128128

models/wrenformer/analyze_wrenformer.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@
7575
styler = df_proto_counts.head(10).style.background_gradient(cmap="viridis")
7676
styler.set_caption(f"Top 10 {proto_col} in {len(df_bad)} {model} failures")
7777
display(styler)
78-
df_to_html_table(styler, f"{SITE_FIGS}/proto-counts-{model_low}-failures.svelte")
79-
df_to_pdf(styler, f"{PDF_FIGS}/proto-counts-{model_low}-failures.pdf")
78+
img_name = f"proto-counts-{model_low}-failures"
79+
df_to_html_table(styler, file_path=f"{SITE_FIGS}/{img_name}.svelte")
80+
df_to_pdf(styler, f"{PDF_FIGS}/{img_name}.pdf")
8081

8182

8283
# %%

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "matbench-discovery"
7-
version = "1.1.1"
7+
version = "1.1.2"
88
description = "A benchmark for machine learning energy models on inorganic crystal stability prediction from unrelaxed structures"
99
authors = [{ name = "Janosh Riebesell", email = "janosh.riebesell@gmail.com" }]
1010
readme = "readme.md"

scripts/model_figs/metrics_tables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
}"""
184184
df_to_html_table(
185185
styler,
186-
f"{SITE_FIGS}/metrics-table{label}.svelte",
186+
file_path=f"{SITE_FIGS}/metrics-table{label}.svelte",
187187
inline_props="class='metrics'",
188188
# draw line between classification and regression metrics
189189
styles=f"{col_selector} {{ border-left: 1px solid white; }}{hide_scroll_bar}",

scripts/upload_to_figshare.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def make_request(
3636
headers = {"Authorization": f"token {TOKEN}"}
3737
if data is not None and not binary:
3838
data = json.dumps(data)
39-
response = requests.request(method, url, headers=headers, data=data)
39+
response = requests.request(method, url, headers=headers, data=data, timeout=10)
4040
try:
4141
response.raise_for_status()
4242
try:

site/src/routes/preprint/references.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -859,8 +859,7 @@ references:
859859
source: Cambridge University Press
860860
title: 'NOMAD: The FAIR concept for big data-driven materials science'
861861
title-short: NOMAD
862-
URL: >-
863-
https://www.cambridge.org/core/journals/mrs-bulletin/article/nomad-the-fair-concept-for-big-datadriven-materials-science/1EEF321F62D41997CA16AD367B74C4B0
862+
URL: https://doi.org/10.1557/mrs.2018.208
864863
volume: '43'
865864

866865
- id: dunn_benchmarking_2020
@@ -1184,7 +1183,7 @@ references:
11841183
Commentary: The Materials Project: A materials genome approach to
11851184
accelerating materials innovation
11861185
title-short: Commentary
1187-
URL: https://aip.scitation.org/doi/10.1063%2F1.4812323
1186+
URL: https://doi.org/10.1063/1.4812323
11881187
volume: '1'
11891188

11901189
- id: kovacs_evaluation_2023
@@ -1451,8 +1450,7 @@ references:
14511450
title: >-
14521451
Direction-based Graph Representation to Accelerate Stable Catalysts
14531452
Discovery
1454-
URL: >-
1455-
https://chemrxiv.org/engage/chemrxiv/article-details/633660f9114b7ebf1a229015
1453+
URL: https://doi.org/10.26434/chemrxiv-2022-dp58c
14561454

14571455
- id: park_developing_2020
14581456
accessed:

tests/test_plots.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
AxLine = Literal["x", "y", "xy", ""]
2020
models = ["MEGNet", "CGCNN", "Voronoi RF"]
21-
df_wbm = load_df_wbm_with_preds(models, nrows=100)
21+
df_wbm = load_df_wbm_with_preds(models=models, nrows=100)
2222

2323

2424
@pytest.mark.parametrize(

tests/test_preds.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def test_df_each_err() -> None:
4646

4747
@pytest.mark.parametrize("models", [[], ["Wrenformer"]])
4848
def test_load_df_wbm_with_preds(models: list[str]) -> None:
49-
df = load_df_wbm_with_preds(models)
49+
df = load_df_wbm_with_preds(models=models)
5050
assert len(df) == len(df_wbm)
5151
assert list(df) == list(df_wbm) + models + [f"{model}_std" for model in models]
5252
assert df.index.name == Key.mat_id

0 commit comments

Comments
 (0)