Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d573f71
Readd aims magnetism test
tpurcell90 Mar 10, 2025
6670b74
Update pymatgen version
tpurcell90 Mar 10, 2025
aca6756
Merge branch 'main' into aims_magnetic_test_unskip
tpurcell90 Mar 10, 2025
02fd3ca
Merge branch 'main' into aims_magnetic_test_unskip
esoteric-ephemera Aug 12, 2025
75f5002
Merge branch 'main' into aims_magnetic_test_unskip
tpurcell90 Aug 13, 2025
1d569b6
Fixes magnetic test if latest pymatgen/pymatgen-io-aims installed
tpurcell90 Aug 19, 2025
24c00e7
Merge branch 'main' into aims_magnetic_test_unskip
tpurcell90 Aug 19, 2025
109c308
Add FHI-aims dep to testing
tpurcell90 Aug 20, 2025
4763606
add pymatgen dependence to aims
esoteric-ephemera Oct 7, 2025
8703a4a
Merge remote-tracking branch 'upstream/main' into aims_magnetic_test_…
esoteric-ephemera Oct 7, 2025
6dff5c4
temp emmet core upper pin
esoteric-ephemera Oct 7, 2025
079c483
add aims to strict
esoteric-ephemera Oct 7, 2025
816c299
migrate import statement
esoteric-ephemera Oct 7, 2025
7ec66d0
Fix errors from new pymatgen interface
tpurcell90 Oct 16, 2025
213652b
Merge branch 'main' into aims_magnetic_test_unskip
tpurcell90 Oct 16, 2025
e7d8c0a
modify pyproject to see why there is the conflict
tpurcell90 Oct 16, 2025
7e523b8
Merge branch 'aims_magnetic_test_unskip' of github.com:tpurcell90/ato…
tpurcell90 Oct 16, 2025
63dfaaf
Remove pymatgen <2025.10.7 from pyproject
tpurcell90 Oct 16, 2025
566caf1
Add aims dep to another set of tests
tpurcell90 Oct 16, 2025
73b7616
bump pymatgen-io-aims version again
tpurcell90 Oct 16, 2025
e29e424
Update pyproject to test if errors persist
tpurcell90 Oct 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
python -m pip install --upgrade pip
mkdir -p ~/.abinit/pseudos
cp -r tests/test_data/abinit/pseudos/ONCVPSP-PBE-SR-PDv0.4 ~/.abinit/pseudos
uv pip install .[strict,strict-forcefields,tests,abinit,approxneb]
uv pip install .[strict,strict-forcefields,tests,abinit,approxneb,aims]
uv pip install torch-runstats torch_dftd
uv pip install --no-deps nequip==0.5.6

Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
test-notebooks-and-ase:
# prevent this action from running on forks
if: github.repository == 'materialsproject/atomate2'

# It seems like anything torch-dependent and tblite can't be installed in the same environment
# without the tblite tests failing in CI, see, e.g.:
# https://github.com/tblite/tblite/issues/116
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
run: |
micromamba activate a2
python -m pip install --upgrade pip
uv pip install .[strict,tests]
uv pip install .[strict,tests,aims]
uv pip install tblite>=0.4.0

- name: Install pymatgen from master if triggered by pymatgen repo dispatch
Expand Down Expand Up @@ -267,7 +267,7 @@ jobs:
python -m pip install --upgrade pip
mkdir -p ~/.abinit/pseudos
cp -r tests/test_data/abinit/pseudos/ONCVPSP-PBE-SR-PDv0.4 ~/.abinit/pseudos
uv pip install .[strict,strict-forcefields,tests,abinit]
uv pip install .[strict,strict-forcefields,tests,abinit,aims]
uv pip install torch-runstats
uv pip install --no-deps nequip==0.5.6

Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ dependencies = [
"numpy",
"pydantic-settings>=2.0.3",
"pydantic>=2.0.1",
"pymatgen>=2024.11.13,<2025.10.7",
"pymatgen>=2024.11.13",
"pymongo<=4.10.1",
]

[project.optional-dependencies]
abinit = ["abipy>=0.9.3"]
aims = ["pymatgen-io-aims>=0.0.5", "pymatgen>=2025.10.7"]
amset = ["amset>=0.4.15", "pydash"]
cclib = ["cclib>=1.8.1"]
mp = ["mp-api>=0.37.5"]
Expand Down
2 changes: 1 addition & 1 deletion src/atomate2/aims/jobs/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

from jobflow import Response, job
from monty.serialization import dumpfn
from pymatgen.io.aims.parsers import read_aims_output
from pyfhiaims.external_interfaces.ase.io import read_aims_output
from pymatgen.io.aims.sets.bs import BandStructureSetGenerator, GWSetGenerator
from pymatgen.io.aims.sets.core import (
RelaxSetGenerator,
Expand Down
6 changes: 3 additions & 3 deletions tests/aims/species_dir/light/25_Mn_default
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
# hydro 5 g 10.8
# hydro 3 s 3.8
# "Third tier" - improvements: -1.38 meV to -0.13 meV
# hydro 5 p 8.6 -1.38 meV
# hydro 6 h 16 -0.73 meV
# hydro 3 d 10.8 -0.43 meV
# hydro 5 p 8.6
# hydro 6 h 16
# hydro 3 d 10.8
# hydro 5 f 6.8 # forced: -0.26 meV
# hydro 5 g 6.4 # forced: -0.21 meV
# hydro 5 s 9.8 # forced: -0.13 meV
Expand Down
2 changes: 1 addition & 1 deletion tests/aims/test_flows/test_eos.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,6 @@ def test_eos_from_parameters(mock_aims, tmp_path, si, species_dir):
assert len(output["relax"]["energy"]) == 5
# the initial calculation also participates in the fit here
assert output["relax"]["EOS"]["birch_murnaghan"]["b0"] == pytest.approx(
0.5189578108402951,
0.5188838108657945,
rel=1e-4,
)
12 changes: 3 additions & 9 deletions tests/aims/test_flows/test_magnetism.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,7 @@
cwd = os.getcwd()


@pytest.mark.skip(
reason="pymatgen 2024.11.13 broke this test with ValueError: Structure contains "
"magnetic moments on both magmom site properties and spin species properties. This "
"is ambiguous. Remove one or the other."
)
# TODO re-attempt to fix and unskip this test
def test_magnetic_orderings(mock_aims, tmp_path, species_dir, mg2mn4o8):
def test_magnetic_orderings(mock_aims, species_dir, mg2mn4o8):
parameters = {
"k_grid": [2, 2, 2],
"species_dir": (species_dir / "light").as_posix(),
Expand Down Expand Up @@ -50,9 +44,9 @@ def test_magnetic_orderings(mock_aims, tmp_path, species_dir, mg2mn4o8):

flow = maker.make(mg2mn4o8)

os.chdir(tmp_path)
# os.chdir(tmp_path)
responses = run_locally(flow, create_folders=True, ensure_success=True)
os.chdir(cwd)
# os.chdir(cwd)

final_output = responses[flow.jobs[-1].uuid][1].output

Expand Down
2 changes: 1 addition & 1 deletion tests/aims/test_makers/test_gw.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ def test_gw_maker_molecule(tmp_dir, species_dir, mock_aims, o2):
# validation the outputs of the job (maybe add gw energy levels as well)
output1 = responses[job.uuid][1].output
assert isinstance(output1, AimsTaskDoc)
assert output1.output.energy == pytest.approx(-4092.0702534)
assert output1.output.energy == pytest.approx(-4092.12667244759)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading