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: set rpath for libtorch and protobuf #3636

Merged
merged 3 commits into from
Apr 2, 2024
Merged

Conversation

njzjz
Copy link
Member

@njzjz njzjz commented Apr 2, 2024

Fix #3568.

Set run path for libtorch and protobuf. Refactor the original TensorFlow_LIBRARY_PATH to BACKEND_LIBRARY_PATH (list).

@github-actions github-actions bot added the i-PI label Apr 2, 2024
Copy link

codecov bot commented Apr 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.94%. Comparing base (8e0cc90) to head (50dbd56).
Report is 1 commits behind head on devel.

Additional details and impacted files
@@            Coverage Diff             @@
##            devel    #3636      +/-   ##
==========================================
+ Coverage   77.80%   77.94%   +0.14%     
==========================================
  Files         438      404      -34     
  Lines       37707    32876    -4831     
  Branches     1623      909     -714     
==========================================
- Hits        29337    25626    -3711     
+ Misses       7506     6722     -784     
+ Partials      864      528     -336     

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

@njzjz njzjz marked this pull request as draft April 2, 2024 04:24
njzjz added 2 commits April 2, 2024 04:02
Signed-off-by: Jinzhe Zeng <[email protected]>
@njzjz njzjz changed the title fix(pt): add libtorch directory to rpath fix: set rpath for libtorch and protobuf Apr 2, 2024
@njzjz njzjz requested a review from wanghan-iapcm April 2, 2024 08:18
@njzjz njzjz marked this pull request as ready for review April 2, 2024 08:18
@njzjz
Copy link
Member Author

njzjz commented Apr 2, 2024

cc: @Yi-FanLi

@wanghan-iapcm wanghan-iapcm added this pull request to the merge queue Apr 2, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 2, 2024
@njzjz njzjz added this pull request to the merge queue Apr 2, 2024
Merged via the queue into deepmodeling:devel with commit 4c546d0 Apr 2, 2024
48 checks passed
@njzjz njzjz deleted the pt-rpath branch April 2, 2024 18:07
@njzjz njzjz added this to the v2.2.11 milestone Jun 20, 2024
njzjz added a commit to njzjz/deepmd-kit that referenced this pull request Jun 20, 2024
The previous `PyTorch_LIBRARY_PATH` in deepmodeling#3636 is wrong: `BACKEND_INCLUDE_DIRS` is a list of paths instead of a single path.

Signed-off-by: Jinzhe Zeng <[email protected]>
github-merge-queue bot pushed a commit that referenced this pull request Jun 21, 2024
The previous `PyTorch_LIBRARY_PATH` in #3636 is wrong:
`BACKEND_INCLUDE_DIRS` is a list of paths instead of a single path.

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

## Summary by CodeRabbit

- **Refactor**
- Improved the method for retrieving the PyTorch library path during the
build process to enhance configuration accuracy.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Signed-off-by: Jinzhe Zeng <[email protected]>
njzjz added a commit to njzjz/deepmd-kit that referenced this pull request Jul 2, 2024
Fix deepmodeling#3568.

Set run path for libtorch and protobuf. Refactor the original
`TensorFlow_LIBRARY_PATH` to `BACKEND_LIBRARY_PATH` (list).

---------

Signed-off-by: Jinzhe Zeng <[email protected]>
(cherry picked from commit 4c546d0)
Signed-off-by: Jinzhe Zeng <[email protected]>
@njzjz njzjz mentioned this pull request Jul 2, 2024
njzjz added a commit that referenced this pull request Jul 3, 2024
Fix #3568.

Set run path for libtorch and protobuf. Refactor the original
`TensorFlow_LIBRARY_PATH` to `BACKEND_LIBRARY_PATH` (list).

---------

Signed-off-by: Jinzhe Zeng <[email protected]>
(cherry picked from commit 4c546d0)
Signed-off-by: Jinzhe Zeng <[email protected]>
njzjz added a commit to njzjz/deepmd-kit that referenced this pull request Jul 12, 2024
There is a typo in deepmodeling#3636

Signed-off-by: Jinzhe Zeng <[email protected]>
github-merge-queue bot pushed a commit that referenced this pull request Jul 13, 2024
There was a typo in #3636.

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

## Summary by CodeRabbit

- **Refactor**
- Updated build configuration to improve compatibility with PyTorch by
modifying library path settings.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Signed-off-by: Jinzhe Zeng <[email protected]>
mtaillefumier pushed a commit to mtaillefumier/deepmd-kit that referenced this pull request Sep 18, 2024
The previous `PyTorch_LIBRARY_PATH` in deepmodeling#3636 is wrong:
`BACKEND_INCLUDE_DIRS` is a list of paths instead of a single path.

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

## Summary by CodeRabbit

- **Refactor**
- Improved the method for retrieving the PyTorch library path during the
build process to enhance configuration accuracy.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Signed-off-by: Jinzhe Zeng <[email protected]>
mtaillefumier pushed a commit to mtaillefumier/deepmd-kit that referenced this pull request Sep 18, 2024
There was a typo in deepmodeling#3636.

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

## Summary by CodeRabbit

- **Refactor**
- Updated build configuration to improve compatibility with PyTorch by
modifying library path settings.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Signed-off-by: Jinzhe Zeng <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants