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

Feat: add DOS net #3452

Merged
merged 32 commits into from
Mar 15, 2024
Merged

Feat: add DOS net #3452

merged 32 commits into from
Mar 15, 2024

Conversation

anyangml
Copy link
Collaborator

@anyangml anyangml commented Mar 12, 2024

This PR provides DOS fitting net in Pytorch.

Future TODO:

  • Loss implementation
    • Training/Fine-tuning test
    • Jit test
  • Doc

@anyangml anyangml marked this pull request as draft March 12, 2024 12:14
Copy link

codecov bot commented Mar 12, 2024

Codecov Report

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

Project coverage is 77.47%. Comparing base (da866a2) to head (784d7b9).
Report is 1 commits behind head on devel.

Files Patch % Lines
deepmd/pt/model/model/dos_model.py 62.96% 10 Missing ⚠️
deepmd/dpmodel/fitting/dos_fitting.py 93.54% 2 Missing ⚠️
deepmd/dpmodel/fitting/general_fitting.py 50.00% 2 Missing ⚠️
deepmd/pt/train/training.py 33.33% 2 Missing ⚠️
deepmd/tf/fit/dos.py 93.10% 2 Missing ⚠️
deepmd/infer/deep_dos.py 66.66% 1 Missing ⚠️
deepmd/pt/model/task/dos.py 97.61% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #3452      +/-   ##
==========================================
+ Coverage   77.35%   77.47%   +0.11%     
==========================================
  Files         428      431       +3     
  Lines       36999    37134     +135     
  Branches     1620     1620              
==========================================
+ Hits        28621    28769     +148     
+ Misses       7510     7497      -13     
  Partials      868      868              

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

Comment on lines +9 to +11
from .dp_model import (
DPModel,
)

Check notice

Code scanning / CodeQL

Cyclic import Note

Import of module
deepmd.pt.model.model.dp_model
begins an import cycle.
Comment on lines +51 to +53
from deepmd.pt.model.model.dos_model import (
DOSModel,
)

Check notice

Code scanning / CodeQL

Cyclic import Note

Import of module
deepmd.pt.model.model.dos_model
begins an import cycle.
source/tests/consistent/fitting/test_dos.py Fixed Show fixed Hide fixed
source/tests/consistent/fitting/test_dos.py Fixed Show fixed Hide fixed
source/tests/consistent/fitting/test_dos.py Fixed Show fixed Hide fixed
source/tests/consistent/fitting/test_dos.py Fixed Show fixed Hide fixed
source/tests/consistent/fitting/test_dos.py Dismissed Show dismissed Hide dismissed
source/tests/consistent/fitting/test_dos.py Dismissed Show dismissed Hide dismissed
source/tests/consistent/fitting/test_dos.py Dismissed Show dismissed Hide dismissed
source/tests/consistent/fitting/test_dos.py Dismissed Show dismissed Hide dismissed
source/tests/consistent/fitting/test_dos.py Dismissed Show dismissed Hide dismissed
@anyangml anyangml marked this pull request as ready for review March 13, 2024 12:26
@anyangml anyangml requested review from njzjz and wanghan-iapcm and removed request for njzjz March 13, 2024 12:29
deepmd/tf/fit/dos.py Fixed Show fixed Hide fixed
deepmd/tf/fit/dos.py Show resolved Hide resolved
deepmd/tf/fit/dos.py Show resolved Hide resolved
deepmd/tf/fit/dos.py Show resolved Hide resolved
deepmd/tf/fit/dos.py Show resolved Hide resolved
@anyangml anyangml requested a review from njzjz March 15, 2024 02:23
deepmd/pt/model/model/__init__.py Outdated Show resolved Hide resolved
deepmd/tf/fit/dos.py Show resolved Hide resolved
@anyangml anyangml requested a review from wanghan-iapcm March 15, 2024 03:30
@wanghan-iapcm wanghan-iapcm enabled auto-merge March 15, 2024 03:32
@wanghan-iapcm wanghan-iapcm added this pull request to the merge queue Mar 15, 2024
Merged via the queue into deepmodeling:devel with commit 2caf92c Mar 15, 2024
48 checks passed
@anyangml anyangml mentioned this pull request Mar 18, 2024
5 tasks
github-merge-queue bot pushed a commit that referenced this pull request Mar 25, 2024
This is a follow-up PR on #3452 

- [x]  Add DOS loss
- [x] Fix stat calculation
- [x] Add UT on training
- [x] Add e2e JIT test
- [x]  fix dp test data shape

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: anyangml <[email protected]>
@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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants