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

breaking: use all sets for training and test #3862

Merged
merged 2 commits into from
Jun 11, 2024

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Jun 7, 2024

Fix #3860.

Remove train_dirs and test_dir in DeepmdData.

Summary by CodeRabbit

  • New Features

    • All data sets are now trained and tested by default, simplifying the training process.
  • Bug Fixes

    • Improved logic for handling training directories and test set merging.
  • Tests

    • Added new test cases for the updated data handling methods.
    • Updated existing tests to reflect changes in data set handling and batch sizes.

Fix deepmodeling#3860.

Remove `train_dirs` and `test_dir` in `DeepmdData`.

Signed-off-by: Jinzhe Zeng <[email protected]>
@github-actions github-actions bot added the Python label Jun 7, 2024
@njzjz njzjz requested review from iProzd and wanghan-iapcm June 7, 2024 21:43
@njzjz njzjz added the breaking change Breaking changes that should notify users. label Jun 7, 2024
@njzjz njzjz added this to the v3.0.0 milestone Jun 7, 2024
@njzjz njzjz linked an issue Jun 7, 2024 that may be closed by this pull request
Copy link
Contributor

coderabbitai bot commented Jun 7, 2024

Warning

Rate limit exceeded

@njzjz has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 45 minutes and 58 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 9d001ca and 4c59892.

Walkthrough

The recent changes in deepmd/utils/data.py and corresponding test files involve the deprecation of the trn_all_set parameter in the DeepmdData class, leading to a unified approach where all sets are trained and tested. This simplifies the logic for handling training directories and ensures that test sets are merged from all directories before shuffling. These updates address the issue where only the last set was tested, ensuring comprehensive testing across all sets.

Changes

Files/Modules Change Summary
deepmd/utils/data.py Deprecated trn_all_set parameter, simplified logic for handling training directories, unified test set loading and shuffling.
source/tests/tf/test_deepmd_data.py Updated tests to reflect changes in directory handling, test set merging, and batch size checks.
source/tests/tf/test_deepmd_data_sys.py Adjusted batch sizes and array concatenations for coordinate and test data retrieval to align with new logic.

Sequence Diagram(s) (Beta)

sequenceDiagram
    participant User
    participant DeepmdData
    participant TestSet

    User->>DeepmdData: Initialize without trn_all_set
    DeepmdData->>DeepmdData: Simplify training directory logic
    User->>DeepmdData: Request test set
    DeepmdData->>TestSet: Merge test sets from all directories
    TestSet->>DeepmdData: Return merged and shuffled test set
    DeepmdData->>User: Provide comprehensive test set
Loading

Assessment against linked issues

Objective Addressed Explanation
Only the last set of a LabeledSystem is tested in 'dp test' (#3860)

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.

Copy link

codecov bot commented Jun 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.66%. Comparing base (674bad7) to head (4c59892).
Report is 119 commits behind head on devel.

Additional details and impacted files
@@           Coverage Diff           @@
##            devel    #3862   +/-   ##
=======================================
  Coverage   82.66%   82.66%           
=======================================
  Files         517      517           
  Lines       49724    49720    -4     
  Branches     2984     2984           
=======================================
- Hits        41105    41102    -3     
+ Misses       7709     7708    -1     
  Partials      910      910           

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

Signed-off-by: Jinzhe Zeng <[email protected]>
@wanghan-iapcm wanghan-iapcm added this pull request to the merge queue Jun 11, 2024
Merged via the queue into deepmodeling:devel with commit 7786126 Jun 11, 2024
60 checks passed
mtaillefumier pushed a commit to mtaillefumier/deepmd-kit that referenced this pull request Sep 18, 2024
Fix deepmodeling#3860.

Remove `train_dirs` and `test_dir` in `DeepmdData`.

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

## Summary by CodeRabbit

- **New Features**
- All data sets are now trained and tested by default, simplifying the
training process.

- **Bug Fixes**
- Improved logic for handling training directories and test set merging.

- **Tests**
  - Added new test cases for the updated data handling methods.
- Updated existing tests to reflect changes in data set handling and
batch sizes.

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

---------

Signed-off-by: Jinzhe Zeng <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking change Breaking changes that should notify users. Python
Development

Successfully merging this pull request may close these issues.

Only the last set.xxxx of a LabeledSytem is tested in 'dp test'
3 participants