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

Hybrid descriptor #3365

Merged
merged 15 commits into from
Mar 1, 2024
Merged

Hybrid descriptor #3365

merged 15 commits into from
Mar 1, 2024

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Feb 29, 2024

No description provided.

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>
deepmd/dpmodel/descriptor/hybrid.py Fixed Show fixed Hide fixed
deepmd/dpmodel/descriptor/hybrid.py Fixed Show fixed Hide fixed
deepmd/tf/descriptor/hybrid.py Fixed Show fixed Hide fixed
deepmd/tf/descriptor/hybrid.py Fixed Show fixed Hide fixed
deepmd/pt/model/descriptor/hybrid.py Fixed Show fixed Hide fixed
deepmd/pt/model/descriptor/hybrid.py Fixed Show fixed Hide fixed
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Copy link

codecov bot commented Feb 29, 2024

Codecov Report

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

Project coverage is 76.06%. Comparing base (d09af56) to head (35f68e2).
Report is 5 commits behind head on devel.

Files Patch % Lines
deepmd/dpmodel/descriptor/hybrid.py 82.17% 18 Missing ⚠️
deepmd/pt/model/descriptor/hybrid.py 89.79% 10 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #3365      +/-   ##
==========================================
+ Coverage   75.91%   76.06%   +0.15%     
==========================================
  Files         420      421       +1     
  Lines       35165    35514     +349     
  Branches     1610     1618       +8     
==========================================
+ Hits        26694    27013     +319     
- Misses       7603     7633      +30     
  Partials      868      868              

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

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
deepmd/dpmodel/descriptor/hybrid.py Outdated Show resolved Hide resolved
deepmd/dpmodel/descriptor/hybrid.py Outdated Show resolved Hide resolved
deepmd/dpmodel/descriptor/hybrid.py Outdated Show resolved Hide resolved
deepmd/dpmodel/descriptor/hybrid.py Outdated Show resolved Hide resolved
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 njzjz requested a review from wanghan-iapcm February 29, 2024 23:02
self.descrpt_list[ii].get_ntypes() == self.descrpt_list[0].get_ntypes()
), f"number of atom types in {ii}th descrptor {self.descrpt_list[0].__class__.__name__} does not match others"
# if hybrid sel is larger than sub sel, the nlist needs to be cut for each type
hybrid_sel = self.get_sel()

Check warning

Code scanning / CodeQL

Variable defined multiple times Warning

This assignment to 'hybrid_sel' is unnecessary as it is
redefined
before this value is used.
This assignment to 'hybrid_sel' is unnecessary as it is
redefined
before this value is used.
)
dd0 = DescrptHybrid(list=[ddsub0, ddsub1])
dd1 = DescrptHybrid.deserialize(dd0.serialize())
dd0 = torch.jit.script(dd0)

Check notice

Code scanning / CodeQL

Unused local variable Note test

Variable dd0 is not used.
dd0 = DescrptHybrid(list=[ddsub0, ddsub1])
dd1 = DescrptHybrid.deserialize(dd0.serialize())
dd0 = torch.jit.script(dd0)
dd1 = torch.jit.script(dd1)

Check notice

Code scanning / CodeQL

Unused local variable Note test

Variable dd1 is not used.
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.

The mixed_types and get_sel methods of the linear combination atomic model may be want to aligned with the behavior of the hybrid descriptor. @anyangml

@wanghan-iapcm wanghan-iapcm added this pull request to the merge queue Mar 1, 2024
Merged via the queue into deepmodeling:devel with commit fd600d7 Mar 1, 2024
48 checks passed
@njzjz njzjz mentioned this pull request Apr 2, 2024
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.

3 participants