add BaseModel; store type in serialization#3335
Merged
wanghan-iapcm merged 17 commits intodeepmodeling:develfrom Feb 27, 2024
Merged
add BaseModel; store type in serialization#3335wanghan-iapcm merged 17 commits intodeepmodeling:develfrom
wanghan-iapcm merged 17 commits intodeepmodeling:develfrom
Conversation
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+26
to
+28
| from deepmd.pt.model.model.dipole_model import ( | ||
| DipoleModel, | ||
| ) |
Check notice
Code scanning / CodeQL
Cyclic import
Comment on lines
+29
to
+31
| from deepmd.pt.model.model.ener_model import ( | ||
| EnergyModel, | ||
| ) |
Check notice
Code scanning / CodeQL
Cyclic import
Comment on lines
+32
to
+34
| from deepmd.pt.model.model.polar_model import ( | ||
| PolarModel, | ||
| ) |
Check notice
Code scanning / CodeQL
Cyclic import
|
|
||
| class DPZBLModel(DPZBLModel_): | ||
| @BaseModel.register("zbl") | ||
| class DPZBLModel(DPZBLModel_, BaseModel): |
Check warning
Code scanning / CodeQL
Conflicting attributes in base classes
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## devel #3335 +/- ##
==========================================
+ Coverage 75.52% 75.57% +0.05%
==========================================
Files 408 409 +1
Lines 34277 34377 +100
Branches 1604 1600 -4
==========================================
+ Hits 25888 25982 +94
- Misses 7528 7534 +6
Partials 861 861 ☔ View full report in Codecov by Sentry. |
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
| DPModel = make_model(DPAtomicModel) | ||
|
|
||
| @BaseModel.register("standard") | ||
| class DPModel(make_model(DPAtomicModel), BaseModel): |
Check warning
Code scanning / CodeQL
Conflicting attributes in base classes
3 tasks
Collaborator
wanghan-iapcm
left a comment
wanghan-iapcm
left a comment
There was a problem hiding this comment.
- I do not understand why the
serializationanddeserializationcannot be put intBaseBaseModel. - would the following inheritance work?
# torch.nn.Module BaseAtomicModel BaseBaseModel
# | | |
# ------------------------- |
# | |
# DPAtomicModel |
# | |
# make_model(DPAtomicModel) |
# | |
# ----------------------------------
# |
# DPModel
- in our concept a model is an atomic model, therefore, the base model seems to be a facilitate that provides the plugin, other methods like the
get_rcut,get_dim_fparam... seems to be inherited from atomic model rather than model .
Co-authored-by: Han Wang <92130845+wanghan-iapcm@users.noreply.github.com> Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Co-authored-by: Han Wang <92130845+wanghan-iapcm@users.noreply.github.com> 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>
This reverts commit 054fba6.
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Member
Author
Done.
We cannot store the plugins of dpmodel and pt in the same class. There must be seperately classes to initialize the plugin separately.
It looks to me |
iProzd
reviewed
Feb 26, 2024
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Collaborator
it should be possible to |
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
njzjz
commented
Feb 26, 2024
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
wanghan-iapcm
approved these changes
Feb 27, 2024
3 tasks
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.