Merge branch 'devel' into devel

deepmodeling · Jan 29, 2024 · 0968eaa · 0968eaa
2 parents 451916e + 8900561
commit 0968eaa
Show file tree

Hide file tree

Showing 203 changed files with 552 additions and 480 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -130,7 +130,7 @@ test-command = [
     "python -m deepmd -h",
     "dp -h",
     "dp_ipi",
-    "pytest {project}/source/tests/test_lammps.py"
+    "pytest {project}/source/tests/tf/test_lammps.py"
 ]
 test-extras = ["cpu", "test", "lmp", "ipi"]
 build = ["cp310-*"]

diff --git a/source/tests/__init__.py b/source/tests/__init__.py
@@ -0,0 +1 @@
+# SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/source/tests/common/__init__.py b/source/tests/common/__init__.py
@@ -0,0 +1 @@
+# SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/source/tests/common/common.py b/source/tests/common/common.py
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: LGPL-3.0-or-later
+import pathlib
+
+tests_path = pathlib.Path(__file__).parent.absolute()
+infer_path = (tests_path.parent / "infer").absolute()
diff --git a/source/tests/test_argument_parser.py → source/tests/common/test_argument_parser.py b/source/tests/test_argument_parser.py → source/tests/common/test_argument_parser.py
@@ -21,7 +21,7 @@
     Union,
 )
 
-from deepmd.tf.entrypoints.main import (
+from deepmd.main import (
     get_ll,
     parse_args,
 )

diff --git a/source/tests/test_examples.py → source/tests/common/test_examples.py b/source/tests/test_examples.py → source/tests/common/test_examples.py
@@ -7,14 +7,14 @@
     Path,
 )
 
