diff --git a/dpgen2/entrypoint/submit.py b/dpgen2/entrypoint/submit.py index 74ad84f9..5d81b041 100644 --- a/dpgen2/entrypoint/submit.py +++ b/dpgen2/entrypoint/submit.py @@ -92,12 +92,12 @@ from dpgen2.op import ( CollectData, CollRunCaly, - PrepCalyInput, PrepCalyDPOptim, + PrepCalyInput, PrepDPTrain, PrepLmp, - RunCalyModelDevi, RunCalyDPOptim, + RunCalyModelDevi, RunDPTrain, RunLmp, SelectConfs, diff --git a/dpgen2/op/__init__.py b/dpgen2/op/__init__.py index c460a91a..573b8a07 100644 --- a/dpgen2/op/__init__.py +++ b/dpgen2/op/__init__.py @@ -4,24 +4,24 @@ from .collect_run_caly import ( CollRunCaly, ) -from .prep_caly_input import ( - PrepCalyInput, -) from .prep_caly_dp_optim import ( PrepCalyDPOptim, ) +from .prep_caly_input import ( + PrepCalyInput, +) from .prep_dp_train import ( PrepDPTrain, ) from .prep_lmp import ( PrepLmp, ) -from .run_caly_model_devi import ( - RunCalyModelDevi, -) from .run_caly_dp_optim import ( RunCalyDPOptim, ) +from .run_caly_model_devi import ( + RunCalyModelDevi, +) from .run_dp_train import ( RunDPTrain, ) diff --git a/tests/mocked_ops.py b/tests/mocked_ops.py index 90e728e5..22b75d3f 100644 --- a/tests/mocked_ops.py +++ b/tests/mocked_ops.py @@ -44,6 +44,12 @@ train_script_name, train_task_pattern, ) +from dpgen2.dpgen2.op.prep_caly_dp_optim import ( + PrepCalyDPOptim, +) +from dpgen2.dpgen2.op.run_caly_dp_optim import ( + RunCalyDPOptim, +) from dpgen2.exploration.report import ( ExplorationReport, ) @@ -73,9 +79,6 @@ from dpgen2.op.collect_run_caly import ( CollRunCaly, ) -from dpgen2.dpgen2.op.prep_caly_dp_optim import ( - PrepCalyDPOptim, -) from dpgen2.op.prep_dp_train import ( PrepDPTrain, ) @@ -85,9 +88,6 @@ from dpgen2.op.run_caly_model_devi import ( RunCalyModelDevi, ) -from dpgen2.dpgen2.op.run_caly_dp_optim import ( - RunCalyDPOptim, -) from dpgen2.op.run_dp_train import ( RunDPTrain, ) diff --git a/tests/test_prep_run_caly.py b/tests/test_prep_run_caly.py index c204488b..638e953d 100644 --- a/tests/test_prep_run_caly.py +++ b/tests/test_prep_run_caly.py @@ -60,11 +60,14 @@ ) from mocked_ops import ( MockedCollRunCaly, - MockedRunCalyModelDevi, MockedRunCalyDPOptim, + MockedRunCalyModelDevi, mocked_numb_models, ) +from dpgen2.dpgen2.op.prep_caly_dp_optim import ( + PrepCalyDPOptim, +) from dpgen2.exploration.task import ( BaseExplorationTaskGroup, ExplorationTask, @@ -72,9 +75,6 @@ from dpgen2.op.prep_caly_input import ( PrepCalyInput, ) -from dpgen2.dpgen2.op.prep_caly_dp_optim import ( - PrepCalyDPOptim, -) from dpgen2.op.run_caly_model_devi import ( RunCalyModelDevi, )