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

Chore: refactor dpmodel #3663

Merged
merged 44 commits into from
Apr 15, 2024
Merged

Conversation

anyangml
Copy link
Collaborator

@anyangml anyangml commented Apr 11, 2024

To decouple Model from DPAtomicModel, allowing make_model on different atomic model.

@anyangml anyangml marked this pull request as draft April 11, 2024 06:15
@anyangml anyangml closed this Apr 11, 2024
@anyangml anyangml deleted the chore/refactor-dpmodel branch April 11, 2024 06:23
@anyangml anyangml restored the chore/refactor-dpmodel branch April 11, 2024 06:30
@anyangml anyangml reopened this Apr 11, 2024
Copy link

codecov bot commented Apr 11, 2024

Codecov Report

Attention: Patch coverage is 97.54098% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 81.89%. Comparing base (3eb3d51) to head (7399d3e).

Files Patch % Lines
deepmd/pt/model/model/__init__.py 92.30% 1 Missing ⚠️
deepmd/pt/model/model/dp_zbl_model.py 50.00% 1 Missing ⚠️
deepmd/pt/model/model/make_model.py 50.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #3663      +/-   ##
==========================================
+ Coverage   81.87%   81.89%   +0.02%     
==========================================
  Files         503      508       +5     
  Lines       46570    46635      +65     
  Branches     2952     2952              
==========================================
+ Hits        38129    38192      +63     
- Misses       7548     7550       +2     
  Partials      893      893              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@anyangml anyangml requested review from wanghan-iapcm and njzjz and removed request for wanghan-iapcm April 11, 2024 09:50
@anyangml anyangml marked this pull request as ready for review April 11, 2024 13:17
deepmd/pt/model/model/ener_model.py Outdated Show resolved Hide resolved
deepmd/pt/model/model/dp_model.py Outdated Show resolved Hide resolved
deepmd/pt/model/model/dp_model.py Outdated Show resolved Hide resolved
deepmd/pt/model/model/ener_model.py Outdated Show resolved Hide resolved
@anyangml
Copy link
Collaborator Author

@njzjz , it seems removing standard caused an inconsistency in deserialization between pt and tf. I am not entirely sure what is missing, can you take a look

deepmd/dpmodel/model/base_model.py Outdated Show resolved Hide resolved
deepmd/dpmodel/model/base_model.py Outdated Show resolved Hide resolved
deepmd/utils/argcheck.py Outdated Show resolved Hide resolved
deepmd/tf/model/model.py Outdated Show resolved Hide resolved
deepmd/utils/argcheck.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@wanghan-iapcm wanghan-iapcm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GLTM

deepmd/tf/model/tensor.py Outdated Show resolved Hide resolved
@anyangml anyangml requested a review from njzjz April 15, 2024 02:13
@njzjz njzjz added this pull request to the merge queue Apr 15, 2024
Merged via the queue into deepmodeling:devel with commit 25435c0 Apr 15, 2024
48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants