fix

Author: OutisLi

source/tests/tf/data_modifier/dipole.json

@@ -53,26 +53,20 @@
     "_comment4": " that's all"
   },
 
-  "_comment5": " traing controls",
   "training": {
-    "systems": [
-      "data_modifier/sys_10"
-    ],
-    "stop_batch": 1000000,
-    "batch_size": 4,
-
+    "training_data": {
+      "systems": [
+        "data_modifier/sys_10"
+      ],
+      "batch_size": 4
+    },
+    "numb_steps": 1000000,
     "seed": 1,
-
-    "_comment6": " display and restart",
-    "_comment7": " frequencies counted in batch",
     "disp_file": "lcurve.out",
     "disp_freq": 100,
     "numb_test": 5,
     "save_freq": 500,
     "save_ckpt": "model.ckpt",
-    "load_ckpt": "model.ckpt",
-    "disp_training": true,
-    "time_training": true,
     "_comment8": "that's all"
   },
 

source/tests/tf/test_data_modifier.py

@@ -22,9 +22,6 @@
 from deepmd.utils.argcheck import (
     normalize,
 )
-from deepmd.utils.compat import (
-    update_deepmd_input,
-)
 
 from .common import (
     Data,
@@ -59,18 +56,17 @@ def _setUp(self) -> None:
             restart=None, init_model=None, log_path=None, log_level=30, mpi_log="master"
         )
         jdata = j_loader(INPUT)
-        jdata = update_deepmd_input(jdata, warning=True)
         jdata = normalize(jdata)
         # init model
         model = DPTrainer(jdata, run_opt=run_opt)
         rcut = model.model.get_rcut()
 
         # init data system
-        systems = jdata["training"]["systems"]
+        systems = jdata["training"]["training_data"]["systems"]
         # systems[0] = tests_path / systems[0]
         systems = [tests_path / ii for ii in systems]
         set_pfx = "set"
-        batch_size = jdata["training"]["batch_size"]
+        batch_size = jdata["training"]["training_data"]["batch_size"]
         test_size = jdata["training"]["numb_test"]
         data = DeepmdDataSystem(
             systems, batch_size, test_size, rcut, set_prefix=set_pfx

source/tests/tf/test_data_modifier_shuffle.py

@@ -26,9 +26,6 @@
 from deepmd.utils.argcheck import (
     normalize,
 )
-from deepmd.utils.compat import (
-    update_deepmd_input,
-)
 
 from ..seed import (
     GLOBAL_SEED,
@@ -64,7 +61,6 @@ def _setUp(self) -> None:
             restart=None, init_model=None, log_path=None, log_level=30, mpi_log="master"
         )
         jdata = self._setUp_jdata()
-        jdata = update_deepmd_input(jdata, warning=True)
         jdata = normalize(jdata)
         self._setUp_data()
 
@@ -73,9 +69,9 @@ def _setUp(self) -> None:
         rcut = model.model.get_rcut()
 
         # init data system
-        systems = jdata["training"]["systems"]
+        systems = jdata["training"]["training_data"]["systems"]
         set_pfx = "set"
-        batch_size = jdata["training"]["batch_size"]
+        batch_size = jdata["training"]["training_data"]["batch_size"]
         test_size = jdata["training"]["numb_test"]
         data = DeepmdDataSystem(
             systems, batch_size, test_size, rcut, set_prefix=set_pfx
@@ -182,9 +178,11 @@ def _setUp_jdata(self):
                 "decay_rate": 0.95,
             },
             "training": {
-                "systems": ["data_modifier/sys_test_0"],
-                "stop_batch": 1000000,
-                "batch_size": 1,
+                "training_data": {
+                    "systems": ["data_modifier/sys_test_0"],
+                    "batch_size": 1,
+                },
+                "numb_steps": 1000000,
                 "numb_test": 2,
             },
         }