diff --git a/pyproject.toml b/pyproject.toml index 5d33f9a4ac..67f939b3fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -83,7 +83,8 @@ torchsim-mace = [ ] # mattersim can be added to torchsim-generic once they clean their dependencies torchsim-generic = [ - "torch-sim-atomistic[fairchem,metatomic,nequip,orb,sevenn,symmetry]==0.6.2; python_version >= '3.12'" + "torch-sim-atomistic[fairchem,metatomic,nequip,orb,sevenn,symmetry]==0.6.2; python_version >= '3.12'", + "grace-runtime[torchsim]>=0.1.4; python_version >= '3.12'", ] jdftx = ["pymatgen==2026.10.24"] approxneb = ["pymatgen-analysis-diffusion>=2024.7.15"] diff --git a/src/atomate2/torchsim/core.py b/src/atomate2/torchsim/core.py index 56ae0de316..1939d98402 100644 --- a/src/atomate2/torchsim/core.py +++ b/src/atomate2/torchsim/core.py @@ -366,6 +366,11 @@ def pick_model( ) match model_type: + case TorchSimModelType.GRACE: + from grace_runtime.torchsim import GRACERuntimeModel + + base_model = GRACERuntimeModel(model=model_path, **model_kwargs) + case TorchSimModelType.FAIRCHEM: from torch_sim.models.fairchem import FairChemModel diff --git a/src/atomate2/torchsim/schema.py b/src/atomate2/torchsim/schema.py index 26283171bd..8c799499d4 100644 --- a/src/atomate2/torchsim/schema.py +++ b/src/atomate2/torchsim/schema.py @@ -21,6 +21,7 @@ class TorchSimModelType(StrEnum): # type: ignore[attr-defined] """Enum for model types.""" FAIRCHEM = "FairChemModel" + GRACE = "GraceModel" MACE = "MaceModel" MATTERSIM = "MatterSimModel" METATOMIC = "MetatomicModel" diff --git a/tests/test_data/forcefields/grace/grace_1l_order3.npz b/tests/test_data/forcefields/grace/grace_1l_order3.npz new file mode 100644 index 0000000000..61ee87f2e6 Binary files /dev/null and b/tests/test_data/forcefields/grace/grace_1l_order3.npz differ diff --git a/tests/torchsim/conftest.py b/tests/torchsim/conftest.py index 745689c03f..f7625a4d8d 100644 --- a/tests/torchsim/conftest.py +++ b/tests/torchsim/conftest.py @@ -16,6 +16,7 @@ def _is_backend_missing(package_names: str | list[str]) -> bool: _SKIP_FAIRCHEM = _is_backend_missing("fairchem-core") +_SKIP_GRACE = _is_backend_missing("grace-runtime") _SKIP_MACE = _is_backend_missing("mace-torch") _SKIP_MATTERSIM = _is_backend_missing("mattersim") _SKIP_METATOMIC = _is_backend_missing(["metatomic_torchsim", "upet"]) diff --git a/tests/torchsim/test_core.py b/tests/torchsim/test_core.py index a13e3427b5..8ba3c06299 100644 --- a/tests/torchsim/test_core.py +++ b/tests/torchsim/test_core.py @@ -26,6 +26,7 @@ from .conftest import ( _SKIP_FAIRCHEM, + _SKIP_GRACE, _SKIP_MACE, _SKIP_MATTERSIM, _SKIP_METATOMIC, @@ -378,6 +379,12 @@ def test_pick_model_fairchem() -> None: pick_model(TorchSimModelType.FAIRCHEM, model_path="uma-s-1p1") +@pytest.mark.skipif(_SKIP_GRACE, reason="grace-runtime is not installed.") +def test_pick_model_grace(test_dir) -> None: + path = f"{test_dir}/forcefields/grace/grace_1l_order3.npz" + pick_model(TorchSimModelType.GRACE, model_path=path) + + @pytest.mark.skipif(_SKIP_MACE, reason="mace-torch is not installed.") def test_pick_model_mace(test_dir) -> None: path = f"{test_dir}/forcefields/mace/MACE.model"