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

[r2] fix: move resnet_dt checking from graph to tabulate #3952

Merged
merged 1 commit into from
Jul 6, 2024

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Jul 5, 2024

Fix #3950. Backport a part of #3263 to r2 (the whole of #3263 is not likely to be backported).

Summary by CodeRabbit

  • New Features

    • Introduced new checks to ensure only weight and bias matrices are supported during tabulation operations.
  • Refactor

    • Removed redundant loop enforcing constraints on node keys related to weight and bias matrices to streamline operations.

Fix deepmodeling#3950. Backport a part of deepmodeling#3263 to r2 (the whole of deepmodeling#3263 is not likely to be backported).

Signed-off-by: Jinzhe Zeng <jinzhe.zeng@rutgers.edu>
Copy link
Contributor

coderabbitai bot commented Jul 5, 2024

Walkthrough

Walkthrough

The updates in deepmd/utils/graph.py and deepmd/utils/tabulate.py enhance the functionality for fine-tuning models by refining how node constraints and tabulations are handled. Specifically, they address the issue of finetuning models with the descriptor se_atten_v2, ensuring that only weight and bias matrices are supported during tabulation.

Changes

File Path Change Summary
deepmd/utils/graph.py Removed the loop enforcing constraints on node keys for weight and bias matrices in get_embedding_net_nodes_from_graph_def.
deepmd/utils/tabulate.py Added an assertion in the __init__ method to restrict support to only weight and bias matrices at the tabulation operation.

Sequence Diagram(s)

sequenceDiagram
  participant User
  participant CLI
  participant Trainer
  participant Descriptor
  participant Utils
  
  User ->> CLI: dp train --skip-neighbor-stat --init-frz-model test.pb test_job.json
  CLI ->> Trainer: Initialize training
  Trainer ->> Descriptor: Load descriptor (se_atten_v2)
  Descriptor ->> Utils: Call get_embedding_net_variables_from_graph_def
  Utils ->> Utils: get_embedding_net_nodes_from_graph_def with refined constraints
  Utils ->> Descriptor: Return variables
  Descriptor ->> Trainer: Initialize variables
  Trainer ->> CLI: Start training
Loading

Assessment against linked issues

Objective Addressed Explanation
Fix the AssertionError related to tabulation operation in fine-tuning with --init-frz-model (#3950).
Ensure that node constraints only apply to weight and bias matrices as required by the se_atten_v2 descriptor (#3950).

Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 84ca63c and 897376a.

Files selected for processing (2)
  • deepmd/utils/graph.py (1 hunks)
  • deepmd/utils/tabulate.py (1 hunks)
Files skipped from review due to trivial changes (1)
  • deepmd/utils/graph.py
Additional context used
Ruff
deepmd/utils/tabulate.py

136-136: Use key in dict instead of key in dict.keys()

Remove .keys()

(SIM118)


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.

@github-actions github-actions bot added the Python label Jul 5, 2024
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 (2)
deepmd/utils/tabulate.py (2)

136-139: Use key in dict instead of key in dict.keys().

This simplifies the code and is more idiomatic in Python.

-        for key in self.embedding_net_nodes.keys():
+        for key in self.embedding_net_nodes:
Tools
Ruff

136-136: Use key in dict instead of key in dict.keys()

Remove .keys()

(SIM118)


137-139: Ensure error message clarity in assertion.

The error message should be more descriptive to help users understand the constraint.

-            ), "currently, only support weight matrix and bias matrix at the tabulation op!"
+            ), "Currently, only weight matrix and bias matrix are supported at the tabulation operation."

Copy link

codecov bot commented Jul 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.51%. Comparing base (84ca63c) to head (897376a).

Additional details and impacted files
@@           Coverage Diff           @@
##               r2    #3952   +/-   ##
=======================================
  Coverage   81.51%   81.51%           
=======================================
  Files         342      342           
  Lines       33882    33882           
  Branches     2876     2876           
=======================================
  Hits        27618    27618           
  Misses       5381     5381           
  Partials      883      883           

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

@wanghan-iapcm wanghan-iapcm merged commit 6dafa50 into deepmodeling:r2 Jul 6, 2024
47 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.

Unable to finetune a model containing descriptor "se_atten_v2" with --init-frz-model argument
2 participants