mv all flow other than dpgen_loop to suerpop

wanghan-iapcm · Feb 27, 2022 · db3f12a · db3f12a
1 parent ef08f44
commit db3f12a
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 15 deletions.
diff --git a/dpgen2/flow/loop.py → dpgen2/flow/dpgen_loop.py b/dpgen2/flow/loop.py → dpgen2/flow/dpgen_loop.py
@@ -32,7 +32,7 @@
 from dpgen2.exploration.report import ExplorationReport
 from dpgen2.exploration.task import ExplorationTaskGroup
 from dpgen2.exploration.selector import ConfSelector
-from dpgen2.flow.block import ConcurrentLearningBlock
+from dpgen2.superop.block import ConcurrentLearningBlock
 
 class SchedulerWrapper(OP):
 

diff --git a/dpgen2/flow/block.py → dpgen2/superop/block.py b/dpgen2/flow/block.py → dpgen2/superop/block.py
diff --git a/dpgen2/flow/prep_run_dp_train.py → dpgen2/superop/prep_run_dp_train.py b/dpgen2/flow/prep_run_dp_train.py → dpgen2/superop/prep_run_dp_train.py
diff --git a/dpgen2/flow/prep_run_fp.py → dpgen2/superop/prep_run_fp.py b/dpgen2/flow/prep_run_fp.py → dpgen2/superop/prep_run_fp.py
diff --git a/dpgen2/flow/prep_run_lmp.py → dpgen2/superop/prep_run_lmp.py b/dpgen2/flow/prep_run_lmp.py → dpgen2/superop/prep_run_lmp.py
diff --git a/setup.py b/setup.py
@@ -30,7 +30,7 @@
     url="https://github.com/deepmodeling/dpgen2",
     packages=['dpgen2',
               'dpgen2/op',
-              'dpgen2/flow',
+              'dpgen2/superop',
               'dpgen2/utils',
               'dpgen2/fp',
     ],

diff --git a/tests/mocked_ops.py b/tests/mocked_ops.py
@@ -4,6 +4,7 @@
     OPIOSign,
     Artifact,
     upload_packages,
+    FatalError,
 )
 
 upload_packages.append(__file__)

diff --git a/tests/test_block_cl.py b/tests/test_block_cl.py
@@ -36,10 +36,10 @@
     pass
 from context import upload_python_package
 from dpgen2.op.prep_lmp import PrepLmp
-from dpgen2.flow.prep_run_dp_train import PrepRunDPTrain
-from dpgen2.flow.prep_run_lmp import PrepRunLmp
-from dpgen2.flow.prep_run_fp import PrepRunFp
-from dpgen2.flow.block import ConcurrentLearningBlock
+from dpgen2.superop.prep_run_dp_train import PrepRunDPTrain
+from dpgen2.superop.prep_run_lmp import PrepRunLmp
+from dpgen2.superop.prep_run_fp import PrepRunFp
+from dpgen2.superop.block import ConcurrentLearningBlock
 from dpgen2.exploration.task import ExplorationTask, ExplorationTaskGroup
 from dpgen2.fp.vasp import VaspInputs
 

diff --git a/tests/test_loop.py → tests/test_dpgen_loop.py b/tests/test_loop.py → tests/test_dpgen_loop.py
@@ -44,13 +44,13 @@
     ExplorationScheduler,
 )
 from dpgen2.op.prep_lmp import PrepLmp
-from dpgen2.flow.prep_run_dp_train import PrepRunDPTrain
-from dpgen2.flow.prep_run_lmp import PrepRunLmp
-from dpgen2.flow.prep_run_fp import PrepRunFp
-from dpgen2.flow.block import ConcurrentLearningBlock
+from dpgen2.superop.prep_run_dp_train import PrepRunDPTrain
+from dpgen2.superop.prep_run_lmp import PrepRunLmp
+from dpgen2.superop.prep_run_fp import PrepRunFp
+from dpgen2.superop.block import ConcurrentLearningBlock
 from dpgen2.exploration.task import ExplorationTask, ExplorationTaskGroup
 from dpgen2.fp.vasp import VaspInputs
-from dpgen2.flow.loop import ConcurrentLearning
+from dpgen2.flow.dpgen_loop import ConcurrentLearning
 from dpgen2.exploration.report import ExplorationReport
 from dpgen2.exploration.task import ExplorationTaskGroup, ExplorationStage
 from dpgen2.exploration.selector import TrustLevelConfSelector, TrustLevel
@@ -514,7 +514,7 @@ def test_update_artifact(self):
         wf_0.submit()
         id_0 = wf_0.id
 
-        # wf_0 = Workflow(id='dpgen-kjd6c')
+        # wf_0 = Workflow(id='dpgen-rdhxw')
 
         while wf_0.query_status() in ["Pending", "Running"]:
             time.sleep(4)

diff --git a/tests/test_prep_run_dp_train.py b/tests/test_prep_run_dp_train.py
@@ -34,7 +34,7 @@
     # case of upload everything to argo, no context needed
     pass
 from context import upload_python_package
-from dpgen2.flow.prep_run_dp_train import PrepRunDPTrain
+from dpgen2.superop.prep_run_dp_train import PrepRunDPTrain
 from dpgen2.constants import train_task_pattern
 from mocked_ops import (
     mocked_template_script,

diff --git a/tests/test_prep_run_lmp.py b/tests/test_prep_run_lmp.py
@@ -35,7 +35,7 @@
     pass
 from context import upload_python_package
 from dpgen2.op.prep_lmp import PrepLmp
-from dpgen2.flow.prep_run_lmp import PrepRunLmp
+from dpgen2.superop.prep_run_lmp import PrepRunLmp
 from dpgen2.exploration.task import ExplorationTask, ExplorationTaskGroup
 from mocked_ops import (
     mocked_numb_models,

diff --git a/tests/test_prep_run_vasp.py b/tests/test_prep_run_vasp.py
@@ -34,7 +34,7 @@
     # case of upload everything to argo, no context needed
     pass
 from context import upload_python_package
-from dpgen2.flow.prep_run_fp import PrepRunFp
+from dpgen2.superop.prep_run_fp import PrepRunFp
 from mocked_ops import (
     mocked_incar_template,
     MockedPrepVasp,