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

add pairwise DPRc #2682

Merged
merged 57 commits into from
Jul 20, 2023
Merged

add pairwise DPRc #2682

merged 57 commits into from
Jul 20, 2023

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Jul 17, 2023

Add an experimental model called pairwise DPRc, which is fragment-based and integrated with QM/MM. Compression inference and training are supported.
Unit tests and documentation have been added.

Some features or bugfix to implement this PR have been merged in #2549, #2600, #2601, #2604, #2631, #2635, #2665, #2666, #2667, and #2679.
This PR makes some changes to model.build_descrpt additionally:

  • fix errors when the suffix is not empty
  • fix errors when fparam or aparam are given
  • support model-customized input_map

njzjz and others added 30 commits June 2, 2023 00:21
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
(cherry picked from commit e40c94c)
It seems that deepmodeling#1891 wrongly added a suffix to the variable names to make them like `filter_type_all_suffix/matrix_1_suffix`. However, it is expected to be `filter_type_all_suffix/matrix_1` which is consistent in other classes and methods.

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
njzjz and others added 20 commits July 9, 2023 19:06
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
(cherry picked from commit 1cbe1a8)
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
@codecov
Copy link

codecov bot commented Jul 17, 2023

Codecov Report

Patch coverage: 59.50% and project coverage change: -0.21 ⚠️

Comparison is base (205023b) 78.37% compared to head (f41da34) 78.17%.

Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #2682      +/-   ##
==========================================
- Coverage   78.37%   78.17%   -0.21%     
==========================================
  Files         235      238       +3     
  Lines       24506    24854     +348     
  Branches     1469     1509      +40     
==========================================
+ Hits        19207    19429     +222     
- Misses       4907     5035     +128     
+ Partials      392      390       -2     
Impacted Files Coverage Δ
deepmd/descriptor/descriptor.py 84.84% <ø> (+2.23%) ⬆️
deepmd/entrypoints/freeze.py 59.17% <ø> (ø)
source/op/pairwise.cc 0.79% <0.79%> (ø)
deepmd/model/model.py 73.41% <38.46%> (-4.80%) ⬇️
deepmd/model/pairwise_dprc.py 96.39% <96.39%> (ø)
source/lib/src/pairwise.cc 97.40% <97.40%> (ø)
deepmd/entrypoints/train.py 88.00% <100.00%> (+1.24%) ⬆️
deepmd/model/ener.py 96.22% <100.00%> (ø)
deepmd/utils/argcheck.py 95.75% <100.00%> (+0.11%) ⬆️

... and 8 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@wanghan-iapcm wanghan-iapcm merged commit 6389891 into deepmodeling:devel Jul 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants