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): optimize createNlistTensor #4403

Merged
merged 1 commit into from
Nov 23, 2024

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Nov 22, 2024

Summary by CodeRabbit

  • New Features

    • Enhanced tensor creation process for improved performance and efficiency.
  • Bug Fixes

    • Improved error handling for PyTorch-related exceptions, providing clearer error messages.

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review any files in this pull request.

Files not reviewed (2)
  • source/api_cc/src/DeepPotPT.cc: Language not supported
  • source/api_cc/src/DeepSpinPT.cc: Language not supported
@github-actions github-actions bot added the C++ label Nov 22, 2024
Copy link
Contributor

coderabbitai bot commented Nov 22, 2024

📝 Walkthrough

Walkthrough

The changes in this pull request involve significant refactoring of the tensor creation logic and error handling in the DeepPotPT and DeepSpinPT classes. The createNlistTensor and createNlistTensor2 functions have been updated to eliminate intermediate tensor structures, allowing for direct tensor creation from flattened input data. Additionally, the translate_error methods in both classes have been enhanced to catch specific PyTorch exceptions and rethrow them as deepmd::deepmd_exception with detailed messages. Overall, the modifications streamline tensor operations and improve error reporting.

Changes

File Change Summary
source/api_cc/src/DeepPotPT.cc Refactored createNlistTensor to create a tensor directly from a flattened vector of integers. Enhanced translate_error to catch specific PyTorch exceptions and rethrow them as deepmd::deepmd_exception.
source/api_cc/src/DeepSpinPT.cc Refactored createNlistTensor2 to flatten input data for tensor creation. Updated translate_error for improved exception handling similar to DeepPotPT.

Possibly related PRs

  • fix(cc): fix message passing when nghost is 0 and send list is empty #4237: The changes in this PR also involve modifications to the translate_error method in the DeepPotPT class, enhancing error handling similar to the main PR's updates. Additionally, both PRs refactor tensor creation logic, indicating a direct relationship in their focus on improving the DeepPotPT class functionality.

Suggested labels

C++, LAMMPS

Suggested reviewers

  • wanghan-iapcm

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

🧹 Outside diff range and nitpick comments (1)
source/api_cc/src/DeepPotPT.cc (1)

38-42: Consider pre-allocating the flat_data vector with reserve.

While the current implementation uses reserve, it could be more efficient to pre-allocate the exact size since we already know it.

-  flat_data.reserve(total_size);
+  flat_data.resize(total_size);
+  size_t offset = 0;
   for (const auto& row : data) {
-    flat_data.insert(flat_data.end(), row.begin(), row.end());
+    std::copy(row.begin(), row.end(), flat_data.begin() + offset);
+    offset += row.size();
   }
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between d1712c9 and 190d1e6.

📒 Files selected for processing (2)
  • source/api_cc/src/DeepPotPT.cc (1 hunks)
  • source/api_cc/src/DeepSpinPT.cc (1 hunks)
🔇 Additional comments (2)
source/api_cc/src/DeepPotPT.cc (2)

Line range hint 15-31: LGTM! Improved error handling with specific PyTorch exception types.

The error handling implementation is well-structured and provides clear error messages for different types of PyTorch exceptions.


34-47: LGTM! Efficient tensor creation implementation.

The implementation efficiently creates tensors by flattening the data first and then reshaping, which eliminates intermediate tensor structures.

source/api_cc/src/DeepSpinPT.cc Show resolved Hide resolved
Copy link

codecov bot commented Nov 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.59%. Comparing base (d1712c9) to head (190d1e6).
Report is 7 commits behind head on devel.

Additional details and impacted files
@@           Coverage Diff           @@
##            devel    #4403   +/-   ##
=======================================
  Coverage   84.59%   84.59%           
=======================================
  Files         614      614           
  Lines       57009    57012    +3     
  Branches     3486     3486           
=======================================
+ Hits        48224    48227    +3     
+ Misses       7660     7659    -1     
- Partials     1125     1126    +1     

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


🚨 Try these New Features:

@njzjz njzjz added this pull request to the merge queue Nov 23, 2024
Merged via the queue into deepmodeling:devel with commit 2303ff0 Nov 23, 2024
60 checks passed
@njzjz njzjz deleted the pt-opt-createNlistTensor branch November 23, 2024 06:39
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