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: bugs in uts for property fit #4120

Merged
merged 7 commits into from
Sep 12, 2024

Conversation

Chengqian-Zhang
Copy link
Collaborator

@Chengqian-Zhang Chengqian-Zhang commented Sep 11, 2024

This bug is totally the same as PR #3837.
Fix following trivial bugs in property fit uts:

  • box was not used in extend_input_and_build_neighbor_list (which means they were all tested in nopbc mode, if shifted coord is outside the box (sometimes) and normalized explicitly, results are not the same.) Input for fitting also used extended_atype instead of atype. (Only same when nopbc.)
  • Using of mixed_types is disordered, mismatched with descriptor or sometimes with nlist. Now only use mixed_types==False since the descriptor output is not in mixed types.
  • Remove useless parameter fit_diag and scale test in property fitting. Add parameter intensive and bias_method test in property fitting.

Summary by CodeRabbit

  • New Features

    • Introduced new parameters intensive and bias_method for enhanced flexibility in property fitting tests.
    • Added a new test class TestInvarianceOutCell with a method test_trans to evaluate invariance under transformations.
    • Updated existing tests to improve clarity and maintainability by removing the scale variable.
  • Bug Fixes

    • Refactored test methods to ensure correct parameter usage, enhancing the reliability of test outcomes.

Copy link
Contributor

coderabbitai bot commented Sep 11, 2024

Walkthrough

Walkthrough

The pull request introduces significant modifications to the test suite for property fitting in a computational model. Key changes include the removal of the scale variable from the setUp method and its usage in various test methods, replaced by new parameters intensive and bias_method. The test_consistency and test_rot methods have been refactored accordingly. A new class, TestInvarianceOutCell, has been added with its own setup and a new test method, test_trans. The TestInvarianceRandomShift class has also been updated to reflect these changes.

Changes

File Path Change Summary
source/tests/pt/model/test_property_fitting.py Removed scale variable; introduced intensive and bias_method in tests; refactored test_consistency and test_rot; added TestInvarianceOutCell class and test_trans method; modified setUp in TestInvarianceRandomShift.

Possibly related PRs


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

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: 0

Outside diff range and nitpick comments (1)
source/tests/pt/model/test_property_fitting.py (1)

Line range hint 260-317: LGTM, but address the Ruff warning.

The code changes that introduce the new parameters intensive and bias_method are approved. These changes enhance the flexibility of the tests by allowing for more nuanced configurations.

However, the static analysis tool Ruff has flagged an unused loop variable mixed_types in this method.

To address the Ruff warning, rename the unused variable to _mixed_types:

-for mixed_types, nfp, nap, intensive, bias_method in itertools.product(
+for _mixed_types, nfp, nap, intensive, bias_method in itertools.product(
Tools
Ruff

263-263: Loop control variable mixed_types not used within loop body

Rename unused mixed_types to _mixed_types

(B007)

Copy link

codecov bot commented Sep 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.02%. Comparing base (a5346f2) to head (e8d9fd9).
Report is 199 commits behind head on devel.

Additional details and impacted files
@@           Coverage Diff           @@
##            devel    #4120   +/-   ##
=======================================
  Coverage   83.02%   83.02%           
=======================================
  Files         532      532           
  Lines       52174    52174           
  Branches     3030     3030           
=======================================
  Hits        43315    43315           
- Misses       7913     7914    +1     
+ Partials      946      945    -1     

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

@njzjz
Copy link
Member

njzjz commented Sep 11, 2024

These tests seems to be duplicate of those in tests/universal. Do we have a plan to remove them?

@wanghan-iapcm wanghan-iapcm added this pull request to the merge queue Sep 12, 2024
Merged via the queue into deepmodeling:devel with commit 96ed5df Sep 12, 2024
60 checks passed
mtaillefumier pushed a commit to mtaillefumier/deepmd-kit that referenced this pull request Sep 18, 2024
This bug is totally the same as PR deepmodeling#3837. 
Fix following trivial bugs in property fit uts:

- box was not used in extend_input_and_build_neighbor_list (which means
they were all tested in nopbc mode, if shifted coord is outside the box
(sometimes) and normalized explicitly, results are not the same.) Input
for fitting also used extended_atype instead of atype. (Only same when
nopbc.)
- Using of mixed_types is disordered, mismatched with descriptor or
sometimes with nlist. Now only use mixed_types==False since the
descriptor output is not in mixed types.
- Remove useless parameter `fit_diag` and `scale` test in property
fitting. Add parameter `intensive` and `bias_method` test in property
fitting.

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


- **New Features**
- Introduced new parameters `intensive` and `bias_method` for enhanced
flexibility in property fitting tests.
- Added a new test class `TestInvarianceOutCell` with a method
`test_trans` to evaluate invariance under transformations.
- Updated existing tests to improve clarity and maintainability by
removing the `scale` variable.

- **Bug Fixes**
- Refactored test methods to ensure correct parameter usage, enhancing
the reliability of test outcomes.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
theAfish added a commit to theAfish/dc-dev that referenced this pull request Sep 21, 2024
theAfish pushed a commit to theAfish/dc-dev that referenced this pull request Sep 23, 2024
This bug is totally the same as PR deepmodeling#3837. 
Fix following trivial bugs in property fit uts:

- box was not used in extend_input_and_build_neighbor_list (which means
they were all tested in nopbc mode, if shifted coord is outside the box
(sometimes) and normalized explicitly, results are not the same.) Input
for fitting also used extended_atype instead of atype. (Only same when
nopbc.)
- Using of mixed_types is disordered, mismatched with descriptor or
sometimes with nlist. Now only use mixed_types==False since the
descriptor output is not in mixed types.
- Remove useless parameter `fit_diag` and `scale` test in property
fitting. Add parameter `intensive` and `bias_method` test in property
fitting.

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


- **New Features**
- Introduced new parameters `intensive` and `bias_method` for enhanced
flexibility in property fitting tests.
- Added a new test class `TestInvarianceOutCell` with a method
`test_trans` to evaluate invariance under transformations.
- Updated existing tests to improve clarity and maintainability by
removing the `scale` variable.

- **Bug Fixes**
- Refactored test methods to ensure correct parameter usage, enhancing
the reliability of test outcomes.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
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.

4 participants