Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

breaking: remove default values for training reuse arguments #1330

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dpgen/generator/arginfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,28 +154,28 @@ def training_args() -> list[Argument]:
[None, int],
alias=["training_reuse_stop_batch"],
optional=True,
default=400000,
default=None,
doc=doc_training_reuse_numb_steps,
),
Argument(
"training_reuse_start_lr",
[None, float],
optional=True,
default=1e-4,
default=None,
doc=doc_training_reuse_start_lr,
),
Argument(
"training_reuse_start_pref_e",
[None, float, int],
optional=True,
default=0.1,
default=None,
doc=doc_training_reuse_start_pref_e,
),
Argument(
"training_reuse_start_pref_f",
[None, float, int],
optional=True,
default=100,
default=None,
doc=doc_training_reuse_start_pref_f,
),
Argument(
Expand Down
21 changes: 14 additions & 7 deletions dpgen/generator/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,11 @@ def make_train(iter_index, jdata, mdata):
elif "training_reuse_numb_steps" in jdata.keys():
training_reuse_stop_batch = jdata["training_reuse_numb_steps"]
else:
training_reuse_stop_batch = 400000
training_reuse_stop_batch = None

training_reuse_start_lr = jdata.get("training_reuse_start_lr", 1e-4)
training_reuse_start_pref_e = jdata.get("training_reuse_start_pref_e", 0.1)
training_reuse_start_pref_f = jdata.get("training_reuse_start_pref_f", 100)
training_reuse_start_lr = jdata.get("training_reuse_start_lr")
training_reuse_start_pref_e = jdata.get("training_reuse_start_pref_e")
training_reuse_start_pref_f = jdata.get("training_reuse_start_pref_f")
model_devi_activation_func = jdata.get("model_devi_activation_func", None)

auto_ratio = False
Expand Down Expand Up @@ -509,11 +509,18 @@ def make_train(iter_index, jdata, mdata):
raise RuntimeError(
"Unsupported DeePMD-kit version: %s" % mdata["deepmd_version"]
)
if jinput["loss"].get("start_pref_e") is not None:
if (
jinput["loss"].get("start_pref_e") is not None
and training_reuse_start_pref_e is not None
):
jinput["loss"]["start_pref_e"] = training_reuse_start_pref_e
if jinput["loss"].get("start_pref_f") is not None:
if (
jinput["loss"].get("start_pref_f") is not None
and training_reuse_start_pref_f is not None
):
jinput["loss"]["start_pref_f"] = training_reuse_start_pref_f
jinput["learning_rate"]["start_lr"] = training_reuse_start_lr
if training_reuse_start_lr is not None:
jinput["learning_rate"]["start_lr"] = training_reuse_start_lr

input_files = []
for ii in range(numb_models):
Expand Down
Loading