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

fix: correct exclude_types in descriptors #3841

Merged
merged 11 commits into from
Jun 4, 2024

Conversation

iProzd
Copy link
Collaborator

@iProzd iProzd commented May 31, 2024

  1. make exclude_types consistent with mask in nlist for all descriptors. (bugs fixed in dpa1 and dpa2)
  2. add universal tests for descriptor. (now only test_exclude_types)
  3. TestCaseSingleFrameWithNlist in source/tests/pt/model/test_env_mat.py will be removed in a seperate PR.

Summary by CodeRabbit

  • New Features

    • Added new test case classes for simulation testing and common test cases on atomic models.
  • Bug Fixes

    • Adjusted exclusion mask calculations and applications affecting neighbor lists and switch behavior in various descriptors.
  • Chores

    • Updated GitHub Actions workflow to install CMake directly via pip, removing dependency on an external action.

@iProzd iProzd requested review from njzjz and wanghan-iapcm May 31, 2024 09:31
Copy link
Contributor

coderabbitai bot commented May 31, 2024

Walkthrough

Walkthrough

Recent updates to the deepmd project include modifications to several descriptor classes to handle exclude_mask and nlist reshaping, and the inclusion of an optional ntypes parameter for compatibility. Additionally, test cases and utilities have been added to ensure the robustness of these changes. The CI workflow for CUDA has also been streamlined by switching from an external CMake action to a direct pip installation.

Changes

File(s) Change Summary
deepmd/dpmodel/descriptor/dpa1.py Modified call() function to reshape exclude_mask and nlist, and update nlist calculation using exclude_mask.
deepmd/dpmodel/descriptor/repformers.py Updated call function logic to use np.where for conditionally replacing values in nlist with -1.
deepmd/dpmodel/descriptor/se_e2_a.py, deepmd/dpmodel/descriptor/se_r.py, deepmd/dpmodel/descriptor/se_t.py Added an optional ntypes parameter to the DescrptSeA, DescrptSeR, and DescrptSeT classes for compatibility.
deepmd/pt/model/descriptor/se_atten.py Modified forward method to adjust sw behavior based on nlist_mask and exclude_mask.
deepmd/tf/descriptor/se_atten.py Updated _pass_filter function to include new calculations for nei_exclude_mask and negative_mask.
source/tests/universal/common/cases/cases.py Added test case classes for various simulation scenarios.
source/tests/universal/common/cases/descriptor/utils.py Introduced DescriptorTestCase class with methods for setting up test data and conducting tests on forward propagation and excluding types.
.github/workflows/test_cuda.yml Replaced lukka/get-cmake action with pip install cmake command in the CI workflow.

Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between c7aaef5 and 0e11a49.

Files selected for processing (1)
  • .github/workflows/test_cuda.yml (1 hunks)
Files skipped from review as they are similar to previous changes (1)
  • .github/workflows/test_cuda.yml

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.

@iProzd iProzd linked an issue May 31, 2024 that may be closed by this pull request
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: 5

Outside diff range and nitpick comments (1)
deepmd/dpmodel/descriptor/dpa1.py (1)

Line range hint 813-827: Refactor the reshaping and masking logic for clarity.

The reshaping and masking operations in the call method are crucial for performance but currently are a bit convoluted. Consider refactoring this part to improve readability and possibly performance. Here's a suggested refactor:

def reshape_and_apply_masks(self, nf, nloc, nnei, nlist, exclude_mask, sw):
    # Reshape operations
    flat_dim = nf * nloc
    exclude_mask = exclude_mask.reshape(flat_dim, nnei)
    nlist = nlist.reshape(flat_dim, nnei)
    sw = sw.reshape(flat_dim, nnei, 1)

    # Apply masks
    nlist_mask = nlist != -1
    nlist_mask = nlist_mask * exclude_mask.astype(bool)
    sw = np.where(nlist_mask[:, :, None], sw, 0.0)
    nlist_masked = np.where(nlist_mask, nlist, 0)

    return nlist_masked, sw

This method encapsulates the reshaping and masking logic into a single method, improving the modularity and testability of the code.

deepmd/tf/descriptor/se_atten.py Outdated Show resolved Hide resolved
deepmd/pt/model/descriptor/se_atten.py Outdated Show resolved Hide resolved
Copy link

codecov bot commented May 31, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.86%. Comparing base (f23c77e) to head (0e11a49).

Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #3841      +/-   ##
==========================================
- Coverage   82.63%   80.86%   -1.78%     
==========================================
  Files         515      515              
  Lines       49533    49542       +9     
  Branches     2985     2985              
==========================================
- Hits        40932    40060     -872     
- Misses       7690     8576     +886     
+ Partials      911      906       -5     

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

deepmd/dpmodel/descriptor/dpa1.py Outdated Show resolved Hide resolved
deepmd/dpmodel/descriptor/dpa1.py Show resolved Hide resolved
deepmd/pt/model/descriptor/se_atten.py Show resolved Hide resolved
@iProzd iProzd requested review from njzjz and wanghan-iapcm June 3, 2024 07:22
@wanghan-iapcm wanghan-iapcm added this pull request to the merge queue Jun 4, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 4, 2024
@iProzd iProzd added this pull request to the merge queue Jun 4, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 4, 2024
@iProzd iProzd enabled auto-merge June 4, 2024 10:18
@iProzd iProzd added this pull request to the merge queue Jun 4, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 4, 2024
@iProzd iProzd added this pull request to the merge queue Jun 4, 2024
@iProzd iProzd removed this pull request from the merge queue due to a manual request Jun 4, 2024
@iProzd iProzd enabled auto-merge June 4, 2024 14:53
@iProzd iProzd added this pull request to the merge queue Jun 4, 2024
Merged via the queue into deepmodeling:devel with commit 8a657d5 Jun 4, 2024
60 checks passed
@iProzd iProzd deleted the fix_exclude_types branch June 4, 2024 16:37
mtaillefumier pushed a commit to mtaillefumier/deepmd-kit that referenced this pull request Sep 18, 2024
1. make `exclude_types` consistent with mask in nlist for all
descriptors. (bugs fixed in dpa1 and dpa2)
2. add universal tests for descriptor. (now only test_exclude_types)
3. `TestCaseSingleFrameWithNlist` in
source/tests/pt/model/test_env_mat.py will be removed in a seperate PR.

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

- **New Features**
- Added new test case classes for simulation testing and common test
cases on atomic models.

- **Bug Fixes**
- Adjusted exclusion mask calculations and applications affecting
neighbor lists and switch behavior in various descriptors.

- **Chores**
- Updated GitHub Actions workflow to install CMake directly via pip,
removing dependency on an external action.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
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.

[Feature Request] UT for testing exclude_types.
3 participants