Skip to content

Commit 8ce99d6

Browse files
committed
clean: mat_bench -> matbench
1 parent c566e07 commit 8ce99d6

File tree

8 files changed

+16
-15
lines changed

8 files changed

+16
-15
lines changed

examples/wrenformer/mat_bench/compare_spglib_vs_aflow_wyckoff_labels.py renamed to examples/wrenformer/matbench/compare_spglib_vs_aflow_wyckoff_labels.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from tqdm import tqdm
1414

1515
from aviary import ROOT
16-
from examples.wrenformer.mat_bench import DATA_PATHS
16+
from examples.wrenformer.matbench import DATA_PATHS
1717

1818
__author__ = "Janosh Riebesell"
1919
__date__ = "2022-05-17"

examples/wrenformer/mat_bench/make_plots.py renamed to examples/wrenformer/matbench/make_plots.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
import pandas as pd
1212
import plotly.express as px
1313
import pymatviz as pmv
14-
from matbench import MatbenchBenchmark
15-
from matbench.constants import CLF_KEY, REG_KEY
16-
from matbench.metadata import mbv01_metadata as matbench_metadata
1714
from sklearn.metrics import r2_score, roc_auc_score
1815

19-
from examples.wrenformer.mat_bench import DATA_PATHS
20-
from examples.wrenformer.mat_bench.plotting_functions import (
16+
from examples.wrenformer.matbench import DATA_PATHS
17+
from examples.wrenformer.matbench.plotting_functions import (
2118
dataset_labels_html,
2219
error_heatmap,
2320
plot_leaderboard,
2421
scale_errors,
2522
)
26-
from examples.wrenformer.mat_bench.utils import recursive_dict_merge
23+
from examples.wrenformer.matbench.utils import recursive_dict_merge
24+
from matbench import MatbenchBenchmark
25+
from matbench.constants import CLF_KEY, REG_KEY
26+
from matbench.metadata import mbv01_metadata as matbench_metadata
2727

2828
__author__ = "Janosh Riebesell"
2929
__date__ = "2022-04-25"

examples/wrenformer/mat_bench/plotting_functions.py renamed to examples/wrenformer/matbench/plotting_functions.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
import numpy as np
66
import plotly.express as px
77
import plotly.io as pio
8+
from sklearn.metrics import accuracy_score, auc, roc_curve
9+
810
from matbench.constants import CLF_KEY, REG_KEY
911
from matbench.metadata import mbv01_metadata
1012
from matbench.metadata import mbv01_metadata as matbench_metadata
11-
from sklearn.metrics import accuracy_score, auc, roc_curve
1213

1314
if TYPE_CHECKING:
1415
import pandas as pd
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This directory contains the files needed to create Matbench submissions for Roos
44

55
Added in [aviary#44](https://github.com/CompRhys/aviary/pull/44).
66

7-
Directory is named `mat_bench` to avoid shadowing the `matbench` package.
7+
Directory is named `matbench` to avoid shadowing the `matbench` package.
88

99
The important files are:
1010

@@ -25,7 +25,7 @@ According to Rhys, Wren could run 500 epochs in 5.5 h on a P100 training on 120k
2525
```py
2626
import pandas as pd
2727
from pymatgen.analysis.prototypes import count_wyckoff_positions
28-
from examples.wrenformer.mat_bench import DATA_PATHS
28+
from examples.wrenformer.matbench import DATA_PATHS
2929

3030
df = pd.read_json(DATA_PATHS["matbench_mp_e_form"])
3131

examples/wrenformer/mat_bench/save_matbench_aflow_labels.py renamed to examples/wrenformer/matbench/save_matbench_aflow_labels.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import pandas as pd
2-
from matbench import MatbenchBenchmark
32
from pymatgen.analysis.prototypes import get_protostructure_label_from_spglib
43
from tqdm import tqdm
54

65
from aviary import ROOT
6+
from matbench import MatbenchBenchmark
77

88
__author__ = "Janosh Riebesell"
99
__date__ = "2022-04-11"

examples/wrenformer/mat_bench/train_wrenformer.py renamed to examples/wrenformer/matbench/train_wrenformer.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
import pandas as pd
77
import wandb
8-
from matbench.metadata import mbv01_metadata
9-
from matbench.task import MatbenchTask
108
from matbench_discovery.slurm import slurm_submit
119

1210
from aviary.core import TaskType
1311
from aviary.train import train_wrenformer
14-
from examples.wrenformer.mat_bench import DATA_PATHS
15-
from examples.wrenformer.mat_bench.utils import merge_json_on_disk
12+
from examples.wrenformer.matbench import DATA_PATHS
13+
from examples.wrenformer.matbench.utils import merge_json_on_disk
14+
from matbench.metadata import mbv01_metadata
15+
from matbench.task import MatbenchTask
1616

1717
__author__ = "Janosh Riebesell"
1818
__date__ = "2022-04-11"

0 commit comments

Comments
 (0)