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 PT training step idx consistent with TF #4221

Merged
merged 3 commits into from
Oct 16, 2024

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Oct 15, 2024

Fix #4206.

Currently, the training step index displayed in TF and PT has different meanings:

  • In TF, step 0 means no training; step 1 means a training step has been performed. The maximum training step is equal to the number of steps.
  • In PT, step 0 means a training step has been performed. The maximum training step is the number of steps minus 1.

This PR corrects the definition of the step-index in PT and makes them consistent.

There is still a difference after this PR: TF shows step 0, but PT shows step 1. Showing the loss of step 0 in PT needs heavy refactoring and is thus not included in this PR.

Summary by CodeRabbit

  • New Features

    • Improved logging for training progress, starting step count from 1 for better clarity.
    • Enhanced TensorBoard logging for consistent step tracking.
  • Bug Fixes

    • Adjusted logging conditions to ensure the first step's results are included in the output.

Fix deepmodeling#4206.
Currently, the training step index displayed in TF and PT has different meanings:
- In TF, step 0 means no training; step 1 means a training step has been performed. The maximum training step is equal to the number of steps.
- In PT, step 0 means a training step has been performed. The maximum training step is the number of steps minus 1.
This PR corrects the defination of the step index in PT and makes them consistent.
There are still a difference: TF shows step 0 but PT shows step 1. Showing step 0 in PT needs heavy refactor and thus is not included in this PR.

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
@njzjz njzjz requested review from iProzd and wanghan-iapcm October 15, 2024 23:06
@njzjz njzjz linked an issue Oct 15, 2024 that may be closed by this pull request
Copy link
Contributor

coderabbitai bot commented Oct 15, 2024

📝 Walkthrough
📝 Walkthrough

Walkthrough

The changes in this pull request primarily modify the run method of the Trainer class in deepmd/pt/train/training.py. The updates introduce a new variable, display_step_id, to adjust how training step identifiers are logged, ensuring that the first step is displayed as step 1 instead of step 0. Additionally, the logging conditions for both training and validation results have been revised to include the first step, enhancing clarity in the training output.

Changes

File Path Change Summary
deepmd/pt/train/training.py Introduced display_step_id for logging adjustments; modified logging conditions to include the first step; updated TensorBoard logging to use display_step_id.

Assessment against linked issues

Objective Addressed Explanation
Loss of the last step is printed in lcurve.out (#4206)

Possibly related PRs

  • fix: fix average training time for restart #4212: This PR modifies the logging conditions in training.py, which is directly related to the changes made in the run method of the Trainer class regarding logging and display of training progress.

Suggested reviewers

  • njzjz
  • wanghan-iapcm
  • iProzd

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 8f41dde and 47cbd25.

📒 Files selected for processing (1)
  • deepmd/pt/train/training.py (8 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • deepmd/pt/train/training.py

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.

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

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 16172e6 and 8f41dde.

📒 Files selected for processing (1)
  • deepmd/pt/train/training.py (8 hunks)
🧰 Additional context used
🔇 Additional comments (5)
deepmd/pt/train/training.py (5)

772-775: Improved step display logic

The introduction of display_step_id and the modified condition for displaying training progress are good improvements. These changes make the step count more intuitive (starting from 1) and ensure that the first step is always displayed, aligning with the PR objective of making the PT training step index consistent with TF.


Line range hint 827-840: Consistent use of improved step display

The use of display_step_id in logging training messages maintains consistency with the earlier changes. This ensures that the more intuitive step counting (starting from 1) is used throughout the logging process.


Line range hint 867-880: Consistent step display in validation logging

The use of display_step_id in validation message logging maintains consistency with the training message logging. This ensures a uniform and intuitive step counting across all types of logging in the training process.


Line range hint 889-905: Comprehensive application of improved step counting

The use of display_step_id in formatting training messages and printing training information ensures that the improved step counting is consistently applied throughout all aspects of output and logging. This change maintains coherence with earlier modifications and provides a uniform user experience.


Line range hint 772-933: Summary of changes: Improved and consistent step counting

The changes in this file effectively implement an improved step counting mechanism, making the PT training step index consistent with TF as per the PR objective. The new display_step_id is used consistently across various logging and display functions, including training progress, validation logging, and TensorBoard integration. This enhances the user experience by providing a more intuitive step count that starts from 1.

The changes are well-implemented and maintain consistency throughout the code. However, do consider the suggested modification to the TensorBoard logging condition to ensure the first step is always logged, regardless of the tensorboard_freq setting.

Overall, these changes represent a solid improvement to the training process visualization and logging.

deepmd/pt/train/training.py Outdated Show resolved Hide resolved
deepmd/pt/train/training.py Outdated Show resolved Hide resolved
njzjz and others added 2 commits October 15, 2024 20:07
Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Copy link

codecov bot commented Oct 16, 2024

Codecov Report

Attention: Patch coverage is 50.00000% with 3 lines in your changes missing coverage. Please review.

Project coverage is 83.51%. Comparing base (16172e6) to head (47cbd25).
Report is 185 commits behind head on devel.

Files with missing lines Patch % Lines
deepmd/pt/train/training.py 50.00% 3 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##            devel    #4221   +/-   ##
=======================================
  Coverage   83.50%   83.51%           
=======================================
  Files         541      541           
  Lines       52486    52487    +1     
  Branches     3043     3047    +4     
=======================================
+ Hits        43830    43832    +2     
  Misses       7708     7708           
+ Partials      948      947    -1     

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

@wanghan-iapcm wanghan-iapcm added this pull request to the merge queue Oct 16, 2024
Merged via the queue into deepmodeling:devel with commit d7d2210 Oct 16, 2024
60 checks passed
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: Loss of the last step is not printed in lcurve.out
3 participants