-from deepmd.tf.common import (
+from deepmd.common import (
     j_loader,
 )
-from deepmd.tf.utils.argcheck import (
+from deepmd.utils.argcheck import (
     normalize,
 )
 
-p_examples = Path(__file__).parent.parent.parent / "examples"
+p_examples = Path(__file__).parent.parent.parent.parent / "examples"
 
 input_files = (
     p_examples / "water" / "se_e2_a" / "input.json",

diff --git a/source/tests/test_gui.py → source/tests/common/test_gui.py b/source/tests/test_gui.py → source/tests/common/test_gui.py
diff --git a/source/tests/test_model_format_utils.py → ...e/tests/common/test_model_format_utils.py b/source/tests/test_model_format_utils.py → ...e/tests/common/test_model_format_utils.py
diff --git a/source/tests/test_output_def.py → source/tests/common/test_output_def.py b/source/tests/test_output_def.py → source/tests/common/test_output_def.py
diff --git a/source/tests/test_sel_idx.py → source/tests/common/test_sel_idx.py b/source/tests/test_sel_idx.py → source/tests/common/test_sel_idx.py
@@ -3,7 +3,7 @@
 
 import numpy as np
 
-from deepmd.tf.common import (
+from deepmd.common import (
     select_idx_map,
 )
 

diff --git a/source/tests/test_uni_infer.py → source/tests/common/test_uni_infer.py b/source/tests/test_uni_infer.py → source/tests/common/test_uni_infer.py
@@ -4,22 +4,22 @@
 import os
 import unittest
 
-from common import (
-    tests_path,
-)
-
 from deepmd.infer.deep_pot import DeepPot as DeepPot
 from deepmd.tf.infer.deep_pot import DeepPot as DeepPotTF
 from deepmd.tf.utils.convert import (
     convert_pbtxt_to_pb,
 )
 
+from .common import (
+    infer_path,
+)
+
 
 class TestUniversalInfer(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         convert_pbtxt_to_pb(
-            str(tests_path / os.path.join("infer", "deeppot-r.pbtxt")), "deeppot.pb"
+            str(infer_path / os.path.join("deeppot-r.pbtxt")), "deeppot.pb"
         )
 
     def test_deep_pot(self):

diff --git a/source/tests/tf/__init__.py b/source/tests/tf/__init__.py
@@ -0,0 +1 @@
+# SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/source/tests/common.py → source/tests/tf/common.py b/source/tests/common.py → source/tests/tf/common.py
@@ -28,6 +28,7 @@
     global_default_places = 5
 
 tests_path = pathlib.Path(__file__).parent.absolute()
+infer_path = (tests_path.parent / "infer").absolute()
 
 
 def j_loader(filename):

diff --git a/...ce/tests/compat_inputs/water_se_a_v0.json → ...tests/tf/compat_inputs/water_se_a_v0.json b/...ce/tests/compat_inputs/water_se_a_v0.json → ...tests/tf/compat_inputs/water_se_a_v0.json
diff --git a/...ce/tests/compat_inputs/water_se_a_v1.json → ...tests/tf/compat_inputs/water_se_a_v1.json b/...ce/tests/compat_inputs/water_se_a_v1.json → ...tests/tf/compat_inputs/water_se_a_v1.json
diff --git a/source/tests/compat_inputs/water_v0.json → source/tests/tf/compat_inputs/water_v0.json b/source/tests/compat_inputs/water_v0.json → source/tests/tf/compat_inputs/water_v0.json
diff --git a/source/tests/compat_inputs/water_v1.json → source/tests/tf/compat_inputs/water_v1.json b/source/tests/compat_inputs/water_v1.json → source/tests/tf/compat_inputs/water_v1.json
diff --git a/source/tests/compat_inputs/water_v2.json → source/tests/tf/compat_inputs/water_v2.json b/source/tests/compat_inputs/water_v2.json → source/tests/tf/compat_inputs/water_v2.json
diff --git a/source/tests/data_dp_mask/nopbc → source/tests/tf/data_dp_mask/nopbc b/source/tests/data_dp_mask/nopbc → source/tests/tf/data_dp_mask/nopbc
diff --git a/source/tests/data_dp_mask/set.000/aparam.npy → .../tests/tf/data_dp_mask/set.000/aparam.npy b/source/tests/data_dp_mask/set.000/aparam.npy → .../tests/tf/data_dp_mask/set.000/aparam.npy
diff --git a/.../tests/data_dp_mask/set.000/atom_pref.npy → ...sts/tf/data_dp_mask/set.000/atom_pref.npy b/.../tests/data_dp_mask/set.000/atom_pref.npy → ...sts/tf/data_dp_mask/set.000/atom_pref.npy
diff --git a/source/tests/data_dp_mask/set.000/box.npy → source/tests/tf/data_dp_mask/set.000/box.npy b/source/tests/data_dp_mask/set.000/box.npy → source/tests/tf/data_dp_mask/set.000/box.npy
diff --git a/source/tests/data_dp_mask/set.000/coord.npy → ...e/tests/tf/data_dp_mask/set.000/coord.npy b/source/tests/data_dp_mask/set.000/coord.npy → ...e/tests/tf/data_dp_mask/set.000/coord.npy
diff --git a/source/tests/data_dp_mask/set.000/energy.npy → .../tests/tf/data_dp_mask/set.000/energy.npy b/source/tests/data_dp_mask/set.000/energy.npy → .../tests/tf/data_dp_mask/set.000/energy.npy
diff --git a/source/tests/data_dp_mask/set.000/force.npy → ...e/tests/tf/data_dp_mask/set.000/force.npy b/source/tests/data_dp_mask/set.000/force.npy → ...e/tests/tf/data_dp_mask/set.000/force.npy
diff --git a/source/tests/data_dp_mask/type.raw → source/tests/tf/data_dp_mask/type.raw b/source/tests/data_dp_mask/type.raw → source/tests/tf/data_dp_mask/type.raw
diff --git a/source/tests/data_dp_mask/type_map.raw → source/tests/tf/data_dp_mask/type_map.raw b/source/tests/data_dp_mask/type_map.raw → source/tests/tf/data_dp_mask/type_map.raw
diff --git a/source/tests/data_modifier/dipole.json → source/tests/tf/data_modifier/dipole.json b/source/tests/data_modifier/dipole.json → source/tests/tf/data_modifier/dipole.json
diff --git a/...modifier/sys_10/set.000/atomic_dipole.npy → ...modifier/sys_10/set.000/atomic_dipole.npy b/...modifier/sys_10/set.000/atomic_dipole.npy → ...modifier/sys_10/set.000/atomic_dipole.npy
diff --git a/...ests/data_modifier/sys_10/set.000/box.npy → ...s/tf/data_modifier/sys_10/set.000/box.npy b/...ests/data_modifier/sys_10/set.000/box.npy → ...s/tf/data_modifier/sys_10/set.000/box.npy
diff --git a/...ts/data_modifier/sys_10/set.000/coord.npy → ...tf/data_modifier/sys_10/set.000/coord.npy b/...ts/data_modifier/sys_10/set.000/coord.npy → ...tf/data_modifier/sys_10/set.000/coord.npy
diff --git a/...s/data_modifier/sys_10/set.000/energy.npy → ...f/data_modifier/sys_10/set.000/energy.npy b/...s/data_modifier/sys_10/set.000/energy.npy → ...f/data_modifier/sys_10/set.000/energy.npy
diff --git a/...ts/data_modifier/sys_10/set.000/force.npy → ...tf/data_modifier/sys_10/set.000/force.npy b/...ts/data_modifier/sys_10/set.000/force.npy → ...tf/data_modifier/sys_10/set.000/force.npy
diff --git a/source/tests/data_modifier/sys_10/type.raw → ...ce/tests/tf/data_modifier/sys_10/type.raw b/source/tests/data_modifier/sys_10/type.raw → ...ce/tests/tf/data_modifier/sys_10/type.raw
diff --git a/...e/tests/data_modifier/sys_10/type_map.raw → ...ests/tf/data_modifier/sys_10/type_map.raw b/...e/tests/data_modifier/sys_10/type_map.raw → ...ests/tf/data_modifier/sys_10/type_map.raw
diff --git a/source/tests/finetune/data/set.000/box.npy → ...ce/tests/tf/finetune/data/set.000/box.npy b/source/tests/finetune/data/set.000/box.npy → ...ce/tests/tf/finetune/data/set.000/box.npy
diff --git a/source/tests/finetune/data/set.000/coord.npy → .../tests/tf/finetune/data/set.000/coord.npy b/source/tests/finetune/data/set.000/coord.npy → .../tests/tf/finetune/data/set.000/coord.npy
diff --git a/...ce/tests/finetune/data/set.000/energy.npy → ...tests/tf/finetune/data/set.000/energy.npy b/...ce/tests/finetune/data/set.000/energy.npy → ...tests/tf/finetune/data/set.000/energy.npy
diff --git a/source/tests/finetune/data/set.000/force.npy → .../tests/tf/finetune/data/set.000/force.npy b/source/tests/finetune/data/set.000/force.npy → .../tests/tf/finetune/data/set.000/force.npy
diff --git a/source/tests/finetune/data/type.raw → source/tests/tf/finetune/data/type.raw b/source/tests/finetune/data/type.raw → source/tests/tf/finetune/data/type.raw
diff --git a/source/tests/finetune/data/type_map.raw → source/tests/tf/finetune/data/type_map.raw b/source/tests/finetune/data/type_map.raw → source/tests/tf/finetune/data/type_map.raw
diff --git a/.../finetune/data_mixed_type/set.000/box.npy → .../finetune/data_mixed_type/set.000/box.npy b/.../finetune/data_mixed_type/set.000/box.npy → .../finetune/data_mixed_type/set.000/box.npy
diff --git a/...inetune/data_mixed_type/set.000/coord.npy → ...inetune/data_mixed_type/set.000/coord.npy b/...inetune/data_mixed_type/set.000/coord.npy → ...inetune/data_mixed_type/set.000/coord.npy
diff --git a/...netune/data_mixed_type/set.000/energy.npy → ...netune/data_mixed_type/set.000/energy.npy b/...netune/data_mixed_type/set.000/energy.npy → ...netune/data_mixed_type/set.000/energy.npy
diff --git a/...inetune/data_mixed_type/set.000/force.npy → ...inetune/data_mixed_type/set.000/force.npy b/...inetune/data_mixed_type/set.000/force.npy → ...inetune/data_mixed_type/set.000/force.npy
diff --git a/...ta_mixed_type/set.000/real_atom_types.npy → ...ta_mixed_type/set.000/real_atom_types.npy b/...ta_mixed_type/set.000/real_atom_types.npy → ...ta_mixed_type/set.000/real_atom_types.npy
diff --git a/...e/tests/finetune/data_mixed_type/type.raw → ...ests/tf/finetune/data_mixed_type/type.raw b/...e/tests/finetune/data_mixed_type/type.raw → ...ests/tf/finetune/data_mixed_type/type.raw
diff --git a/...sts/finetune/data_mixed_type/type_map.raw → .../tf/finetune/data_mixed_type/type_map.raw b/...sts/finetune/data_mixed_type/type_map.raw → .../tf/finetune/data_mixed_type/type_map.raw
diff --git a/source/tests/finetune/input_finetune.json → source/tests/tf/finetune/input_finetune.json b/source/tests/finetune/input_finetune.json → source/tests/tf/finetune/input_finetune.json
diff --git a/source/tests/finetune/input_pretrain.json → source/tests/tf/finetune/input_pretrain.json b/source/tests/finetune/input_pretrain.json → source/tests/tf/finetune/input_pretrain.json
diff --git a/...tests/init_frz_model/data/set.000/box.npy → ...ts/tf/init_frz_model/data/set.000/box.npy b/...tests/init_frz_model/data/set.000/box.npy → ...ts/tf/init_frz_model/data/set.000/box.npy
diff --git a/...sts/init_frz_model/data/set.000/coord.npy → .../tf/init_frz_model/data/set.000/coord.npy b/...sts/init_frz_model/data/set.000/coord.npy → .../tf/init_frz_model/data/set.000/coord.npy
diff --git a/...ts/init_frz_model/data/set.000/energy.npy → ...tf/init_frz_model/data/set.000/energy.npy b/...ts/init_frz_model/data/set.000/energy.npy → ...tf/init_frz_model/data/set.000/energy.npy
diff --git a/...sts/init_frz_model/data/set.000/force.npy → .../tf/init_frz_model/data/set.000/force.npy b/...sts/init_frz_model/data/set.000/force.npy → .../tf/init_frz_model/data/set.000/force.npy
diff --git a/source/tests/init_frz_model/data/type.raw → source/tests/tf/init_frz_model/data/type.raw b/source/tests/init_frz_model/data/type.raw → source/tests/tf/init_frz_model/data/type.raw
diff --git a/...ce/tests/init_frz_model/data/type_map.raw → ...tests/tf/init_frz_model/data/type_map.raw b/...ce/tests/init_frz_model/data/type_map.raw → ...tests/tf/init_frz_model/data/type_map.raw
diff --git a/source/tests/init_frz_model/input.json → source/tests/tf/init_frz_model/input.json b/source/tests/init_frz_model/input.json → source/tests/tf/init_frz_model/input.json
diff --git a/...ts/model_compression/data/set.000/box.npy → ...tf/model_compression/data/set.000/box.npy b/...ts/model_compression/data/set.000/box.npy → ...tf/model_compression/data/set.000/box.npy
diff --git a/.../model_compression/data/set.000/coord.npy → .../model_compression/data/set.000/coord.npy b/.../model_compression/data/set.000/coord.npy → .../model_compression/data/set.000/coord.npy
diff --git a/...model_compression/data/set.000/energy.npy → ...model_compression/data/set.000/energy.npy b/...model_compression/data/set.000/energy.npy → ...model_compression/data/set.000/energy.npy
diff --git a/.../model_compression/data/set.000/force.npy → .../model_compression/data/set.000/force.npy b/.../model_compression/data/set.000/force.npy → .../model_compression/data/set.000/force.npy
diff --git a/source/tests/model_compression/data/type.raw → .../tests/tf/model_compression/data/type.raw b/source/tests/model_compression/data/type.raw → .../tests/tf/model_compression/data/type.raw
diff --git a/...tests/model_compression/data/type_map.raw → ...ts/tf/model_compression/data/type_map.raw b/...tests/model_compression/data/type_map.raw → ...ts/tf/model_compression/data/type_map.raw
diff --git a/source/tests/model_compression/input.json → source/tests/tf/model_compression/input.json b/source/tests/model_compression/input.json → source/tests/tf/model_compression/input.json
diff --git a/source/tests/model_spin/set.000/box.npy → source/tests/tf/model_spin/set.000/box.npy b/source/tests/model_spin/set.000/box.npy → source/tests/tf/model_spin/set.000/box.npy
diff --git a/source/tests/model_spin/set.000/coord.npy → source/tests/tf/model_spin/set.000/coord.npy b/source/tests/model_spin/set.000/coord.npy → source/tests/tf/model_spin/set.000/coord.npy
diff --git a/source/tests/model_spin/set.000/energy.npy → ...ce/tests/tf/model_spin/set.000/energy.npy b/source/tests/model_spin/set.000/energy.npy → ...ce/tests/tf/model_spin/set.000/energy.npy
diff --git a/source/tests/model_spin/set.000/force.npy → source/tests/tf/model_spin/set.000/force.npy b/source/tests/model_spin/set.000/force.npy → source/tests/tf/model_spin/set.000/force.npy
diff --git a/source/tests/model_spin/type.raw → source/tests/tf/model_spin/type.raw b/source/tests/model_spin/type.raw → source/tests/tf/model_spin/type.raw
diff --git a/source/tests/nvnmd/ref/box.npy → source/tests/tf/nvnmd/ref/box.npy b/source/tests/nvnmd/ref/box.npy → source/tests/tf/nvnmd/ref/box.npy
diff --git a/source/tests/nvnmd/ref/config_v0_cnn.npy → source/tests/tf/nvnmd/ref/config_v0_cnn.npy b/source/tests/nvnmd/ref/config_v0_cnn.npy → source/tests/tf/nvnmd/ref/config_v0_cnn.npy
diff --git a/source/tests/nvnmd/ref/config_v1_cnn.npy → source/tests/tf/nvnmd/ref/config_v1_cnn.npy b/source/tests/nvnmd/ref/config_v1_cnn.npy → source/tests/tf/nvnmd/ref/config_v1_cnn.npy
diff --git a/source/tests/nvnmd/ref/coord.npy → source/tests/tf/nvnmd/ref/coord.npy b/source/tests/nvnmd/ref/coord.npy → source/tests/tf/nvnmd/ref/coord.npy
diff --git a/source/tests/nvnmd/ref/type.raw → source/tests/tf/nvnmd/ref/type.raw b/source/tests/nvnmd/ref/type.raw → source/tests/tf/nvnmd/ref/type.raw
diff --git a/source/tests/nvnmd/ref/weight_v0_cnn.npy → source/tests/tf/nvnmd/ref/weight_v0_cnn.npy b/source/tests/nvnmd/ref/weight_v0_cnn.npy → source/tests/tf/nvnmd/ref/weight_v0_cnn.npy
diff --git a/source/tests/nvnmd/ref/weight_v1_cnn.npy → source/tests/tf/nvnmd/ref/weight_v1_cnn.npy b/source/tests/nvnmd/ref/weight_v1_cnn.npy → source/tests/tf/nvnmd/ref/weight_v1_cnn.npy
diff --git a/source/tests/pairwise_dprc.json → source/tests/tf/pairwise_dprc.json b/source/tests/pairwise_dprc.json → source/tests/tf/pairwise_dprc.json
diff --git a/source/tests/polar_se_a.json → source/tests/tf/polar_se_a.json b/source/tests/polar_se_a.json → source/tests/tf/polar_se_a.json
diff --git a/source/tests/polar_se_a_tebd.json → source/tests/tf/polar_se_a_tebd.json b/source/tests/polar_se_a_tebd.json → source/tests/tf/polar_se_a_tebd.json
diff --git a/source/tests/test.hdf5 → source/tests/tf/test.hdf5 b/source/tests/test.hdf5 → source/tests/tf/test.hdf5
diff --git a/source/tests/test_activation_fn_gelu.py → source/tests/tf/test_activation_fn_gelu.py b/source/tests/test_activation_fn_gelu.py → source/tests/tf/test_activation_fn_gelu.py
diff --git a/source/tests/test_adjust_sel.py → source/tests/tf/test_adjust_sel.py b/source/tests/test_adjust_sel.py → source/tests/tf/test_adjust_sel.py
@@ -6,20 +6,20 @@
 
 import numpy as np
 
-# from deepmd.tf.entrypoints.compress import compress
-from common import (
-    j_loader,
-    run_dp,
-    tests_path,
-)
-
 from deepmd.tf.env import (
     GLOBAL_NP_FLOAT_PRECISION,
 )
 from deepmd.tf.infer import (
     DeepPot,
 )
 
+# from deepmd.tf.entrypoints.compress import compress
+from .common import (
+    j_loader,
+    run_dp,
+    tests_path,
+)
+
 if GLOBAL_NP_FLOAT_PRECISION == np.float32:
     default_places = 4
 else:

diff --git a/source/tests/test_auto_batch_size.py → source/tests/tf/test_auto_batch_size.py b/source/tests/test_auto_batch_size.py → source/tests/tf/test_auto_batch_size.py
diff --git a/source/tests/test_cluster.py → source/tests/tf/test_cluster.py b/source/tests/test_cluster.py → source/tests/tf/test_cluster.py
diff --git a/source/tests/test_common.py → source/tests/tf/test_common.py b/source/tests/test_common.py → source/tests/tf/test_common.py
diff --git a/source/tests/test_compat_input.py → source/tests/tf/test_compat_input.py b/source/tests/test_compat_input.py → source/tests/tf/test_compat_input.py
@@ -2,15 +2,15 @@
 import os
 import unittest
 
-from common import (
-    j_loader,
-)
-
 from deepmd.tf.utils.compat import (
     convert_input_v0_v1,
     convert_input_v1_v2,
 )
 
+from .common import (
+    j_loader,
+)
+
 
 class TestConvertInput(unittest.TestCase):
     def test_convert_smth(self):

diff --git a/source/tests/test_compressed_training.py → source/tests/tf/test_compressed_training.py b/source/tests/test_compressed_training.py → source/tests/tf/test_compressed_training.py
@@ -3,18 +3,19 @@
 import os
 import unittest
 
-# from deepmd.tf.entrypoints.compress import compress
-from common import (
-    j_loader,
-    run_dp,
-    tests_path,
-)
 from packaging.version import parse as parse_version
 
 from deepmd.tf.env import (
     tf,
 )
 
+# from deepmd.tf.entrypoints.compress import compress
+from .common import (
+    j_loader,
+    run_dp,
+    tests_path,
+)
+
 
 @unittest.skipIf(
     parse_version(tf.__version__) < parse_version("2"),

diff --git a/source/tests/test_data_large_batch.py → source/tests/tf/test_data_large_batch.py b/source/tests/test_data_large_batch.py → source/tests/tf/test_data_large_batch.py
@@ -3,10 +3,6 @@
 import unittest
 
 import numpy as np
-from common import (
-    gen_data,
-    j_loader,
-)
 from packaging.version import parse as parse_version
 
 from deepmd.tf.common import (
@@ -31,6 +27,11 @@
     TypeEmbedNet,
 )
 
+from .common import (
+    gen_data,
+    j_loader,
+)
+
 GLOBAL_ENER_FLOAT_PRECISION = tf.float64
 GLOBAL_TF_FLOAT_PRECISION = tf.float64
 GLOBAL_NP_FLOAT_PRECISION = np.float64

diff --git a/source/tests/test_data_modifier.py → source/tests/tf/test_data_modifier.py b/source/tests/test_data_modifier.py → source/tests/tf/test_data_modifier.py
@@ -2,11 +2,6 @@
 import os
 
 import numpy as np
-from common import (
-    Data,
-    j_loader,
-    tests_path,
-)
 
 from deepmd.tf.common import (
     data_requirement,
@@ -29,6 +24,12 @@
     DeepmdDataSystem,
 )
 
+from .common import (
+    Data,
+    j_loader,
+    tests_path,
+)
+
 if GLOBAL_NP_FLOAT_PRECISION == np.float32:
     global_default_fv_hh = 1e-2
     global_default_dw_hh = 1e-2

diff --git a/source/tests/test_data_modifier_shuffle.py → ...ce/tests/tf/test_data_modifier_shuffle.py b/source/tests/test_data_modifier_shuffle.py → ...ce/tests/tf/test_data_modifier_shuffle.py
diff --git a/source/tests/test_data_requirement.py → source/tests/tf/test_data_requirement.py b/source/tests/test_data_requirement.py → source/tests/tf/test_data_requirement.py
diff --git a/source/tests/test_deepdipole.py → source/tests/tf/test_deepdipole.py b/source/tests/test_deepdipole.py → source/tests/tf/test_deepdipole.py
@@ -4,12 +4,6 @@
 
 import ase.neighborlist
 import numpy as np
-from common import (
-    finite_difference,
-    strerch_box,
-    tests_path,
-    tf,
-)
 from packaging.version import parse as parse_version
 
 from deepmd.tf.env import (
@@ -22,6 +16,13 @@
     convert_pbtxt_to_pb,
 )
 
+from .common import (
+    finite_difference,
+    infer_path,
+    strerch_box,
+    tf,
+)
+
 if GLOBAL_NP_FLOAT_PRECISION == np.float32:
     default_places = 4
 else:
@@ -32,7 +33,7 @@ class TestDeepDipolePBC(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         convert_pbtxt_to_pb(
-            str(tests_path / os.path.join("infer", "deepdipole.pbtxt")), "deepdipole.pb"
+            str(infer_path / os.path.join("deepdipole.pbtxt")), "deepdipole.pb"
         )
         cls.dp = DeepDipole("deepdipole.pb")
 
@@ -111,7 +112,7 @@ class TestDeepDipoleNoPBC(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         convert_pbtxt_to_pb(
-            str(tests_path / os.path.join("infer", "deepdipole.pbtxt")), "deepdipole.pb"
+            str(infer_path / os.path.join("deepdipole.pbtxt")), "deepdipole.pb"
         )
         cls.dp = DeepDipole("deepdipole.pb")
 
@@ -185,7 +186,7 @@ class TestDeepDipoleNewPBC(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         convert_pbtxt_to_pb(
-            str(tests_path / os.path.join("infer", "deepdipole_new.pbtxt")),
+            str(infer_path / os.path.join("deepdipole_new.pbtxt")),
             "deepdipole_new.pb",
         )
         cls.dp = DeepDipole("deepdipole_new.pb")
@@ -656,7 +657,7 @@ class TestDeepDipoleFakePBC(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         convert_pbtxt_to_pb(
-            str(tests_path / os.path.join("infer", "deepdipole_fake.pbtxt")),
+            str(infer_path / os.path.join("deepdipole_fake.pbtxt")),
             "deepdipole_fake.pb",
         )
         cls.dp = DeepDipole("deepdipole_fake.pb")
@@ -1042,7 +1043,7 @@ class TestDeepDipoleNewPBCNeighborList(TestDeepDipoleNewPBC):
     @classmethod
     def setUpClass(cls):
         convert_pbtxt_to_pb(
-            str(tests_path / os.path.join("infer", "deepdipole_new.pbtxt")),
+            str(infer_path / os.path.join("deepdipole_new.pbtxt")),
             "deepdipole_new.pb",
         )
         cls.dp = DeepDipole(

diff --git a/source/tests/test_deepdos.py → source/tests/tf/test_deepdos.py b/source/tests/test_deepdos.py → source/tests/tf/test_deepdos.py
@@ -3,9 +3,6 @@
 import unittest
 
 import numpy as np
-from common import (
-    tests_path,
-)
 
 from deepmd.tf.env import (
     GLOBAL_NP_FLOAT_PRECISION,
@@ -17,6 +14,10 @@
     convert_pbtxt_to_pb,
 )
 
+from .common import (
+    infer_path,
+)
+
 if GLOBAL_NP_FLOAT_PRECISION == np.float32:
     default_places = 4
 else:
@@ -27,7 +28,7 @@ class TestDeepDOS(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         convert_pbtxt_to_pb(
-            str(tests_path / os.path.join("infer", "deepdos.pbtxt")), "deepdos.pb"
+            str(infer_path / os.path.join("deepdos.pbtxt")), "deepdos.pb"
         )
         cls.dp = DeepDOS("deepdos.pb")
 

diff --git a/source/tests/test_deepmd_data.py → source/tests/tf/test_deepmd_data.py b/source/tests/test_deepmd_data.py → source/tests/tf/test_deepmd_data.py
@@ -5,9 +5,6 @@
 import unittest
 
 import numpy as np
-from common import (
-    tests_path,
-)
 
 from deepmd.tf.env import (
     GLOBAL_NP_FLOAT_PRECISION,
@@ -16,6 +13,10 @@
     DeepmdData,
 )
 
+from .common import (
+    tests_path,
+)
+
 if GLOBAL_NP_FLOAT_PRECISION == np.float32:
     places = 6
 else:

diff --git a/source/tests/test_deepmd_data_sys.py → source/tests/tf/test_deepmd_data_sys.py b/source/tests/test_deepmd_data_sys.py → source/tests/tf/test_deepmd_data_sys.py
diff --git a/source/tests/test_deeppolar.py → source/tests/tf/test_deeppolar.py b/source/tests/test_deeppolar.py → source/tests/tf/test_deeppolar.py
@@ -4,10 +4,6 @@
 
 import ase.neighborlist
 import numpy as np
-from common import (
-    tests_path,
-    tf,
-)
 from packaging.version import parse as parse_version
 
 from deepmd.tf.env import (
@@ -20,6 +16,11 @@
     convert_pbtxt_to_pb,
 )
 
+from .common import (
+    infer_path,
+    tf,
+)
+
 if GLOBAL_NP_FLOAT_PRECISION == np.float32:
     default_places = 4
 else:
@@ -30,7 +31,7 @@ class TestDeepPolarPBC(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         convert_pbtxt_to_pb(
-            str(tests_path / os.path.join("infer", "deeppolar.pbtxt")), "deeppolar.pb"
+            str(infer_path / os.path.join("deeppolar.pbtxt")), "deeppolar.pb"
         )
         cls.dp = DeepPolar("deeppolar.pb")
 
@@ -121,7 +122,7 @@ class TestDeepPolarNoPBC(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         convert_pbtxt_to_pb(
-            str(tests_path / os.path.join("infer", "deeppolar.pbtxt")), "deeppolar.pb"
+            str(infer_path / os.path.join("deeppolar.pbtxt")), "deeppolar.pb"
         )
         cls.dp = DeepPolar("deeppolar.pb")
 
@@ -207,7 +208,7 @@ class TestDeepPolarNewPBC(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         convert_pbtxt_to_pb(
-            str(tests_path / os.path.join("infer", "deeppolar_new.pbtxt")),
+            str(infer_path / os.path.join("deeppolar_new.pbtxt")),
             "deeppolar_new.pb",
         )
         cls.dp = DeepPolar("deeppolar_new.pb")
@@ -1093,7 +1094,7 @@ class TestDeepPolarNewPBCNeighborList(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         convert_pbtxt_to_pb(
-            str(tests_path / os.path.join("infer", "deeppolar_new.pbtxt")),
+            str(infer_path / os.path.join("deeppolar_new.pbtxt")),
             "deeppolar_new.pb",
         )
         cls.dp = DeepPolar(
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ @@
         Union,
     )
-    from deepmd.tf.entrypoints.main import (
+    from deepmd.main import (
         get_ll,
         parse_args,
     )
@@ Expand Down @@