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(pt/tf/dp): support econf type embedding #3781

Merged
merged 10 commits into from
May 16, 2024

Conversation

iProzd
Copy link
Collaborator

@iProzd iProzd commented May 14, 2024

Summary by CodeRabbit

  • New Features

    • Introduced use_econf_tebd and type_map parameters for advanced electronic configuration type embedding.
    • Enhanced serialization to support new parameters.
  • Bug Fixes

    • Improved handling of type embedding configurations to ensure consistency.
  • Documentation

    • Updated documentation to include new parameters and their usage.

These updates provide more flexibility and control over electronic configuration type embedding, enhancing the model's configurability and performance.

Copy link

coderabbitai bot commented May 14, 2024

Warning

Rate Limit Exceeded

@iProzd has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 16 minutes and 3 seconds before requesting another review.

How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.
Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.
Please see our FAQ for further information.

Commits Files that changed from the base of the PR and between 0513218 and 543b050.

Walkthrough

This update introduces support for electronic configuration type embedding (econf_tebd) across various modules in the deepmd library. Key changes include adding use_econf_tebd and type_map parameters to constructors, modifying serialization methods to handle these new parameters, and updating logic to conditionally compute embeddings based on use_econf_tebd. These enhancements allow for more flexible and detailed atom type embeddings, improving the model's capability to handle diverse atomic configurations.

Changes

File Path Change Summary
deepmd/dpmodel/descriptor/dpa2.py Added use_econf_tebd and type_map parameters to the constructor and serialization methods.
deepmd/pt/model/descriptor/dpa1.py Introduced use_econf_tebd and type_map parameters to the constructor and updated the TypeEmbedNet instantiation and serialization methods.
deepmd/dpmodel/utils/type_embed.py Added use_econf_tebd and type_map parameters to TypeEmbedNet class and updated logic for embedding computation and serialization.
deepmd/pt/model/model/__init__.py Added conditions to handle type_map when use_econf_tebd is True in get_zbl_model and get_standard_model functions.
deepmd/pt/model/network/network.py Enhanced TypeEmbedNet and TypeEmbedNetConsistent classes to include use_econf_tebd and type_map parameters, updating initialization and serialization logic.
deepmd/tf/descriptor/se_atten.py Updated DescrptDPA1Compat class to include use_econf_tebd and type_map parameters, and modified serialization methods.
deepmd/tf/model/model.py Added logic to handle use_econf_tebd and type_map in the Model class constructor.
deepmd/tf/model/pairwise_dprc.py Updated PairwiseDPRC class constructor to handle use_econf_tebd in type_embedding.
deepmd/tf/utils/type_embed.py Enhanced TypeEmbedNet class to include use_econf_tebd and type_map parameters, updating initialization, build, and serialization methods.
deepmd/utils/argcheck.py Added use_econf_tebd argument to type_embedding_args, descrpt_se_atten_args, and descrpt_dpa2_args functions.

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.

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 a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @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.

@@ -127,6 +131,7 @@
smooth_type_embedding,
concat_output_tebd,
precision,
use_econf_tebd,

Check notice

Code scanning / CodeQL

Unused local variable Note

Variable use_econf_tebd is not used.
@@ -150,6 +155,7 @@
smooth_type_embedding,
concat_output_tebd,
precision,
use_econf_tebd,

Check notice

Code scanning / CodeQL

Unused local variable Note

Variable use_econf_tebd is not used.
@@ -240,6 +247,7 @@
smooth_type_embedding,
concat_output_tebd,
precision,
use_econf_tebd,

Check notice

Code scanning / CodeQL

Unused local variable Note

Variable use_econf_tebd is not used.
@@ -173,6 +177,7 @@
exclude_types,
precision,
add_tebd_to_repinit_out,
use_econf_tebd,

Check notice

Code scanning / CodeQL

Unused local variable Note

Variable use_econf_tebd is not used.
@@ -200,6 +205,7 @@
exclude_types,
precision,
add_tebd_to_repinit_out,
use_econf_tebd,

Check notice

Code scanning / CodeQL

Unused local variable Note

Variable use_econf_tebd is not used.
@@ -227,6 +233,7 @@
exclude_types,
precision,
add_tebd_to_repinit_out,
use_econf_tebd,

Check notice

Code scanning / CodeQL

Unused local variable Note

Variable use_econf_tebd is not used.
@@ -290,6 +297,7 @@
exclude_types,
precision,
add_tebd_to_repinit_out,
use_econf_tebd,

Check notice

Code scanning / CodeQL

Unused local variable Note

Variable use_econf_tebd is not used.
Copy link

@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: 8

Out of diff range and nitpick comments (2)
deepmd/tf/utils/type_embed.py (1)

103-107: Add documentation for the new parameters.

The new parameters use_econf_tebd and type_map are documented correctly. Ensure that the documentation is consistent with the rest of the project.

deepmd/pt/model/descriptor/dpa1.py (1)

175-179: Document the default values for use_econf_tebd and type_map.

For better clarity, mention the default values of use_econf_tebd and type_map in the docstring.

Copy link

codecov bot commented May 14, 2024

Codecov Report

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

Project coverage is 82.50%. Comparing base (2bf0769) to head (543b050).

Files Patch % Lines
deepmd/pt/model/model/__init__.py 50.00% 2 Missing ⚠️
deepmd/tf/model/model.py 50.00% 1 Missing ⚠️
deepmd/tf/model/pairwise_dprc.py 50.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #3781      +/-   ##
==========================================
+ Coverage   82.49%   82.50%   +0.01%     
==========================================
  Files         515      515              
  Lines       48642    48712      +70     
  Branches     2980     2980              
==========================================
+ Hits        40126    40192      +66     
- Misses       7605     7609       +4     
  Partials      911      911              

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

@iProzd iProzd self-assigned this May 14, 2024
Copy link

@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: 8

deepmd/utils/econf_embd.py Outdated Show resolved Hide resolved
deepmd/pt/model/network/network.py Show resolved Hide resolved
deepmd/pt/model/network/network.py Show resolved Hide resolved
deepmd/pt/model/network/network.py Show resolved Hide resolved
deepmd/pt/model/network/network.py Show resolved Hide resolved
deepmd/pt/model/network/network.py Show resolved Hide resolved
deepmd/pt/model/network/network.py Show resolved Hide resolved
deepmd/pt/model/network/network.py Show resolved Hide resolved
Copy link

@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

source/tests/common/test_econf_embd.py Show resolved Hide resolved
source/tests/common/test_econf_embd.py Show resolved Hide resolved
deepmd/dpmodel/utils/type_embed.py Outdated Show resolved Hide resolved
deepmd/utils/econf_embd.py Show resolved Hide resolved
deepmd/utils/econf_embd.py Outdated Show resolved Hide resolved
deepmd/dpmodel/descriptor/dpa2.py Show resolved Hide resolved
Co-authored-by: Han Wang <92130845+wanghan-iapcm@users.noreply.github.com>
Signed-off-by: Duo <50307526+iProzd@users.noreply.github.com>
@wanghan-iapcm wanghan-iapcm added this pull request to the merge queue May 16, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 16, 2024
@wanghan-iapcm wanghan-iapcm added this pull request to the merge queue May 16, 2024
Merged via the queue into deepmodeling:devel with commit f6489c0 May 16, 2024
61 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants