deepmd-kit icon indicating copy to clipboard operation
deepmd-kit copied to clipboard

fix(pt): make int `rcut` safe after jit op

Open iProzd opened this issue 1 year ago • 4 comments

Fix #3974.

Summary by CodeRabbit

  • New Features

    • Improved type consistency for neighbor statistics calculations by ensuring the rcut and rcut_smth parameters are always floats.
    • Enhanced handling of input parameters in various descriptor classes for better robustness.
  • Bug Fixes

    • Enhanced performance and reliability of neighbor statistics operations through constructor updates.
  • Documentation

    • Updated method signatures for clarity and consistency.

iProzd avatar Oct 16 '24 06:10 iProzd

📝 Walkthrough

Walkthrough

The changes involve modifications to multiple classes across several files, primarily focusing on ensuring that the rcut and rcut_smth parameters are explicitly converted to float types during initialization. This applies to the NeighborStatOP, PairTabAtomicModel, RepformerLayer, and various descriptor classes. The adjustments enhance type safety without altering the existing functionality or logic of the methods. Additionally, new test cases have been introduced to validate these changes.

Changes

File Path Change Summary
deepmd/pt/utils/neighbor_stat.py - Modified NeighborStatOP constructor to convert rcut to float.
- Updated method signature in NeighborStat and NeighborStatOP constructors.
- Maintained existing logic in forward method of NeighborStatOP.
deepmd/pt/model/atomic_model/pairtab_atomic_model.py - Converted rcut to float in PairTabAtomicModel constructor.
deepmd/pt/model/descriptor/repformer_layer.py - Converted rcut and rcut_smth to float in RepformerLayer constructor.
deepmd/pt/model/descriptor/repformers.py - Updated rcut and rcut_smth to float in DescrptBlockRepformers constructor.
deepmd/pt/model/descriptor/se_a.py - Converted rcut and rcut_smth to float in DescrptBlockSeA constructor.
deepmd/pt/model/descriptor/se_atten.py - Converted rcut and rcut_smth to float in DescrptBlockSeAtten constructor.
deepmd/pt/model/descriptor/se_r.py - Converted rcut and rcut_smth to float in DescrptSeR constructor.
deepmd/pt/model/descriptor/se_t.py - Converted rcut and rcut_smth to float in DescrptBlockSeT constructor.
deepmd/pt/model/descriptor/se_t_tebd.py - Converted rcut and rcut_smth to float in DescrptBlockSeTTebd constructor.
source/tests/pt/model/test_jit.py - Added TestEnergyModelDPA2IntRcut to test integer conversion for parameters.

Assessment against linked issues

Objective Addressed Explanation
Ensure rcut is treated as a float (Issue #3974)

Possibly related PRs

  • #3767: Adds common test cases for atomic models, potentially related to changes in NeighborStat.
  • #3798: Refactors to remove global data requirements, connecting to type consistency changes.
  • #3803: Introduces consistent fine-tuning with init-model, related to parameter handling.
  • #3813: Refactors the se_e3 descriptor, sharing similarities with modifications in the main PR.
  • #3867: Adds support for property fitting, potentially related to parameter handling.
  • #4194: Exposes the linear energy model, which may connect to changes in model parameters.
  • #4223: Removes old implementations, relating to updates for type consistency.

Suggested labels

Core

Suggested reviewers

  • njzjz
  • wanghan-iapcm

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>, please review it.
    • 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @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 using 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.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration 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.

coderabbitai[bot] avatar Oct 16 '24 06:10 coderabbitai[bot]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 84.55%. Comparing base (b4701da) to head (e9e8541). Report is 184 commits behind head on devel.

Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #4222      +/-   ##
==========================================
- Coverage   84.55%   84.55%   -0.01%     
==========================================
  Files         537      537              
  Lines       51237    51237              
  Branches     3047     3047              
==========================================
- Hits        43324    43322       -2     
- Misses       6965     6967       +2     
  Partials      948      948              

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

codecov[bot] avatar Oct 16 '24 07:10 codecov[bot]

Does it only affect neighbor stat? Does it affect dp freeze?

njzjz avatar Oct 16 '24 18:10 njzjz

I've tried adding type annotation Union[int, float] and float convertion in prod_env_mat or build_multiple_neighbor_list etc, but found that it's much less robust for developers to contain such convertion in other functions.

So maybe we can not avoid explictly setting float in each descriptor before PyTorch fix this bugs. See pytorch/issues/130682.

iProzd avatar Oct 23 '24 07:10 iProzd