Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new code structure #34

Merged
merged 1 commit into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Empty file added __init__.py
Empty file.
Empty file.
8 changes: 4 additions & 4 deletions autoplex/auto/flows.py → autoplex/auto/phonons/flows.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@

from jobflow import Flow, Maker

from autoplex.auto.jobs import (
from autoplex.auto.phonons.jobs import (
dft_phonopy_gen_data,
dft_random_gen_data,
get_iso_atom,
get_phonon_ml_calculation_jobs,
)
from autoplex.benchmark.flows import PhononBenchmarkMaker
from autoplex.benchmark.jobs import write_benchmark_metrics
from autoplex.data.flows import DFTPhononMaker, TightDFTStaticMaker
from autoplex.benchmark.phonons.flows import PhononBenchmarkMaker
from autoplex.benchmark.phonons.jobs import write_benchmark_metrics
from autoplex.data.phonons.flows import DFTPhononMaker, TightDFTStaticMaker
from autoplex.fitting.flows import MLIPFitMaker

__all__ = [
Expand Down
2 changes: 1 addition & 1 deletion autoplex/auto/jobs.py → autoplex/auto/phonons/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from emmet.core.math import Matrix3D
from pymatgen.core.structure import Structure

from autoplex.data.flows import IsoAtomMaker, RandomStructuresDataGenerator
from autoplex.data.phonons.flows import IsoAtomMaker, RandomStructuresDataGenerator


@dataclass
Expand Down
Empty file added autoplex/auto/rss/__init__.py
Empty file.
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from pymatgen.core.structure import Structure
from pymatgen.phonon.bandstructure import PhononBandStructureSymmLine

from autoplex.benchmark.jobs import compute_bandstructure_benchmark_metrics
from autoplex.benchmark.phonons.jobs import compute_bandstructure_benchmark_metrics

__all__ = ["PhononBenchmarkMaker"]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from pymatgen.core.structure import Structure
from pymatgen.phonon.bandstructure import PhononBandStructureSymmLine

from autoplex.benchmark.utils import compare_plot, get_rmse, rmse_kdep_plot
from autoplex.benchmark.phonons.utils import compare_plot, get_rmse, rmse_kdep_plot


@job
Expand Down
File renamed without changes.
Empty file.
Empty file.
2 changes: 1 addition & 1 deletion autoplex/data/flows.py → autoplex/data/phonons/flows.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from pymatgen.core import Molecule, Site
from pymatgen.io.phonopy import get_phonopy_structure, get_pmg_structure

from autoplex.data.jobs import generate_randomized_structures
from autoplex.data.phonons.jobs import generate_randomized_structures

__all__ = [
"DFTPhononMaker",
Expand Down
File renamed without changes.
File renamed without changes.
Empty file added autoplex/data/rss/__init__.py
Empty file.
4 changes: 2 additions & 2 deletions tests/auto/test_auto_flows.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
from monty.serialization import loadfn
from atomate2.common.schemas.phonons import PhononBSDOSDoc
from pymatgen.core.structure import Structure
from autoplex.data.flows import TightDFTStaticMaker
from autoplex.auto.flows import (
from autoplex.data.phonons.flows import TightDFTStaticMaker
from autoplex.auto.phonons.flows import (
CompleteDFTvsMLBenchmarkWorkflow,
DFTDataGenerationFlow,
)
Expand Down
2 changes: 1 addition & 1 deletion tests/auto/test_auto_jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import os
from unittest import mock
from pymatgen.core.structure import Structure
from autoplex.auto.jobs import (
from autoplex.auto.phonons.jobs import (
get_phonon_ml_calculation_jobs,
get_iso_atom,
dft_phonopy_gen_data,
Expand Down
2 changes: 1 addition & 1 deletion tests/benchmark/test_benchmark_flows.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations

import pytest
from autoplex.benchmark.flows import PhononBenchmarkMaker
from autoplex.benchmark.phonons.flows import PhononBenchmarkMaker
from pymatgen.io.phonopy import get_ph_bs_symm_line


Expand Down
2 changes: 1 addition & 1 deletion tests/benchmark/test_benchmark_jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from pymatgen.core.structure import Structure
from pymatgen.io.phonopy import get_ph_bs_symm_line
from pymatgen.phonon.bandstructure import PhononBandStructureSymmLine
from autoplex.benchmark.jobs import (
from autoplex.benchmark.phonons.jobs import (
compute_bandstructure_benchmark_metrics,
write_benchmark_metrics,
)
Expand Down
2 changes: 1 addition & 1 deletion tests/data/test_datagen_flows.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from pymatgen.core.structure import Structure
from atomate2.vasp.powerups import update_user_incar_settings
from autoplex.data.flows import RandomStructuresDataGenerator, IsoAtomMaker
from autoplex.data.phonons.flows import RandomStructuresDataGenerator, IsoAtomMaker


def test_data_generation(vasp_test_dir, mock_vasp, clean_dir):
Expand Down
2 changes: 1 addition & 1 deletion tests/data/test_datagen_jobs.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from pymatgen.core.structure import Structure
from autoplex.data.jobs import (
from autoplex.data.phonons.jobs import (
generate_randomized_structures,
phonon_maker_random_structures,
)
Expand Down
Loading