Skip to content

fix model conversion of 0.12 #1941

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.

Sign up for GitHub

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

Merged
wanghan-iapcm merged 2 commits into from
Sep 23, 2022
Merged

fix model conversion of 0.12 #1941

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
171d13f
add `descrpt_attr/rcut`, `descrpt_attr/ntypes`, `fitting_attr/dfparam…
njzjz Sep 22, 2022
d71b9e1
add o_energy and so on
njzjz Sep 22, 2022
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
228 changes: 142 additions & 86 deletions deepmd/utils/convert.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import textwrap
from deepmd.env import tf
from google.protobuf import text_format

Expand Down Expand Up @@ -165,10 +166,65 @@ def convert_dp012_to_dp10(file: str):
"""
with open(file) as fp:
file_content = fp.read()
# note: atom_energy must be put before energy,
# otherwise atom_energy_test -> atom_o_energy
file_content = file_content\
.replace('DescrptNorot', 'DescrptSeA') \
.replace('ProdForceNorot', 'ProdForceSeA') \
.replace('ProdVirialNorot', 'ProdVirialSeA')
.replace('ProdVirialNorot', 'ProdVirialSeA') \
.replace('t_rcut', 'descrpt_attr/rcut') \
.replace('t_ntypes', 'descrpt_attr/ntypes') \
.replace('atom_energy_test', 'o_atom_energy') \
.replace('atom_virial_test', 'o_atom_virial') \
.replace('energy_test', 'o_energy') \
.replace('force_test', 'o_force') \
.replace('virial_test', 'o_virial')
file_content += textwrap.dedent("""\
node {
name: "fitting_attr/dfparam"
op: "Const"
attr {
key: "dtype"
value {
type: DT_INT32
}
}
attr {
key: "value"
value {
tensor {
dtype: DT_INT32
tensor_shape {
}
int_val: 0
}
}
}
}
""")
file_content += textwrap.dedent("""\
node {
name: "model_attr/model_type"
op: "Const"
attr {
key: "dtype"
value {
type: DT_STRING
}
}
attr {
key: "value"
value {
tensor {
dtype: DT_STRING
tensor_shape {
}
string_val: "ener"
}
}
}
}
""")
with open(file, 'w') as fp:
fp.write(file_content)

Expand All @@ -182,28 +238,28 @@ def convert_dp10_to_dp11(file: str):
filename of the graph text
"""
with open(file, 'a') as f:
f.write("""
node {
name: "fitting_attr/daparam"
op: "Const"
attr {
key: "dtype"
value {
type: DT_INT32
}
}
attr {
key: "value"
value {
tensor {
dtype: DT_INT32
tensor_shape {
}
int_val: 0
}
} }
}
""")
f.write(textwrap.dedent("""\
node {
name: "fitting_attr/daparam"
op: "Const"
attr {
key: "dtype"
value {
type: DT_INT32
}
}
attr {
key: "value"
value {
tensor {
dtype: DT_INT32
tensor_shape {
}
int_val: 0
}
} }
}
"""))


def convert_dp12_to_dp13(file: str):
Expand Down Expand Up @@ -246,29 +302,29 @@ def convert_dp13_to_dp20(fname: str):
"""
with open(fname) as fp:
file_content = fp.read()
file_content += """
node {
name: "model_attr/model_version"
op: "Const"
attr {
key: "dtype"
value {
type: DT_STRING
}
}
attr {
key: "value"
value {
tensor {
dtype: DT_STRING
tensor_shape {
file_content += textwrap.dedent("""\
node {
name: "model_attr/model_version"
op: "Const"
attr {
key: "dtype"
value {
type: DT_STRING
}
}
attr {
key: "value"
value {
tensor {
dtype: DT_STRING
tensor_shape {
}
string_val: "1.0"
}
}
}
string_val: "1.0"
}
}
}
}
"""
""")
file_content = file_content\
.replace('DescrptSeA', 'ProdEnvMatA')\
.replace('DescrptSeR', 'ProdEnvMatR')
Expand All @@ -278,52 +334,52 @@ def convert_dp13_to_dp20(fname: str):
def convert_dp20_to_dp21(fname: str):
with open(fname) as fp:
file_content = fp.read()
old_model_version_node = """
node {
name: "model_attr/model_version"
op: "Const"
attr {
key: "dtype"
value {
type: DT_STRING
}
}
attr {
key: "value"
value {
tensor {
dtype: DT_STRING
tensor_shape {
old_model_version_node = textwrap.dedent("""\
node {
name: "model_attr/model_version"
op: "Const"
attr {
key: "dtype"
value {
type: DT_STRING
}
}
attr {
key: "value"
value {
tensor {
dtype: DT_STRING
tensor_shape {
}
string_val: "1.0"
}
}
}
string_val: "1.0"
}
}
}
}
"""
new_model_version_node = """
node {
name: "model_attr/model_version"
op: "Const"
attr {
key: "dtype"
value {
type: DT_STRING
}
}
attr {
key: "value"
value {
tensor {
dtype: DT_STRING
tensor_shape {
""")
new_model_version_node = textwrap.dedent("""\
node {
name: "model_attr/model_version"
op: "Const"
attr {
key: "dtype"
value {
type: DT_STRING
}
}
attr {
key: "value"
value {
tensor {
dtype: DT_STRING
tensor_shape {
}
string_val: "1.1"
}
}
}
string_val: "1.1"
}
}
}
}
"""
""")
file_content = file_content\
.replace(old_model_version_node, new_model_version_node)\
.replace('TabulateFusion', 'TabulateFusionSeA')\
Expand Down