Skip to content

Commit 40385b9

Browse files
committed
Merge branch 'main' of https://github.com/ulissigroup/finetuna into main
2 parents 8577c98 + 79ddb58 commit 40385b9

File tree

11 files changed

+5
-10
lines changed

11 files changed

+5
-10
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ You are all set! Now in your VASP input folder, run the calculation by: `finetun
2828

2929
### Usage
3030

31-
If you have an ASE atoms object, see example [1](https://github.com/ulissigroup/finetuna/blob/main/examples/online_al_example.py) and [2](https://github.com/ulissigroup/finetuna/blob/main/examples/online_al_beef_example.py).
31+
If you have an ASE atoms object, see example [1](https://github.com/ulissigroup/finetuna/blob/main/examples/online_al/online_al_example.py) and [2](https://github.com/ulissigroup/finetuna/blob/main/examples/beef/online_al_beef_example.py).
3232

3333
If you have VASP input files (INCAR, KPOINTS, POTCAR, and POSCAR), see example [3](https://github.com/ulissigroup/finetuna/tree/main/finetuna/vasp_wrapper).

examples/N2H_Ag111_dissociation/N2H_Ag111.py

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from finetuna.utils import calculate_surface_k_points
88

99
if __name__ == "__main__":
10-
1110
traj = Trajectory("N2H_Ag111.traj") # change this path to your trajectory file
1211

1312
ml_potential = FinetunerCalc(

examples/beef/online_al_beef_example.py

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
vasp_inputs["ibrion"] = -1
7272

7373
with VaspInteractive(**vasp_inputs) as parent_calc:
74-
7574
learner = OnlineLearner(
7675
learner_params={
7776
"query_every_n_steps": 100,

examples/online_al/online_al_example.py

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from finetuna.utils import calculate_surface_k_points
88

99
if __name__ == "__main__":
10-
1110
traj = Trajectory("random1447590.traj") # change this path to your trajectory file
1211

1312
ml_potential = FinetunerCalc(

examples/quantum_espresso/qe_gpu_online_al_example.py

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import os
1616

1717
if __name__ == "__main__":
18-
1918
traj = Trajectory("ch3_cu_final.traj") # change this path to your trajectory file
2019

2120
ml_potential = FinetunerCalc(

finetuna/atomistic_methods.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ def __init__(self, starting_images, intermediate_samples=3):
2323
----------
2424
starting_images: list. Initial and final images to be used for the NEB.
2525
26-
intermediate_samples: int. Number of intermediate samples to be used in constructing the NEB"""
26+
intermediate_samples: int. Number of intermediate samples to be used in constructing the NEB
27+
"""
2728

2829
self.starting_images = copy.deepcopy(starting_images)
2930
self.intermediate_samples = intermediate_samples

finetuna/finetuner_utils/utils.py

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ def close_db(self):
2626
from ocpmodels.common.registry import registry
2727
from ocpmodels.models.gemnet.gemnet import GemNetT
2828

29+
2930
# imported in __init__.py
3031
@registry.register_model("gemnet_t_uncertainty")
3132
class GemNetTUncertainty(GemNetT):

finetuna/ml_potentials/finetuner_ensemble_calc.py

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ def __init__(
4848
checkpoint_paths: "list[str]",
4949
mlp_params: dict = {},
5050
) -> None:
51-
5251
# self.model_classes = model_classes
5352
# self.model_paths = model_paths
5453
self.checkpoint_paths = checkpoint_paths

finetuna/mongo.py

-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ def _make_results_dict(atoms):
200200
# Results. This may duplicate information in the calculator,
201201
# but we have no control on what the calculator does.
202202
if calculator:
203-
204203
if not calculator.calculation_required(atoms, ["energy"]):
205204
results_dict["energy"] = atoms.get_potential_energy(apply_constraint=False)
206205

finetuna/ocp_models/gemnet_t/int_descriptor_gemnet_t.py

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ def __init__(
2121
checkpoint_path,
2222
cpu=True,
2323
):
24-
2524
if cpu:
2625
map_location = torch.device("cpu")
2726
else:

finetuna/tests/cases/online_ft_gemnet_oc_CuNP_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ def get_al_config(cls) -> dict:
3131
},
3232
}
3333
al_config["ocp"] = {
34-
"checkpoint_path": "/home/jovyan/shared-scratch/ocp_checkpoints/for_finetuna/public_checkpoints/scaling_attached/gemnet_oc_base_oc20_oc22_attscale.pt",
34+
"checkpoint_path": "/home/jovyan/shared-scratch/ocp_checkpoints/for_finetuna/new_public_checkpoints/gnoc_finetune_all_s2ef.pt",
3535
}
3636
return al_config

0 commit comments

Comments
 (0)