Skip to content

Commit 1cc9fe6

Browse files
committed
fix email and MP DB version used for convex hull construction in list of WBM processing steps
1 parent 3f6c798 commit 1cc9fe6

16 files changed

+45
-24
lines changed

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ default_install_hook_types: [pre-commit, commit-msg]
77

88
repos:
99
- repo: https://github.com/astral-sh/ruff-pre-commit
10-
rev: v0.1.15
10+
rev: v0.2.0
1111
hooks:
1212
- id: ruff
1313
args: [--fix]

citation.cff

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ authors:
66
- given-names: Janosh
77
family-names: Riebesell
88
affiliation: University of Cambridge, Lawrence Berkeley National Laboratory
9-
email: janosh.riebesell@gmail.gov
9+
email: janosh.riebesell@gmail.com
1010
orcid: https://orcid.org/0000-0001-5233-3462
1111
corresponding: true
1212
affil_key: 1, 2

data/mp/eda_mp_trj.py

+18-1
Original file line numberDiff line numberDiff line change
@@ -477,8 +477,25 @@ def tile_count_anno(hist_vals: list[Any]) -> dict[str, Any]:
477477
)
478478
fig.layout.xaxis3 = dict(overlaying="x2", visible=False)
479479

480+
# project line from 90% cumulative to x axis
481+
x_90 = df_n_sites[Key.n_sites][
482+
(df_n_sites[n_struct_col].cumsum() / df_n_sites[n_struct_col].sum()) < 0.9
483+
].iloc[-1]
484+
for x0, y0, x1, y1 in (
485+
(x_90, 0, x_90, 0.9),
486+
(x_90, 0.9, df_n_sites[Key.n_sites].max(), 0.9),
487+
):
488+
fig.add_shape(
489+
type="line",
490+
**dict(x0=x0, y0=y0, x1=x1, y1=y1),
491+
line=dict(width=1, dash="dot"),
492+
xref="x3",
493+
yref="y3",
494+
)
495+
fig.layout.yaxis3.update(showgrid=False, rangemode="tozero")
496+
480497
fig.layout.margin = dict(l=5, r=5, b=5, t=5)
481-
fig.layout.legend.update(x=0.96, y=0.25, xanchor="right")
498+
fig.layout.legend.update(x=0.96, y=0.18, xanchor="right", bgcolor="rgba(0,0,0,0)")
482499
fig.show()
483500

484501
img_name = "mp-trj-n-sites-hist"

data/wbm/compile_wbm_test_set.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ def increment_wbm_material_id(wbm_id: str) -> str:
314314
df_summary_bz2.reset_index(drop=True).query(query_str),
315315
)
316316

317-
318-
assert sum(no_id_mask := df_summary.index.isna()) == 6, f"{sum(no_id_mask)=}"
317+
no_id_mask = df_summary.index.isna()
318+
assert sum(no_id_mask) == 6, f"{sum(no_id_mask)=}"
319319
# the 'None' materials have 0 volume, energy, n_sites, bandgap, etc.
320320
assert all(df_summary[no_id_mask].drop(columns=[Key.formula]) == 0)
321321
assert len(df_summary.query("volume > 0")) == len(df_wbm) + len(nan_init_structs_ids)

data/wbm/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The full set of processing steps used to curate the WBM test set from the raw da
2929
</slot>
3030

