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

Created a new unified flow module for RSS. #203

Merged
merged 74 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from 65 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
75b61fb
make the mace interface more flexibel, start
JaGeo Oct 25, 2024
2d4a574
attempt a fix for virial but more is necessary
JaGeo Oct 25, 2024
9de378c
fix typo and add more handling of xyz names
JaGeo Oct 29, 2024
3ce2da1
more flexibility to mace fitting
JaGeo Oct 29, 2024
daa6215
add more test files
JaGeo Oct 29, 2024
5ac8b99
update installation
JaGeo Oct 29, 2024
3d5325c
commit latest changes
JaGeo Oct 30, 2024
c316d2d
add finetuning test and add a preliminary dependency
JaGeo Oct 30, 2024
8d14293
fix precommit
JaGeo Oct 30, 2024
a454005
fix linting
JaGeo Oct 30, 2024
c56b580
fix linting
JaGeo Oct 30, 2024
b6592ae
fix linting
JaGeo Oct 30, 2024
705b390
fix pyproject
JaGeo Oct 31, 2024
89c978a
fix pyproject
JaGeo Oct 31, 2024
8cdc308
fix pyproject
JaGeo Oct 31, 2024
c0a5684
update torch dependencies
naik-aakash Oct 31, 2024
f9a5167
clear uv cache before installs
naik-aakash Oct 31, 2024
d21339d
fix stupid typo
naik-aakash Oct 31, 2024
b6847c0
Merge pull request #187 from naik-aakash/update_pyproject
JaGeo Oct 31, 2024
95e95f6
add finetuning option and test data, document it
JaGeo Nov 6, 2024
6612e99
add input set to mock vasp
JaGeo Nov 6, 2024
771d401
uncomment one test
JaGeo Nov 6, 2024
78264df
fix finetuning
JaGeo Nov 6, 2024
96f35aa
fix linting
JaGeo Nov 6, 2024
fadd9a8
fix linting
JaGeo Nov 6, 2024
974dd65
fix linting
JaGeo Nov 6, 2024
06a3be4
fix linting
JaGeo Nov 6, 2024
00efd24
fix documentation
JaGeo Nov 6, 2024
06f69e7
fix documentation
JaGeo Nov 6, 2024
08ad5aa
remove test files
JaGeo Nov 6, 2024
7aeeb74
remove test files
JaGeo Nov 6, 2024
1c8045f
Merge branch 'main' of github.com:autoatml/autoplex into finetune_branch
JaGeo Nov 7, 2024
52731b1
update rss
YuanbinLiu Nov 7, 2024
385aedf
fix test folders
JaGeo Nov 7, 2024
2067776
fix minor issues
YuanbinLiu Nov 8, 2024
5fa975f
mention that one might need to download model
JaGeo Nov 8, 2024
8e3ccc2
fix doc
JaGeo Nov 8, 2024
af79279
fix rss issues
YuanbinLiu Nov 8, 2024
abd4d4d
attempt to fix MLIP_PHONON_DEFAULTS_FILE_PATH
JaGeo Nov 10, 2024
681f0c9
fix linting
JaGeo Nov 10, 2024
3d784cf
fix import
JaGeo Nov 10, 2024
76dc12b
fix isolated_atom_energies renaming
JaGeo Nov 10, 2024
0faadb4
fix more isolated_atom_energies renaming
JaGeo Nov 10, 2024
5d189d2
fix more isolated_atom_energies renaming
JaGeo Nov 10, 2024
d9e0075
fix more isolated_atom_energies renaming
JaGeo Nov 10, 2024
3d0f669
revert one renaming
JaGeo Nov 10, 2024
8ab13b5
fix tests after defalts have been changed
JaGeo Nov 10, 2024
c227147
change to approximate float comparisions
JaGeo Nov 10, 2024
9fb6e11
fix typo in dict name
JaGeo Nov 10, 2024
96265f9
Merge branch 'main' of github.com:autoatml/autoplex into rss
JaGeo Nov 10, 2024
cc454ba
fixed unit test issues
YuanbinLiu Nov 10, 2024
d3e97e4
fixed a small lint issue
YuanbinLiu Nov 10, 2024
5cc9495
renamed
YuanbinLiu Nov 10, 2024
e1872ea
fixed a lint issue
YuanbinLiu Nov 10, 2024
718273b
fix dataset
JaGeo Nov 10, 2024
c70a7f7
Merge branch 'rss' of github.com:YuanbinLiu/autoplex_pub into finetun…
JaGeo Nov 10, 2024
ab0924d
added clean_dir
YuanbinLiu Nov 10, 2024
8ead39d
fix some conflicts
JaGeo Nov 10, 2024
80b4484
fix some conflicts
JaGeo Nov 10, 2024
5eec266
fix some conflicts
JaGeo Nov 10, 2024
f997124
Merge branch 'finetune_branch_merge_conflicts' of github.com:autoatml…
JaGeo Nov 10, 2024
619bf45
resolve conflicts
JaGeo Nov 10, 2024
2ee5584
added new unit tests for rss_utilis
YuanbinLiu Nov 10, 2024
5c3b1d5
minor change
YuanbinLiu Nov 11, 2024
1b573ae
organized rss unit test files
YuanbinLiu Nov 11, 2024
066762f
Merge remote-tracking branch 'upstream/main' into rss
YuanbinLiu Nov 12, 2024
d860a82
addressed comments
YuanbinLiu Nov 12, 2024
5c1340b
pre-commit auto-fixes
pre-commit-ci[bot] Nov 12, 2024
dfc2d44
modified rss default config file
YuanbinLiu Nov 12, 2024
1cf3f71
fixed a lint issue
YuanbinLiu Nov 12, 2024
0e5f4c0
remoced GAPRelaxMaker
QuantumChemist Nov 12, 2024
984d87d
changed headers
YuanbinLiu Nov 12, 2024
fb3cfa4
changed some names
YuanbinLiu Nov 12, 2024
47eba79
fixed unit test issues
YuanbinLiu Nov 12, 2024
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
31 changes: 15 additions & 16 deletions autoplex/auto/phonons/flows.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,12 +197,12 @@ def make(
structure_list: list[Structure],
mp_ids,
split_ratio: float = 0.4,
f_max: float = 40.0,
force_max: float = 40.0,
pre_xyz_files: list[str] | None = None,
pre_database_dir: str | None = None,
preprocessing_data: bool = True,
apply_data_preprocessing: bool = True,
atomwise_regularization_parameter: float = 0.1,
f_min: float = 0.01, # unit: eV Å-1
force_min: float = 0.01, # unit: eV Å-1
atom_wise_regularization: bool = True,
auto_delta: bool = False,
dft_references: list[PhononBSDOSDoc] | None = None,
Expand All @@ -223,17 +223,17 @@ def make(
split_ratio: float.
Parameter to divide the training set and the test set.
A value of 0.1 means that the ratio of the training set to the test set is 9:1.
f_max: float
Maximally allowed force in the data set.
force_max: float
Maximum allowed force in the dataset.
pre_xyz_files: list[str] or None
names of the pre-database train xyz file and test xyz file.
pre_database_dir: str or None
the pre-database directory.
preprocessing_data: bool
preprocessing the data.
apply_data_preprocessing: bool
Apply data preprocessing.
atomwise_regularization_parameter: float
regularization value for the atom-wise force components.
f_min: float
force_min: float
minimal force cutoff value for atom-wise regularization.
atom_wise_regularization: bool
for including atom-wise regularization.
Expand Down Expand Up @@ -332,17 +332,17 @@ def make(
use_defaults=use_defaults_fitting,
).make(
species_list=isoatoms.output["species"],
isolated_atoms_energies=isoatoms.output["energies"],
isolated_atom_energies=isoatoms.output["energies"],
fit_input=fit_input,
split_ratio=split_ratio,
f_max=f_max,
force_max=force_max,
pre_xyz_files=pre_xyz_files,
pre_database_dir=pre_database_dir,
atomwise_regularization_parameter=atomwise_regularization_parameter,
f_min=f_min,
force_min=force_min,
atom_wise_regularization=atom_wise_regularization,
auto_delta=auto_delta,
preprocessing_data=preprocessing_data,
apply_data_preprocessing=apply_data_preprocessing,
**fit_kwargs,
)
flows.append(add_data_fit)
Expand Down Expand Up @@ -406,15 +406,14 @@ def make(
glue_file_path=self.glue_file_path,
).make(
species_list=isoatoms.output["species"],
isolated_atoms_energies=isoatoms.output["energies"],
isolated_atom_energies=isoatoms.output["energies"],
fit_input=fit_input,
split_ratio=split_ratio,
f_max=f_max,
force_max=force_max,
pre_xyz_files=pre_xyz_files,
pre_database_dir=pre_database_dir,
atomwise_regularization_parameter=atomwise_reg_parameter,
f_min=f_min,
atom_wise_regularization=atom_wise_regularization,
force_min=force_min,
auto_delta=auto_delta,
soap=soap_dict,
)
Expand Down
Loading
Loading