fix: fix UT

wangzyphysics · Mar 28, 2024 · 399af96 · 399af96
1 parent 1905100
commit 399af96
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 71 deletions.
diff --git a/tests/test_caly_evo_step.py b/tests/test_caly_evo_step.py
@@ -51,6 +51,20 @@
 except ModuleNotFoundError:
     # case of upload everything to argo, no context needed
     pass
+from context import (
+    default_host,
+    default_image,
+    skip_ut_with_dflow,
+    skip_ut_with_dflow_reason,
+    upload_python_packages,
+)
+from mocked_ops import (
+    MockedCollRunCaly,
+    MockedPrepDPOptim,
+    MockedRunDPOptim,
+    mocked_numb_models,
+)
+
 from dpgen2.constants import (
     lmp_conf_name,
     lmp_input_name,
@@ -82,20 +96,6 @@
 )
 from dpgen2.utils.step_config import normalize as normalize_step_dict
 
-from .context import (
-    default_host,
-    default_image,
-    skip_ut_with_dflow,
-    skip_ut_with_dflow_reason,
-    upload_python_packages,
-)
-from .mocked_ops import (
-    MockedCollRunCaly,
-    MockedPrepDPOptim,
-    MockedRunDPOptim,
-    mocked_numb_models,
-)
-
 default_config = normalize_step_dict(
     {
         "template_config": {

diff --git a/tests/test_collect_data.py b/tests/test_collect_data.py
@@ -44,14 +44,14 @@
 except ModuleNotFoundError:
     # case of upload everything to argo, no context needed
     pass
-from .context import (
+from context import (
     default_host,
     default_image,
     skip_ut_with_dflow,
     skip_ut_with_dflow_reason,
     upload_python_packages,
 )
-from .mocked_ops import (
+from mocked_ops import (
     MockedCollectData,
 )
 

diff --git a/tests/test_prep_run_caly.py b/tests/test_prep_run_caly.py
@@ -51,6 +51,20 @@
 except ModuleNotFoundError:
     # case of upload everything to argo, no context needed
     pass
+from context import (
+    default_host,
+    default_image,
+    skip_ut_with_dflow,
+    skip_ut_with_dflow_reason,
+    upload_python_packages,
+)
+from mocked_ops import (
+    MockedCollRunCaly,
+    MockedRunCalyModelDevi,
+    MockedRunDPOptim,
+    mocked_numb_models,
+)
+
 from dpgen2.exploration.task import (
     BaseExplorationTaskGroup,
     ExplorationTask,
@@ -72,20 +86,6 @@
 )
 from dpgen2.utils.step_config import normalize as normalize_step_dict
 
-from .context import (
-    default_host,
-    default_image,
-    skip_ut_with_dflow,
-    skip_ut_with_dflow_reason,
-    upload_python_packages,
-)
-from .mocked_ops import (
-    MockedCollRunCaly,
-    MockedRunCalyModelDevi,
-    MockedRunDPOptim,
-    mocked_numb_models,
-)
-
 prep_default_config = normalize_step_dict(
     {
         "template_config": {

diff --git a/tests/test_prep_run_dp_train.py b/tests/test_prep_run_dp_train.py
@@ -42,23 +42,14 @@
 except ModuleNotFoundError:
     # case of upload everything to argo, no context needed
     pass
-from dpgen2.constants import (
-    train_task_pattern,
-)
-from dpgen2.superop.prep_run_dp_train import (
-    ModifyTrainScript,
-    PrepRunDPTrain,
-)
-from dpgen2.utils.step_config import normalize as normalize_step_dict
-
-from .context import (
+from context import (
     default_host,
     default_image,
     skip_ut_with_dflow,
     skip_ut_with_dflow_reason,
     upload_python_packages,
 )
-from .mocked_ops import (
+from mocked_ops import (
     MockedModifyTrainScript,
     MockedPrepDPTrain,
     MockedRunDPTrain,
@@ -69,6 +60,15 @@
     mocked_template_script,
 )
 
+from dpgen2.constants import (
+    train_task_pattern,
+)
+from dpgen2.superop.prep_run_dp_train import (
+    ModifyTrainScript,
+    PrepRunDPTrain,
+)
+from dpgen2.utils.step_config import normalize as normalize_step_dict
+
 default_config = normalize_step_dict(
     {
         "template_config": {

diff --git a/tests/test_prep_run_lmp.py b/tests/test_prep_run_lmp.py
@@ -44,6 +44,18 @@
 except ModuleNotFoundError:
     # case of upload everything to argo, no context needed
     pass
+from context import (
+    default_host,
+    default_image,
+    skip_ut_with_dflow,
+    skip_ut_with_dflow_reason,
+    upload_python_packages,
+)
+from mocked_ops import (
+    MockedRunLmp,
+    mocked_numb_models,
+)
+
 from dpgen2.constants import (
     lmp_conf_name,
     lmp_input_name,
@@ -68,18 +80,6 @@
 )
 from dpgen2.utils.step_config import normalize as normalize_step_dict
 
-from .context import (
-    default_host,
-    default_image,
-    skip_ut_with_dflow,
-    skip_ut_with_dflow_reason,
-    upload_python_packages,
-)
-from .mocked_ops import (
-    MockedRunLmp,
-    mocked_numb_models,
-)
-
 default_config = normalize_step_dict(
     {
         "template_config": {

diff --git a/tests/test_prep_run_vasp.py b/tests/test_prep_run_vasp.py
@@ -43,6 +43,19 @@
 except ModuleNotFoundError:
     # case of upload everything to argo, no context needed
     pass
+from context import (
+    default_host,
+    default_image,
+    skip_ut_with_dflow,
+    skip_ut_with_dflow_reason,
+    upload_python_packages,
+)
+from mocked_ops import (
+    MockedPrepVasp,
+    MockedRunVasp,
+    mocked_incar_template,
+)
+
 from dpgen2.constants import (
     fp_task_pattern,
 )
@@ -57,19 +70,6 @@
 )
 from dpgen2.utils.step_config import normalize as normalize_step_dict
 
-from .context import (
-    default_host,
-    default_image,
-    skip_ut_with_dflow,
-    skip_ut_with_dflow_reason,
-    upload_python_packages,
-)
-from .mocked_ops import (
-    MockedPrepVasp,
-    MockedRunVasp,
-    mocked_incar_template,
-)
-
 default_config = normalize_step_dict(
     {
         "template_config": {

diff --git a/tests/test_select_confs.py b/tests/test_select_confs.py
@@ -45,16 +45,16 @@
 except ModuleNotFoundError:
     # case of upload everything to argo, no context needed
     pass
-from dpgen2.op.select_confs import (
-    SelectConfs,
-)
-
-from .mocked_ops import (
+from mocked_ops import (
     MockedConfSelector,
     MockedExplorationReport,
     MockedSelectConfs,
 )
 
+from dpgen2.op.select_confs import (
+    SelectConfs,
+)
+
 
 class TestMockedSelectConfs(unittest.TestCase):
     def setUp(self):