3131
- apply the [`MaterialsProject2020Compatibility`](https://github.com/materialsproject/pymatgen/blob/02a4ca8aa0277b5f6db11f4de4fdbba129de70a5/pymatgen/entries/compatibility.py#L823) energy correction scheme to the formation energies
32-
- compute energy to the Materials Project convex hull constructed from all MP `ComputedStructureEntries` queried on 2023-02-07 ([database release 2021.05.13](https://docs.materialsproject.org/changes/database-versions#v2021.05.13))
32+
- compute energy to the Materials Project convex hull constructed from all MP `ComputedStructureEntries` queried on 2023-02-07 ([database release 2022.10.28](https://docs.materialsproject.org/changes/database-versions#v2022.10.28))
3333

3434
Invoking the script `python compile_wbm_test_set.py` will auto-download and regenerate the WBM test set files from scratch. If you find
3535

models/chgnet/metadata.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ authors:
1515
orcid: https://orcid.org/0000-0003-1974-028X
1616
- name: Janosh Riebesell
1717
affiliation: University of Cambridge, Lawrence Berkeley National Laboratory
18-
email: janosh.riebesell@gmail.gov
18+
email: janosh.riebesell@gmail.com
1919
orcid: https://orcid.org/0000-0001-5233-3462
2020
- name: Kevin Han
2121
affiliation: UC Berkeley

models/voronoi/train_test_voronoi_rf.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
from matbench_discovery.slurm import slurm_submit
2020

2121
sys.path.append(f"{ROOT}/models")
22-
from voronoi import featurizer # noqa: E402
22+
23+
from voronoi import featurizer
2324

2425
__author__ = "Janosh Riebesell"
2526
__date__ = "2022-11-26"

models/voronoi/voronoi_featurize_dataset.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
from matbench_discovery.slurm import slurm_submit
2020

2121
sys.path.append(f"{ROOT}/models")
22-
from voronoi import featurizer # noqa: E402
22+
23+
from voronoi import featurizer
2324

2425
__author__ = "Janosh Riebesell"
2526
__date__ = "2022-10-31"

models/wrenformer/metadata.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ date_published: "2021-06-21"
66
authors:
77
- name: Janosh Riebesell
88
affiliation: University of Cambridge, Lawrence Berkeley National Laboratory
9-
email: janosh.riebesell@gmail.gov
9+
email: janosh.riebesell@gmail.com
1010
orcid: https://orcid.org/0000-0001-5233-3462
1111
- name: Rhys Goodall
1212
affiliation: University of Cambridge

pyproject.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ universal = true
7777

7878
[tool.ruff]
7979
target-version = "py39"
80-
select = ["ALL"]
81-
ignore = [
80+
lint.select = ["ALL"]
81+
lint.ignore = [
8282
"ANN101",
8383
"ANN401",
8484
"BLE001",
@@ -113,11 +113,11 @@ ignore = [
113113
"TRY003",
114114
"TRY301",
115115
]
116-
pydocstyle.convention = "google"
117-
isort.known-third-party = ["wandb"]
118-
isort.split-on-trailing-comma = false
116+
lint.pydocstyle.convention = "google"
117+
lint.isort.known-third-party = ["wandb"]
118+
lint.isort.split-on-trailing-comma = false
119119

120-
[tool.ruff.per-file-ignores]
120+
[tool.ruff.lint.per-file-ignores]
121121
"tests/*" = ["D", "S101"]
122122
"matbench_discovery/plots.py" = ["ERA001"] # allow commented out code
123123
"matbench_discovery/preds.py" = ["ERA001"] # allow commented out code

readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ Our results show that ML models have become robust enough to deploy them as tria
2727

2828
We welcome contributions that add new models to the leaderboard through GitHub PRs. See the [contributing guide](https://janosh.github.io/matbench-discovery/contribute) for details.
2929

30-
If you're interested in joining this work, feel free to [open a GitHub discussion](https://github.com/janosh/matbench-discovery/discussions) or [send an email](mailto:janosh.riebesell@gmail.gov?subject=Collaborate%20on%20Matbench%20Discovery).
30+
If you're interested in joining this work, feel free to [open a GitHub discussion](https://github.com/janosh/matbench-discovery/discussions) or [send an email](mailto:janosh.riebesell@gmail.com?subject=Collaborate%20on%20Matbench%20Discovery).
3131

3232
For detailed results and analysis, check out the [preprint](https://janosh.github.io/matbench-discovery/preprint).

site/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "matbench-discovery",
33
"description": "Benchmarking machine learning energy models for materials discovery.",
4-
"author": "Janosh Riebesell <janosh.riebesell@gmail.gov>",
4+
"author": "Janosh Riebesell <janosh.riebesell@gmail.com>",
55
"homepage": "https://janosh.github.io/matbench-discovery",
66
"repository": "https://github.com/janosh/matbench-discovery",
77
"package": "https://pypi.org/project/matbench-discovery",

site/src/figs/mp-trj-n-sites-hist.svelte

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

site/src/lib/Footer.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<footer>
2626
<nav>
2727
<a href="{repository}/issues">Issues</a>
28-
<a href="mailto:janosh.riebesell@gmail.gov?subject=Matbench Discovery">Contact</a>
28+
<a href="mailto:janosh.riebesell@gmail.com?subject=Matbench Discovery">Contact</a>
2929
<a href="/changelog">Changelog</a>
3030
<button
3131
on:click={() => (show_tips = true)}

site/src/routes/preprint/iclr-ml4mat/+page.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,15 @@ In contrast, we believe the discovery of stable materials is a problem where ML
6666

6767
## Data Sets
6868

69-
The choice of data for the train and test sets of this benchmark fell on the latest Materials Project (MP) @jain_commentary_2013 database release (2021.05.13 at time of writing) and the WBM dataset @wang_predicting_2021.
69+
The choice of data for the train and test sets of this benchmark fell on the latest Materials Project (MP) @jain_commentary_2013 database release ([2022.10.28] at time of writing) and the WBM dataset @wang_predicting_2021.
70+
71+
[2022.10.28]: https://docs.materialsproject.org/changes/database-versions#v2022.10.28
7072

7173
### The Materials Project - Training Set
7274

7375
The Materials Project is a well-known effort to calculate the properties of all inorganic materials using high-throughput ab-initio methods.
7476
At the time of access, the Materials Project database contains approximately 154k crystals (providing relaxed+initial structure and the relaxation trajectory for each of them) covering a diverse range of chemistries.
75-
For our benchmark, the training set is all data available from the 2021.05.13 MP release. Models are free to train on relaxed and/or unrelaxed structures or the full DFT relaxation trajectory. This flexibility is intended to allow authors to experiment and exploit the large variety of data available.
77+
For our benchmark, the training set is all data available from the [2022.10.28] MP release. Models are free to train on relaxed and/or unrelaxed structures or the full DFT relaxation trajectory. This flexibility is intended to allow authors to experiment and exploit the large variety of data available.
7678

7779
### WBM - Test Set
7880

site/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212

1313
"forceConsistentCasingInFileNames": true,
1414
"resolveJsonModule": true,
15-
"allowSyntheticDefaultImports": true,
16-
},
15+
"allowSyntheticDefaultImports": true
16+
}
1717
}

0 commit comments

Comments
 (0)