Skip to content

Commit a1220c8

Browse files
committed
fix: add update_deepmd_input to tf unit test
1 parent 17f04d6 commit a1220c8

3 files changed

Lines changed: 23 additions & 24 deletions

File tree

source/tests/tf/data_modifier/dipole.json

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,26 +53,23 @@
5353
"_comment4": " that's all"
5454
},
5555

56-
"_comment5": " traing controls",
57-
"training": {
58-
"systems": [
59-
"data_modifier/sys_10"
60-
],
61-
"stop_batch": 1000000,
62-
"batch_size": 4,
56+
"optimizer": {
57+
"type": "Adam"
58+
},
6359

60+
"training": {
61+
"training_data": {
62+
"systems": [
63+
"data_modifier/sys_10"
64+
],
65+
"batch_size": 4
66+
},
67+
"numb_steps": 1000000,
6468
"seed": 1,
65-
66-
"_comment6": " display and restart",
67-
"_comment7": " frequencies counted in batch",
6869
"disp_file": "lcurve.out",
6970
"disp_freq": 100,
70-
"numb_test": 5,
7171
"save_freq": 500,
7272
"save_ckpt": "model.ckpt",
73-
"load_ckpt": "model.ckpt",
74-
"disp_training": true,
75-
"time_training": true,
7673
"_comment8": "that's all"
7774
},
7875

source/tests/tf/test_data_modifier.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ def _setUp(self) -> None:
6262
rcut = model.model.get_rcut()
6363

6464
# init data system
65-
systems = jdata["training"]["systems"]
65+
systems = jdata["training"]["training_data"]["systems"]
6666
# systems[0] = tests_path / systems[0]
6767
systems = [tests_path / ii for ii in systems]
6868
set_pfx = "set"
69-
batch_size = jdata["training"]["batch_size"]
70-
test_size = jdata["training"]["numb_test"]
69+
batch_size = jdata["training"]["training_data"]["batch_size"]
70+
test_size = 1
7171
data = DeepmdDataSystem(
7272
systems, batch_size, test_size, rcut, set_prefix=set_pfx
7373
)

source/tests/tf/test_data_modifier_shuffle.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ def _setUp(self) -> None:
6969
rcut = model.model.get_rcut()
7070

7171
# init data system
72-
systems = jdata["training"]["systems"]
72+
systems = jdata["training"]["training_data"]["systems"]
7373
set_pfx = "set"
74-
batch_size = jdata["training"]["batch_size"]
75-
test_size = jdata["training"]["numb_test"]
74+
batch_size = jdata["training"]["training_data"]["batch_size"]
75+
test_size = 1
7676
data = DeepmdDataSystem(
7777
systems, batch_size, test_size, rcut, set_prefix=set_pfx
7878
)
@@ -177,11 +177,13 @@ def _setUp_jdata(self):
177177
"decay_steps": 5000,
178178
"decay_rate": 0.95,
179179
},
180+
"optimizer": {"type": "Adam"},
180181
"training": {
181-
"systems": ["data_modifier/sys_test_0"],
182-
"stop_batch": 1000000,
183-
"batch_size": 1,
184-
"numb_test": 2,
182+
"training_data": {
183+
"systems": ["data_modifier/sys_test_0"],
184+
"batch_size": 1,
185+
},
186+
"numb_steps": 1000000,
185187
},
186188
}
187189
return jdata

0 commit comments

Comments
 (0)