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: deeptensor output, add dipole stat UT #3948

Closed
wants to merge 3 commits into from

Conversation

anyangml
Copy link
Collaborator

@anyangml anyangml commented Jul 3, 2024

Summary by CodeRabbit

  • New Features

    • Introduced model_dipole for enhanced dipole model configurations.
    • Added support for "global_dipole" data in finetuning tests.
  • Improvements

    • Updated return type of the eval method to ensure consistency and clarity in the output.
    • Improved energy calculation logic in finetuning tests by considering additional data types.
  • Testing

    • Enhanced test coverage for dipole and DOS models with updated test cases and configurations.

Copy link
Contributor

coderabbitai bot commented Jul 3, 2024

Walkthrough

The recent changes involve modifications to the return type of the eval method in deepmd/infer/deep_tensor.py, converting it from a single np.ndarray to Tuple[np.ndarray]. Additionally, the test_permutation.py and test_finetune.py test files have been updated to incorporate a new model_dipole dictionary configuration, modify energy calculation requirements, and add new data requirements for "global_dipole."

Changes

Files Change Summary
deepmd/infer/deep_tensor.py Changed the return type of eval method from np.ndarray to Tuple[np.ndarray], returning values wrapped in tuples.
source/tests/pt/model/test_permutation.py Added model_dipole dictionary with configurations for a dipole model.
source/tests/pt/test_finetune.py Added model_dipole, new data requirements for "global_dipole," and modified energy calculations and class declarations.

Sequence Diagram(s)

sequenceDiagram
    participant Tester as Test Suite
    participant DT as DeepTensor
    participant ModelConfig as Model Configuration

    rect rgb(191, 223, 255)
    note over Tester, DT: Interaction for evaluating models
    Tester ->> DT: Call eval()
    DT -->> Tester: Return tuple of np.ndarray
    end

    rect rgb(245, 224, 177)
    note over Tester, ModelConfig: Interaction for configuring models in tests
    Tester ->> ModelConfig: Load model_dipole configuration
    ModelConfig -->> Tester: Configurations returned
    end

    rect rgb(255, 191, 191)
    note over Tester: Testing with new data requirements
    Tester ->> Tester: Test with global_dipole
    Tester ->> Tester: Adjust energy calculations
    end
Loading

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.

@anyangml anyangml requested review from iProzd and njzjz July 3, 2024 09:13
@github-actions github-actions bot added the Python label Jul 3, 2024
Copy link

codecov bot commented Jul 3, 2024

Codecov Report

Attention: Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.

Project coverage is 34.83%. Comparing base (1c3e099) to head (aa5c20d).
Report is 114 commits behind head on devel.

Files with missing lines Patch % Lines
deepmd/infer/deep_tensor.py 0.00% 2 Missing ⚠️

❗ There is a different number of reports uploaded between BASE (1c3e099) and HEAD (aa5c20d). Click for more details.

HEAD has 24 uploads less than BASE
Flag BASE (1c3e099) HEAD (aa5c20d)
26 2
Additional details and impacted files
@@             Coverage Diff             @@
##            devel    #3948       +/-   ##
===========================================
- Coverage   82.84%   34.83%   -48.02%     
===========================================
  Files         520      520               
  Lines       50827    50795       -32     
  Branches     3015     3015               
===========================================
- Hits        42108    17692    -24416     
- Misses       7785    32495    +24710     
+ Partials      934      608      -326     

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

@anyangml
Copy link
Collaborator Author

anyangml commented Jul 3, 2024

I may close this PR if ndarry is the expected output type.

Copy link
Collaborator

@wanghan-iapcm wanghan-iapcm left a comment

Choose a reason for hiding this comment

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

Could you please explain the reason of using Tuple[np.ndarray] instead of np.ndarray as returned type of DeepTensor?

@anyangml
Copy link
Collaborator Author

anyangml commented Jul 4, 2024

Could you please explain the reason of using Tuple[np.ndarray] instead of np.ndarray as returned type of DeepTensor?

It seems the other DeepModels all return a tuple object, I thought they should be consistent. When adding the new UT, DeepDipole eval needs special handling if a ndarray is returned. Although the UT is not as important, since dipole model does not apply bias, just want to check the changes made in #3945.

@anyangml anyangml marked this pull request as draft July 5, 2024 04:47
@anyangml anyangml closed this Jul 11, 2024
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.

2 participants