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: support exclude atypes in atomic model #3357

Merged
merged 12 commits into from
Feb 29, 2024

Conversation

wanghan-iapcm
Copy link
Collaborator

@wanghan-iapcm wanghan-iapcm commented Feb 28, 2024

With this pr, we do not need to implement the exclude types for each descriptor and fitting.

@wanghan-iapcm wanghan-iapcm marked this pull request as draft February 28, 2024 10:30
Copy link

codecov bot commented Feb 28, 2024

Codecov Report

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

Project coverage is 75.98%. Comparing base (17bd1ec) to head (8a9d829).
Report is 2 commits behind head on devel.

Files Patch % Lines
...pmd/dpmodel/atomic_model/make_base_atomic_model.py 80.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #3357      +/-   ##
==========================================
+ Coverage   75.91%   75.98%   +0.07%     
==========================================
  Files         416      416              
  Lines       35057    35160     +103     
  Branches     1614     1614              
==========================================
+ Hits        26612    26715     +103     
  Misses       7577     7577              
  Partials      868      868              

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

@wanghan-iapcm wanghan-iapcm marked this pull request as ready for review February 28, 2024 13:25
@wanghan-iapcm wanghan-iapcm changed the title [WIP] feat: support exclude atypes in atomic model feat: support exclude atypes in atomic model Feb 28, 2024
deepmd/utils/argcheck.py Show resolved Hide resolved
@wanghan-iapcm wanghan-iapcm added this pull request to the merge queue Feb 29, 2024
Merged via the queue into deepmodeling:devel with commit 342b0c3 Feb 29, 2024
48 checks passed
@wanghan-iapcm wanghan-iapcm deleted the feat-atm-md-mask branch February 29, 2024 06:50
github-merge-queue bot pushed a commit that referenced this pull request Mar 2, 2024
…s. (#3389)

This PR also
- introduce atomic_output_def used wraps the fitting_output_def. 
- atomic_output_def will be used by make_model
- add missing ut for pair and atom exclusions in dpmodel

See also #3357

---------

Co-authored-by: Han Wang <[email protected]>
@njzjz njzjz mentioned this pull request Apr 2, 2024
github-merge-queue bot pushed a commit that referenced this pull request Oct 23, 2024
Add JAX energy model without grad support. The grad support needs
discussion.
Array API is not supported in this PR as it needs more effort. (JAX has
more APIs than Array API)
This PR also fixes a `skip_tf` bug introduced in #3357. When no
`@property` was added, `xx.skip_tf` is always cast to `True`.

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

## Release Notes

- **New Features**
- Enhanced `BaseAtomicModel` and `DPAtomicModel` classes with improved
array compatibility and new output definitions.
- Introduced new classes and attributes for better model flexibility and
customization.
- Added `EnergyFittingNet` and `DOSFittingNet` for advanced fitting
capabilities.
- New functions `get_standard_model` and `get_model` for flexible model
creation based on input data.
- Added `BaseDescriptor` and `BaseFitting` classes to streamline
descriptor and fitting processes.
	- Introduced `EnergyModel` class for improved atomic model handling.

- **Bug Fixes**
	- Updated serialization logic for consistency across models.

- **Tests**
- Enhanced testing framework to support JAX operations and added methods
for JAX model evaluation.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Signed-off-by: Jinzhe Zeng <[email protected]>
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