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 se_atten_v2to PyTorch and DP #3840

Merged
merged 46 commits into from
Jun 6, 2024
Merged

Conversation

Chengqian-Zhang
Copy link
Collaborator

@Chengqian-Zhang Chengqian-Zhang commented May 30, 2024

Solve #3831 and #3139

  • add se_atten_v2 to PyTorch and DP
  • add document equation for se_attn_v2

Summary by CodeRabbit

  • New Features

    • Introduced a new descriptor class with enhanced configuration options and methods for serialization and deserialization.
    • Added new configurable parameters to the descriptor setup for improved flexibility.
  • Documentation

    • Updated function documentation to reflect new arguments and usage instructions.
  • Bug Fixes

    • Refined serialization logic to handle new parameters and class types more accurately.
    • Improved error messages for better clarity during serialization processes.

@Chengqian-Zhang Chengqian-Zhang marked this pull request as draft May 30, 2024 07:36
Copy link
Contributor

coderabbitai bot commented May 30, 2024

Walkthrough

Walkthrough

The updates introduce a new descriptor class DescrptSeAttenV2 across multiple files, enhancing the existing DescrptDPA1 class with additional parameters and methods for configuration, serialization, and deserialization. Changes also include refining serialization logic and updating argument checking functions to support new parameters.

Changes

File Path Change Summary
.../descriptor/se_atten_v2.py Introduced DescrptSeAttenV2 class with new parameters and serialization methods.
.../pt/model/descriptor/se_atten_v2.py Added DescrptSeAttenV2 class with extended constructor parameters from DescrptDPA1.
.../descriptor/se_atten.py Adjusted serialization logic and error messages for DescrptSeAtten and related classes.
.../utils/argcheck.py Added new arguments to descrpt_se_atten_v2_args() function, updating its documentation accordingly.

Sequence Diagram(s) (Beta)

sequenceDiagram
    participant User
    participant DescrptSeAttenV2
    participant Serializer
    User->>DescrptSeAttenV2: Initialize with extended parameters
    DescrptSeAttenV2->>Serializer: Call serialize method
    Serializer-->>DescrptSeAttenV2: Serialized data
    DescrptSeAttenV2-->>User: Return serialized data
Loading

Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between c982d0e and 38fc569.

Files selected for processing (1)
  • deepmd/utils/argcheck.py (1 hunks)
Files skipped from review as they are similar to previous changes (1)
  • deepmd/utils/argcheck.py

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

deepmd/dpmodel/descriptor/dpa1.py Outdated Show resolved Hide resolved
Copy link

codecov bot commented May 30, 2024

Codecov Report

Attention: Patch coverage is 79.48718% with 24 lines in your changes missing coverage. Please review.

Project coverage is 82.66%. Comparing base (eb474d4) to head (38fc569).
Report is 120 commits behind head on devel.

Files with missing lines Patch % Lines
deepmd/tf/descriptor/se_atten_v2.py 14.28% 24 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #3840      +/-   ##
==========================================
- Coverage   82.67%   82.66%   -0.01%     
==========================================
  Files         515      517       +2     
  Lines       49549    49662     +113     
  Branches     2989     2985       -4     
==========================================
+ Hits        40965    41055      +90     
- Misses       7673     7696      +23     
  Partials      911      911              

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

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

deepmd/pt/model/descriptor/__init__.py Outdated Show resolved Hide resolved
@Chengqian-Zhang Chengqian-Zhang marked this pull request as ready for review May 30, 2024 11:14
@Chengqian-Zhang Chengqian-Zhang changed the title Feat: add se_atten_v2to PyTorch and DP and redirect dpa1 to se_atten_v2 Feat: add se_atten_v2to PyTorch and DP May 30, 2024
deepmd/dpmodel/descriptor/dpa1.py Fixed Show fixed Hide fixed
deepmd/pt/model/descriptor/se_atten_v2.py Fixed Show fixed Hide fixed
source/tests/pt/model/test_se_attn_v2.py Fixed Show fixed Hide fixed
source/tests/pt/model/test_se_attn_v2.py Fixed Show fixed Hide fixed
source/tests/pt/model/test_se_attn_v2.py Fixed Show fixed Hide fixed
source/tests/pt/model/test_se_attn_v2.py Fixed Show fixed Hide fixed
@Chengqian-Zhang
Copy link
Collaborator Author

@iProzd thinks there is no need to redirect dpa1 to se_atten_v2. dpa1 is equivalent to se_atten from original definition, while se_atten_v2 is a special case of dpa1 to use strip structure. So I'm not redirecting it for now.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

deepmd/dpmodel/descriptor/dpa1.py Outdated Show resolved Hide resolved
@njzjz njzjz linked an issue May 30, 2024 that may be closed by this pull request
@njzjz
Copy link
Member

njzjz commented May 30, 2024

Do you want to update the documentation in #3828 or in this PR??

Chengqian-Zhang and others added 2 commits June 4, 2024 18:28
Co-authored-by: Duo <[email protected]>
Signed-off-by: Chenqqian Zhang <[email protected]>
Co-authored-by: Duo <[email protected]>
Signed-off-by: Chenqqian Zhang <[email protected]>
@Chengqian-Zhang Chengqian-Zhang requested a review from iProzd June 4, 2024 10:31
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

deepmd/pt/model/descriptor/se_atten_v2.py Show resolved Hide resolved
deepmd/pt/model/descriptor/se_atten_v2.py Show resolved Hide resolved
deepmd/utils/argcheck.py Outdated Show resolved Hide resolved
@Chengqian-Zhang Chengqian-Zhang requested a review from njzjz June 5, 2024 04:48
@wanghan-iapcm wanghan-iapcm enabled auto-merge June 6, 2024 01:00
@wanghan-iapcm wanghan-iapcm added this pull request to the merge queue Jun 6, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 6, 2024
@njzjz njzjz added this pull request to the merge queue Jun 6, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 6, 2024
@njzjz njzjz added this pull request to the merge queue Jun 6, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 6, 2024
@njzjz njzjz added this pull request to the merge queue Jun 6, 2024
Merged via the queue into deepmodeling:devel with commit c71ece3 Jun 6, 2024
61 checks passed
mtaillefumier pushed a commit to mtaillefumier/deepmd-kit that referenced this pull request Sep 18, 2024
Solve deepmodeling#3831 and deepmodeling#3139
- add `se_atten_v2` to PyTorch and DP
- add document equation for `se_attn_v2`

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

- **New Features**
- Introduced a new descriptor class with enhanced configuration options
and methods for serialization and deserialization.
- Added new configurable parameters to the descriptor setup for improved
flexibility.

- **Documentation**
- Updated function documentation to reflect new arguments and usage
instructions.

- **Bug Fixes**
- Refined serialization logic to handle new parameters and class types
more accurately.
- Improved error messages for better clarity during serialization
processes.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Signed-off-by: Chenqqian Zhang <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Duo <[email protected]>
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.

[Feature Request] add se_atten_v2 and redirect dpa1 to se_atten_v2
4 participants