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(pt): make 'find_' to be float in get data #3992

Merged
merged 1 commit into from
Jul 18, 2024

Conversation

iProzd
Copy link
Collaborator

@iProzd iProzd commented Jul 18, 2024

make 'find_' to be float in get data, fix #3991 .

On my device, the profiler indicates that cudaStreamSynchronize takes negligible time, resulting in minimal speedup.

Summary by CodeRabbit

  • New Features
    • Enhanced data loading by adding a collate_fn parameter for more flexible data collation.
    • Improved data filtering by excluding keys containing "find_" in addition to existing filters.

@iProzd iProzd requested a review from njzjz July 18, 2024 08:17
Copy link
Contributor

coderabbitai bot commented Jul 18, 2024

Walkthrough

Walkthrough

The recent updates to training.py involve enhancing the get_dataloader_and_buffer function with a new collate_fn parameter using a lambda function, and refining the get_data method to exclude additional keys containing "find_". These changes aim to streamline data handling and address potential inefficiencies in data processing.

Changes

File Change Summary
deepmd/pt/train/training.py Added collate_fn parameter to DataLoader in get_dataloader_and_buffer function. Updated get_data method to exclude keys with "find_".

Sequence Diagram(s)

Generating sequence diagrams for these specific changes is unnecessary since the alterations primarily involve parameter updates and conditional checks within existing functions, without significantly modifying the control flow or introducing new features.

Assessment against linked issues

Objective Addressed Explanation
Fix display_if_exist blocking issue due to cudaStreamSynchronize (#3991) The provided code changes do not directly address the display_if_exist method or its blocking issue.

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

@iProzd iProzd requested a review from CaRoLZhangxy July 18, 2024 08:17
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, codebase verification and nitpick comments (1)
deepmd/pt/train/training.py (1)

1097-1097: Inconsistent Exclusion of Keys Containing "find_"

The exclusion of keys containing "find_" is not consistently applied across the codebase. The following files contain instances of keys with "find_":

  • source/tests/pt/test_loss.py
  • source/tests/pt/model/test_model.py
  • source/tests/pt/model/test_linear_atomic_model_stat.py
  • source/tests/pt/model/test_polar_atomic_model_stat.py
  • source/tests/pt/model/test_atomic_model_atomic_stat.py
  • source/tests/pt/model/test_atomic_model_global_stat.py
  • source/tests/tf/test_loss_gf.py
  • source/tests/tf/test_gen_stat_data.py
  • source/tests/tf/test_deepmd_data.py
  • deepmd/pt/utils/stat.py
  • deepmd/pt/utils/dataloader.py
  • deepmd/pt/loss/loss.py
  • deepmd/pt/loss/tensor.py
  • deepmd/pt/loss/dos.py
  • deepmd/pt/loss/ener.py
  • deepmd/pt/loss/ener_spin.py
  • deepmd/tf/loss/tensor.py
  • deepmd/tf/loss/loss.py
  • deepmd/tf/loss/dos.py
  • deepmd/tf/train/trainer.py
  • deepmd/tf/infer/data_modifier.py
  • deepmd/utils/data_system.py
  • deepmd/utils/data.py

Please review these files and ensure that the exclusion of keys containing "find_" is consistently applied.

Analysis chain

LGTM! But verify the exclusion consistency.

The exclusion of keys containing "find_" in addition to "sid," "fid," and "box" is a good change to streamline data handling.

However, ensure that this exclusion is consistently applied across the codebase.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the exclusion of keys containing "find_" is consistent across the codebase.

# Test: Search for the usage of keys containing "find_". Expect: No inconsistent usage.
rg --type python -A 5 'find_'

Length of output: 60


Script:

#!/bin/bash
# Description: Verify the exclusion of keys containing "find_" is consistent across the codebase.

# Test: Search for the usage of keys containing "find_". Expect: No inconsistent usage.
rg --type py -A 5 'find_'

Length of output: 79723

Copy link

codecov bot commented Jul 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.83%. Comparing base (0c0878e) to head (d21574b).
Report is 106 commits behind head on devel.

Additional details and impacted files
@@           Coverage Diff           @@
##            devel    #3992   +/-   ##
=======================================
  Coverage   82.83%   82.83%           
=======================================
  Files         522      522           
  Lines       50876    50876           
  Branches     3019     3020    +1     
=======================================
+ Hits        42142    42143    +1     
+ Misses       7799     7797    -2     
- Partials      935      936    +1     

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

@njzjz njzjz linked an issue Jul 18, 2024 that may be closed by this pull request
@wanghan-iapcm wanghan-iapcm added this pull request to the merge queue Jul 18, 2024
Merged via the queue into deepmodeling:devel with commit 8103003 Jul 18, 2024
60 checks passed
mtaillefumier pushed a commit to mtaillefumier/deepmd-kit that referenced this pull request Sep 18, 2024
make 'find_' to be float in get data, fix deepmodeling#3991 .

On my device, the profiler indicates that `cudaStreamSynchronize` takes
negligible time, resulting in minimal speedup.

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

## Summary by CodeRabbit

- **New Features**
- Enhanced data loading by adding a `collate_fn` parameter for more
flexible data collation.
- Improved data filtering by excluding keys containing "find_" in
addition to existing filters.

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

[BUG] PT: display_if_exist is blocking
4 participants