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

[WIP] Integration and test of RSS code #84

Merged
merged 40 commits into from
Aug 6, 2024
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
0e1bdbc
Merge branch 'JaGeo:main' into main
YuanbinLiu Jun 12, 2024
8a5745a
Update common jobs and utils, and add new RSS jobs
YuanbinLiu Jun 12, 2024
12d88b5
Revert "Merge branch 'JaGeo:main' into main"
YuanbinLiu Jun 12, 2024
df14cd9
Reapply "Merge branch 'JaGeo:main' into main"
YuanbinLiu Jun 12, 2024
406cc82
Revert "add YL to contributors"
YuanbinLiu Jun 12, 2024
c4b7144
added boltzhist code. WIP docstrings still need creating
MorrowChem Jun 13, 2024
9498e76
added docstrings, updated to numpy style
MorrowChem Jun 13, 2024
4718fb7
added airss installation to README
MorrowChem Jun 13, 2024
05ae5f7
removed airss installation from README, will be managed by conda
MorrowChem Jun 13, 2024
bcdf0a4
Merging the RSS code
YuanbinLiu Jun 21, 2024
c267c94
resolve conflict
YuanbinLiu Jul 24, 2024
f5efad2
Merge remote-tracking branch 'origin/main' into rss
YuanbinLiu Jul 24, 2024
11a7305
Resolved merge conflicts
YuanbinLiu Jul 24, 2024
d4fb6df
passed unit tests
YuanbinLiu Jul 29, 2024
baae101
add testing files
YuanbinLiu Jul 29, 2024
dac446b
merging rss code
YuanbinLiu Jul 29, 2024
4a69c6a
Remove redundant test files
YuanbinLiu Jul 29, 2024
a34fd0c
fix linting errors
YuanbinLiu Jul 30, 2024
0978476
adopt logging package
YuanbinLiu Jul 30, 2024
0efee39
fix lint errors
YuanbinLiu Jul 31, 2024
1e27fe3
fix conflicts between two workflows
YuanbinLiu Jul 31, 2024
874889a
minor revisions
YuanbinLiu Aug 1, 2024
4869604
add dgl version for installation
YuanbinLiu Aug 1, 2024
1002e1f
show installed packages
YuanbinLiu Aug 1, 2024
8371824
torch==2.2.1 for pytest
YuanbinLiu Aug 1, 2024
e04a09f
torch==2.2.1 for pytest
YuanbinLiu Aug 1, 2024
8f3c3be
torch==2.2.1 for pytest
YuanbinLiu Aug 1, 2024
cacc9b2
torchdata==0.7.1
YuanbinLiu Aug 1, 2024
daff41f
delete duplicate unit tests
YuanbinLiu Aug 1, 2024
193695c
set up installation of torchdata
YuanbinLiu Aug 1, 2024
5fdb278
modify regularization test
YuanbinLiu Aug 1, 2024
7ed1787
Add buildcell to path on github
YuanbinLiu Aug 1, 2024
67e538e
species_list is needed for the analysis plots for GAP
QuantumChemist Aug 2, 2024
091af95
species_list is needed for the analysis plots for GAP
QuantumChemist Aug 2, 2024
5d3d163
added comment
QuantumChemist Aug 2, 2024
26c609e
added checks for checking if sigma regularization is active
QuantumChemist Aug 2, 2024
26ca71b
add docstrings
QuantumChemist Aug 2, 2024
094d2d7
ignore airss
QuantumChemist Aug 2, 2024
4a09114
reduce the GAP unit test run time where accuracy isn't needed
QuantumChemist Aug 2, 2024
ba5f891
update
YuanbinLiu Aug 6, 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
Prev Previous commit
Next Next commit
added checks for checking if sigma regularization is active
  • Loading branch information
