Skip to content
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
1 change: 1 addition & 0 deletions deepmd/dpmodel/infer/deep_eval.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def __init__(

model_data = load_dp_model(model_file)
self.dp = BaseModel.deserialize(model_data["model"])
self.dp.model_def_script = json.dumps(model_data.get("model_def_script", {}))
self.rcut = self.dp.get_rcut()
self.type_map = self.dp.get_type_map()
if isinstance(auto_batch_size, bool):
Expand Down
2 changes: 1 addition & 1 deletion deepmd/jax/infer/deep_eval.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def __init__(
stablehlo_atomic_virial_no_ghost=model_data["@variables"][
"stablehlo_atomic_virial_no_ghost"
].tobytes(),
model_def_script=model_data["model_def_script"],
model_def_script=json.dumps(model_data["model_def_script"]),
Comment thread
njzjz marked this conversation as resolved.
**model_data["constants"],
)
elif model_file.endswith(".savedmodel"):
Expand Down
2 changes: 1 addition & 1 deletion deepmd/pd/infer/deep_eval.py
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ def eval_typeebd(self) -> np.ndarray:
typeebd = paddle.concat(out, axis=1)
return to_numpy_array(typeebd)

def get_model_def_script(self) -> str:
def get_model_def_script(self) -> dict:
"""Get model definition script."""
return self.model_def_script

Expand Down
2 changes: 1 addition & 1 deletion deepmd/pt/infer/deep_eval.py
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ def eval_typeebd(self) -> np.ndarray:
typeebd = torch.cat(out, dim=1)
return to_numpy_array(typeebd)

def get_model_def_script(self) -> str:
def get_model_def_script(self) -> dict:
"""Get model definition script."""
return self.model_def_script

Expand Down
1 change: 1 addition & 0 deletions source/tests/consistent/io/test_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ def test_deep_eval(self) -> None:
prefix + backend.suffixes[suffix_idx], reference_data
)
deep_eval = DeepEval(prefix + backend.suffixes[suffix_idx])
self.assertIsInstance(deep_eval.get_model_def_script(), dict)
if deep_eval.get_dim_fparam() > 0:
fparam = np.ones((nframes, deep_eval.get_dim_fparam()))
else:
Expand Down