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(cmake): Replace deprecated FetchContent_Populate with FetchContent_MakeAvailable #4309

Merged
merged 3 commits into from
Nov 5, 2024

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Nov 4, 2024

Update source/lmp/plugin/CMakeLists.txt to use FetchContent_MakeAvailable instead of FetchContent_Populate.

  • Replace FetchContent_Populate(lammps_download) with FetchContent_MakeAvailable(lammps_download) on line 13.
  • Remove FetchContent_GetProperties and if(NOT lammps_download_POPULATED) block.

This fixes a CMake warning:

CMake Warning (dev) at /home/runner/work/_temp/-111029589/cmake-3.30.5-linux-x86_64/share/cmake-3.30/Modules/FetchContent.cmake:1953 (message):
  Calling FetchContent_Populate(lammps_download) is deprecated, call
  FetchContent_MakeAvailable(lammps_download) instead.  Policy CMP0169 can be
  set to OLD to allow FetchContent_Populate(lammps_download) to be called
  directly for now, but the ability to call it with declared details will be
  removed completely in a future version.
Call Stack (most recent call first):
  lmp/plugin/CMakeLists.txt:13 (FetchContent_Populate)
This warning is for project developers.  Use -Wno-dev to suppress it.

For more details, open the Copilot Workspace session.

Summary by CodeRabbit

  • Chores
    • Simplified CMake configuration for the LAMMPS plugin, ensuring consistent availability of LAMMPS source.
    • Streamlined handling of LAMMPS versioning and installation logic.
    • Updated minimum required CMake version from 3.11 to 3.14.

njzjz and others added 2 commits November 4, 2024 17:12
…t_MakeAvailable

Update `source/lmp/plugin/CMakeLists.txt` to use `FetchContent_MakeAvailable` instead of `FetchContent_Populate`.

* Replace `FetchContent_Populate(lammps_download)` with `FetchContent_MakeAvailable(lammps_download)` on line 13.
* Remove `FetchContent_GetProperties` and `if(NOT lammps_download_POPULATED)` block.

This fixes a CMake warning:
```
CMake Warning (dev) at /home/runner/work/_temp/-111029589/cmake-3.30.5-linux-x86_64/share/cmake-3.30/Modules/FetchContent.cmake:1953 (message):
  Calling FetchContent_Populate(lammps_download) is deprecated, call
  FetchContent_MakeAvailable(lammps_download) instead.  Policy CMP0169 can be
  set to OLD to allow FetchContent_Populate(lammps_download) to be called
  directly for now, but the ability to call it with declared details will be
  removed completely in a future version.
Call Stack (most recent call first):
  lmp/plugin/CMakeLists.txt:13 (FetchContent_Populate)
This warning is for project developers.  Use -Wno-dev to suppress it.
```

---

For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/njzjz/deepmd-kit?shareId=XXXX-XXXX-XXXX-XXXX).
@github-actions github-actions bot added the LAMMPS label Nov 4, 2024
Copy link
Contributor

coderabbitai bot commented Nov 4, 2024

📝 Walkthrough
📝 Walkthrough

Walkthrough

The pull request modifies the CMake configuration for the LAMMPS plugin by simplifying the logic for fetching and configuring the LAMMPS source. It eliminates conditional checks for the lammps_download content and sets the LAMMPS_SOURCE_ROOT directly. The handling of the LAMMPS_VERSION_NUMBER is streamlined, and adjustments are made to the installation logic based on the BUILD_PY_IF condition. This results in a clearer and more efficient CMake setup.

Changes

File Path Change Summary
source/lmp/plugin/CMakeLists.txt Simplified fetching of LAMMPS source by removing conditional checks; streamlined version handling; adjusted installation logic for the library and symlink creation based on LAMMPS version.

Possibly related PRs

  • chore: bump LAMMPS to stable_29Aug2024_update1 #4179: The changes in this PR involve updating the LAMMPS version across various scripts and documentation, which is directly related to the modifications made in the main PR's CMake configuration for handling the LAMMPS source and versioning.

Suggested reviewers

  • wanghan-iapcm

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 66acae2 and 1c6e139.

📒 Files selected for processing (1)
  • source/lmp/plugin/CMakeLists.txt (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • source/lmp/plugin/CMakeLists.txt

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/lmp/plugin/CMakeLists.txt (1)

11-12: Add a comment explaining the CMake version requirement.

Consider adding a comment to document that FetchContent_MakeAvailable requires CMake 3.14 or later.

+    # FetchContent_MakeAvailable requires CMake 3.14 or later
     FetchContent_MakeAvailable(lammps_download)
     set(LAMMPS_SOURCE_ROOT ${lammps_download_SOURCE_DIR})
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 7aaf284 and 66acae2.

📒 Files selected for processing (1)
  • source/lmp/plugin/CMakeLists.txt (1 hunks)

Signed-off-by: Jinzhe Zeng <[email protected]>
Copy link

codecov bot commented Nov 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.34%. Comparing base (7aaf284) to head (1c6e139).
Report is 136 commits behind head on devel.

Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #4309      +/-   ##
==========================================
- Coverage   84.40%   84.34%   -0.07%     
==========================================
  Files         567      570       +3     
  Lines       52910    53070     +160     
  Branches     3054     3054              
==========================================
+ Hits        44661    44760      +99     
- Misses       7290     7350      +60     
- Partials      959      960       +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 Nov 5, 2024
Merged via the queue into deepmodeling:devel with commit 9ed0397 Nov 5, 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.

2 participants