QuantumChemist committed Aug 2, 2024
commit 26c609e3f21096c0b632e91e230a0c3ee830b692
24 changes: 22 additions & 2 deletions tests/auto/test_auto_flows.py
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,9 @@ def test_complete_dft_vs_ml_benchmark_workflow_two_mpids_big_supercell(
complete_workflow_big_sc,
create_folders=True,
ensure_success=False,
# We just want to check the correct order and anme of jobs
# We just want to check the correct order and name of jobs
# and that the phonon_displacement_maker is not overwritten.
# Therefore, we set `ensure_success=False`
# Therefore, we set `ensure_success=False`.
store=memory_jobstore,
)

Expand Down Expand Up @@ -487,6 +487,7 @@ def test_complete_dft_vs_ml_benchmark_workflow_with_hploop(
def test_complete_dft_vs_ml_benchmark_workflow_with_sigma_regulaization_hploop(
vasp_test_dir, mock_vasp, test_dir, memory_jobstore, ref_paths4, fake_run_vasp_kwargs4, clean_dir
):
import glob
from jobflow import run_locally

path_to_struct = vasp_test_dir / "dft_ml_data_generation" / "POSCAR"
Expand Down Expand Up @@ -518,10 +519,15 @@ def test_complete_dft_vs_ml_benchmark_workflow_with_sigma_regulaization_hploop(
1.511743561686686, abs=1.0 # it's kinda fluctuating because of the little data
)

# regularization specific test
reg_specific_file_exists = any(glob.glob("job*/train_wo_sigma.extxyz"))
assert reg_specific_file_exists


def test_complete_dft_vs_ml_benchmark_workflow_with_sigma_regularization(
vasp_test_dir, mock_vasp, test_dir, memory_jobstore, ref_paths4, fake_run_vasp_kwargs4, clean_dir
):
import glob
from jobflow import run_locally

path_to_struct = vasp_test_dir / "dft_ml_data_generation" / "POSCAR"
Expand Down Expand Up @@ -553,6 +559,10 @@ def test_complete_dft_vs_ml_benchmark_workflow_with_sigma_regularization(
1.511743561686686, abs=0.5
)

# regularization specific test
reg_specific_file_exists = any(glob.glob("job*/train_wo_sigma.extxyz"))
assert reg_specific_file_exists


def test_complete_dft_vs_ml_benchmark_workflow_separated(
vasp_test_dir, mock_vasp, test_dir, memory_jobstore, ref_paths4, fake_run_vasp_kwargs4, clean_dir
Expand Down Expand Up @@ -594,6 +604,7 @@ def test_complete_dft_vs_ml_benchmark_workflow_separated(
def test_complete_dft_vs_ml_benchmark_workflow_separated_sigma_reg_hploop_three_mpids(
vasp_test_dir, mock_vasp, test_dir, memory_jobstore, ref_paths4, fake_run_vasp_kwargs4, clean_dir
):
import glob
from jobflow import run_locally

path_to_struct = vasp_test_dir / "dft_ml_data_generation" / "POSCAR"
Expand Down Expand Up @@ -626,10 +637,15 @@ def test_complete_dft_vs_ml_benchmark_workflow_separated_sigma_reg_hploop_three_
0.8709764794814768, abs=0.5
)

# regularization specific test
reg_specific_file_exists = any(glob.glob("job*/train_wo_sigma.extxyz"))
assert reg_specific_file_exists


def test_complete_dft_vs_ml_benchmark_workflow_separated_sigma_reg_hploop(
vasp_test_dir, mock_vasp, test_dir, memory_jobstore, ref_paths4, fake_run_vasp_kwargs4, clean_dir
):
import glob
from jobflow import run_locally

path_to_struct = vasp_test_dir / "dft_ml_data_generation" / "POSCAR"
Expand Down Expand Up @@ -663,6 +679,10 @@ def test_complete_dft_vs_ml_benchmark_workflow_separated_sigma_reg_hploop(
0.8709764794814768, abs=0.5
)

# regularization specific test
reg_specific_file_exists = any(glob.glob("job*/train_wo_sigma.extxyz"))
assert reg_specific_file_exists


class TestCompleteDFTvsMLBenchmarkWorkflow:
def test_add_data_to_dataset_workflow(
Expand Down