Skip to content

Commit

Permalink
minor doc-string updates
Browse files Browse the repository at this point in the history
  • Loading branch information
naik-aakash committed Jan 21, 2025
1 parent 3526de6 commit 22169e0
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 22 deletions.
14 changes: 7 additions & 7 deletions src/autoplex/auto/rss/jobs.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""RSS Jobs include the generation of the initial potential model as well as iterative RSS exploration."""

import logging
from typing import Literal

from jobflow import Flow, Response, job

Expand Down Expand Up @@ -54,7 +55,7 @@ def initial_rss(
force_max: float | None = None,
force_label: str = "REF_forces",
pre_database_dir: str | None = None,
mlip_type: str = "GAP",
mlip_type: Literal["GAP", "J-ACE", "NEP", "NEQUIP", "M3GNET", "MACE"] = "GAP",
ref_energy_name: str = "REF_energy",
ref_force_name: str = "REF_forces",
ref_virial_name: str = "REF_virial",
Expand Down Expand Up @@ -137,9 +138,8 @@ def initial_rss(
The label of force values to use for distillation. Default is 'REF_forces'.
pre_database_dir: str | None
Directory where the previous database was saved. Default is None.
mlip_type: str
Choose one specific MLIP type to be fitted: 'GAP' | 'J-ACE' | 'NEQUIP' | 'M3GNET' | 'MACE'.
Default is 'GAP'.
mlip_type: Literal["GAP", "J-ACE", "NEP", "NEQUIP", "M3GNET", "MACE"]
Choose one specific MLIP type to be fitted. Default is 'GAP'.
ref_energy_name: str
Reference energy name. Default is 'REF_energy'.
ref_force_name: str
Expand Down Expand Up @@ -286,7 +286,7 @@ def do_rss_iterations(
distillation: bool = True,
force_max: float = 200,
force_label: str = "REF_forces",
mlip_type: str = "GAP",
mlip_type: Literal["GAP", "J-ACE", "NEP", "NEQUIP", "M3GNET", "MACE"] = "GAP",
ref_energy_name: str = "REF_energy",
ref_force_name: str = "REF_forces",
ref_virial_name: str = "REF_virial",
Expand Down Expand Up @@ -409,8 +409,8 @@ def do_rss_iterations(
Maximum force value to exclude structures. Default is 200.
force_label: str
The label of force values to use for distillation. Default is 'REF_forces'.
mlip_type: str
Choose one specific MLIP type: 'GAP' | 'J-ACE' | 'NequIP' | 'M3GNet' | 'MACE'. Default is 'GAP'.
mlip_type: Literal["GAP", "J-ACE", "NEP", "NEQUIP", "M3GNET", "MACE"]
Choose one specific MLIP type to be fitted. Default is 'GAP'.
ref_energy_name: str
Reference energy name. Default is 'REF_energy'.
ref_force_name: str
Expand Down
15 changes: 7 additions & 8 deletions src/autoplex/data/rss/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from pathlib import Path
from shutil import which
from subprocess import run
from typing import Literal

import ase.io
import numpy as np
Expand Down Expand Up @@ -413,7 +414,7 @@ def _parallel_process(

@job
def do_rss_single_node(
mlip_type: str,
mlip_type: Literal["GAP", "J-ACE", "NEP", "NEQUIP", "M3GNET", "MACE"],
mlip_path: str,
iteration_index: str,
structures: list[Structure],
Expand Down Expand Up @@ -441,9 +442,8 @@ def do_rss_single_node(
Parameters
----------
mlip_type: str
Choose one specific MLIP type:
'GAP' | 'J-ACE' | 'NequIP' | 'M3GNet' | 'MACE'.
mlip_type: Literal["GAP", "J-ACE", "NEP", "NEQUIP", "M3GNET", "MACE"]
Choose one specific MLIP type to be fitted.
mlip_path: str
Path to the MLIP model.
iteration_index: str
Expand Down Expand Up @@ -521,7 +521,7 @@ def do_rss_single_node(

@job
def do_rss_multi_node(
mlip_type: str,
mlip_type: Literal["GAP", "J-ACE", "NEP", "NEQUIP", "M3GNET", "MACE"],
mlip_path: str,
iteration_index: str,
structure: list[Structure] | list[list[Structure]] | None = None,
Expand Down Expand Up @@ -550,9 +550,8 @@ def do_rss_multi_node(
Parameters
----------
mlip_type: str
Choose one specific MLIP type:
'GAP' | 'J-ACE' | 'NequIP' | 'M3GNet' | 'MACE'.
mlip_type: Literal["GAP", "J-ACE", "NEP", "NEQUIP", "M3GNET", "MACE"]
Choose one specific MLIP type to be fitted.
mlip_path: str
Path to the MLIP model.
iteration_index: str
Expand Down
7 changes: 3 additions & 4 deletions src/autoplex/data/rss/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ def build_traj():


def minimize_structures(
mlip_type: str,
mlip_type: Literal["GAP", "J-ACE", "NEP", "NEQUIP", "M3GNET", "MACE"],
mlip_path: str,
iteration_index: str,
structures: list[Structure],
Expand All @@ -580,9 +580,8 @@ def minimize_structures(
Parameters
----------
mlip_type: str
Choose one specific MLIP type:
'GAP' | 'J-ACE' | 'NequIP' | 'M3GNet' | 'MACE'.
mlip_type: Literal["GAP", "J-ACE", "NEP", "NEQUIP", "M3GNET", "MACE"]
Choose one specific MLIP type to be fitted.
mlip_path: str
Path to the MLIP model.
iteration_index: str
Expand Down
5 changes: 2 additions & 3 deletions src/autoplex/fitting/common/flows.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ class MLIPFitMaker(Maker):
----------
name : str
Name of the flows produced by this maker.
mlip_type: str
Choose one specific MLIP type to be fitted:
'GAP' | 'J-ACE' | 'NEQUIP' | 'M3GNET' | 'MACE'
mlip_type: Literal["GAP", "J-ACE", "NEP", "NEQUIP", "M3GNET", "MACE"]
Choose one specific MLIP type to be fitted.
hyperpara_opt: bool
Perform hyperparameter optimization using XPOT
(XPOT: https://pubs.aip.org/aip/jcp/article/159/2/024803/2901815)
Expand Down

0 comments on commit 22169e0

Please sign in to comment.