Skip to content

Reduce dp mask pb size and fix bug in dim_fparam/dim_aparam fetching #2588

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
njzjz merged 20 commits into from
Jun 5, 2023
Merged

Reduce dp mask pb size and fix bug in dim_fparam/dim_aparam fetching #2588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0a5a734
Delete dp4mask.pb.... (#7)
dingye18 Feb 17, 2023
cb872ea
Update .gitignore
dingye18 Feb 18, 2023
070a98f
Merge branch 'devel' of github.com:dingye18/deepmd-kit into devel
dingye18 Apr 27, 2023
04c6057
Update input json for zinc-protein. Add training_data key in input.json
dingye18 Apr 27, 2023
7033f3d
Add example test for zinc_se_a_mask.json
dingye18 Apr 27, 2023
0f7a250
Fix typo error in zinc_se_a_mask.json
dingye18 Apr 27, 2023
8c4f3aa
Merge branch 'devel' into devel
dingye18 Apr 27, 2023
e60d3ec
Remove numb_batch in zinc_se_a_mask.json to pass strict mode dargs ch…
dingye18 Apr 28, 2023
ce1522e
Merge branch 'deepmodeling:devel' into devel
Jun 3, 2023
d8196f9
Fix bug in fparam dim and aparam dim fetching.
dingye18 Jun 3, 2023
b46ef3c
Merge branch 'devel' of github.com:dingye18/deepmd-kit into devel
dingye18 Jun 3, 2023
37b14c7
Update dp4mask.pbtxt to reduce the size.
dingye18 Jun 5, 2023
92bc060
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 5, 2023
87a3807
fix DeepPotModelDevi
njzjz Jun 5, 2023
99b1266
update dataset path in zinc_se_a_mask.json
dingye18 Jun 5, 2023
eb73a3d
Merge
dingye18 Jun 5, 2023
4426098
Merge branch 'devel' into reduce_dp_mask_pb_size
dingye18 Jun 5, 2023
b4ae0aa
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 5, 2023
f308aef
Update zinc_se_a_mask.json
dingye18 Jun 5, 2023
80a32c2
Merge
dingye18 Jun 5, 2023
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 source/api_c/src/c_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ DP_Nlist* DP_NewNlist(int inum_,

DP_DeepPot::DP_DeepPot() {}
DP_DeepPot::DP_DeepPot(deepmd::DeepPot& dp) : dp(dp) {
dfparam = dp.dim_aparam();
daparam = dp.dim_fparam();
dfparam = dp.dim_fparam();
daparam = dp.dim_aparam();
}

DP_DeepPot* DP_NewDeepPot(const char* c_model) {
Expand Down Expand Up @@ -62,8 +62,8 @@ DP_DeepPot* DP_NewDeepPotWithParam2(const char* c_model,
DP_DeepPotModelDevi::DP_DeepPotModelDevi() {}
DP_DeepPotModelDevi::DP_DeepPotModelDevi(deepmd::DeepPotModelDevi& dp)
: dp(dp) {
dfparam = dp.dim_aparam();
daparam = dp.dim_fparam();
dfparam = dp.dim_fparam();
daparam = dp.dim_aparam();
}

DP_DeepPotModelDevi* DP_NewDeepPotModelDevi(const char** c_models,
Expand Down
Binary file modified source/tests/data_dp_mask/set.000/aparam.npy
View file
Open in desktop
Binary file not shown.
Binary file modified source/tests/data_dp_mask/set.000/atom_pref.npy
View file
Open in desktop
Binary file not shown.
Binary file modified source/tests/data_dp_mask/set.000/coord.npy
View file
Open in desktop
Binary file not shown.
Binary file modified source/tests/data_dp_mask/set.000/force.npy
View file
Open in desktop
Binary file not shown.
126 changes: 0 additions & 126 deletions source/tests/data_dp_mask/type.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,130 +18,4 @@
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
3
4
4
4
4
4
4
5
4 changes: 0 additions & 4 deletions source/tests/data_dp_mask/type_map.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
C
O
N
H
S
ZN
Loading