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.

Sign up for GitHub

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

fix: set rpath for libtorch and protobuf #3636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d42bd8e
fix(pt): add libtorch directory to rpath
njzjz Apr 2, 2024
963c0c1
rename to BACKEND_LIBRARY_PATH
njzjz Apr 2, 2024
50dbd56
protobuf
njzjz Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ endif()
# find tensorflow, I need tf abi info
if(ENABLE_TENSORFLOW AND NOT DEEPMD_C_ROOT)
find_package(tensorflow REQUIRED)
list(APPEND BACKEND_LIBRARY_PATH ${TensorFlow_LIBRARY_PATH})
list(APPEND BACKEND_INCLUDE_DIRS ${TENSORFLOW_INCLUDE_DIRS})
endif()
if(BUILD_CPP_IF
AND USE_PT_PYTHON_LIBS
Expand All @@ -174,7 +176,10 @@ if(BUILD_CPP_IF
"Cannot determine PyTorch CMake prefix path, error code: $PYTORCH_CMAKE_PREFIX_PATH_RESULT_VAR}, error message: ${PYTORCH_CMAKE_PREFIX_PATH_ERROR_VAR}"
)
endif()
list(APPEND CMAKE_PREFIX_PATH ${PYTORCH_CMAKE_PREFIX_PATH})
list(APPEND BACKEND_LIBRARY_PATH ${TensorFlow_LIBRARY_PATH})
if(Protobuf_LIBRARY_DIRECTORY)
list(APPEND BACKEND_LIBRARY_PATH ${Protobuf_LIBRARY_DIRECTORY})
endif()
endif()
if(ENABLE_PYTORCH AND NOT DEEPMD_C_ROOT)
find_package(Torch REQUIRED)
Expand All @@ -194,6 +199,10 @@ if(ENABLE_PYTORCH AND NOT DEEPMD_C_ROOT)
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=${OP_CXX_ABI})
endif()
endif()
# get torch directory
set(PyTorch_LIBRARY_PATH ${TORCH_INCLUDE_DIRS}/../lib)
list(APPEND BACKEND_LIBRARY_PATH ${PyTorch_LIBRARY_PATH})
list(APPEND BACKEND_INCLUDE_DIRS ${TORCH_INCLUDE_DIRS})
endif()
# log enabled backends
if(NOT DEEPMD_C_ROOT)
Expand Down Expand Up @@ -297,7 +306,9 @@ if(DEEPMD_C_ROOT)
# use variable for TF path to set deepmd_c path
set(TENSORFLOW_ROOT "${DEEPMD_C_ROOT}")
set(TensorFlow_LIBRARY_PATH "${DEEPMD_C_ROOT}/lib")
set(BACKEND_LIBRARY_PATH "${DEEPMD_C_ROOT}/lib")
set(TENSORFLOW_INCLUDE_DIRS "${DEEPMD_C_ROOT}/include")
set(BACKEND_INCLUDE_DIRS "${DEEPMD_C_ROOT}/include")
set(TORCH_LIBRARIES "${DEEPMD_C_ROOT}/lib/libtorch.so")
endif()

Expand Down
4 changes: 2 additions & 2 deletions source/api_c/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ target_include_directories(
${libname} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)

set_target_properties(
${libname} PROPERTIES INSTALL_RPATH "$ORIGIN;${TensorFlow_LIBRARY_PATH}")
set_target_properties(${libname} PROPERTIES INSTALL_RPATH
"$ORIGIN;${BACKEND_LIBRARY_PATH}")
if(CMAKE_TESTING_ENABLED)
target_link_libraries(${libname} PRIVATE coverage_config)
endif()
Expand Down
2 changes: 1 addition & 1 deletion source/api_c/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(deepmd_api_c_test)
file(GLOB TEST_SRC test_*.cc)

set_target_properties(
${LIB_DEEPMD_C} PROPERTIES INSTALL_RPATH "$ORIGIN;${TensorFlow_LIBRARY_PATH}")
${LIB_DEEPMD_C} PROPERTIES INSTALL_RPATH "$ORIGIN;${BACKEND_LIBRARY_PATH}")

add_executable(runUnitTests_c ${TEST_SRC})
target_link_libraries(runUnitTests_c PRIVATE GTest::gtest_main ${LIB_DEEPMD_C}
Expand Down
2 changes: 1 addition & 1 deletion source/api_cc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ endif()

set_target_properties(
${libname}
PROPERTIES INSTALL_RPATH "$ORIGIN;${TensorFlow_LIBRARY_PATH}"
PROPERTIES INSTALL_RPATH "$ORIGIN;${BACKEND_LIBRARY_PATH}"
INSTALL_RPATH_USE_LINK_PATH TRUE
BUILD_RPATH "$ORIGIN/../op/tf;$ORIGIN/../op/pt")
target_compile_definitions(${libname} PRIVATE TF_PRIVATE)
Expand Down
2 changes: 1 addition & 1 deletion source/gmx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ target_include_directories(${libgmxname}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/)

set_target_properties(
${libgmxname} PROPERTIES INSTALL_RPATH "$ORIGIN;${TensorFlow_LIBRARY_PATH}")
${libgmxname} PROPERTIES INSTALL_RPATH "$ORIGIN;${BACKEND_LIBRARY_PATH}")

install(
FILES dp_gmx_patch
Expand Down
4 changes: 2 additions & 2 deletions source/ipi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ if(APPLE)
${ipiname}
PROPERTIES LINK_FLAGS "${extra_link_flags}"
INSTALL_RPATH
"@loader_path/../${LIB_DIR}:${TensorFlow_LIBRARY_PATH}")
"@loader_path/../${LIB_DIR};${BACKEND_LIBRARY_PATH}")
else()
set_target_properties(
${ipiname}
PROPERTIES LINK_FLAGS
"-Wl,-rpath,'$ORIGIN'/../${LIB_DIR} ${extra_link_flags}"
INSTALL_RPATH "$ORIGIN/../${LIB_DIR}:${TensorFlow_LIBRARY_PATH}")
INSTALL_RPATH "$ORIGIN/../${LIB_DIR};${BACKEND_LIBRARY_PATH}")
endif()

if(CMAKE_TESTING_ENABLED)
Expand Down
4 changes: 2 additions & 2 deletions source/lmp/env.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
DEEPMD_ROOT=@CMAKE_INSTALL_PREFIX@
TENSORFLOW_INCLUDE_DIRS="@TensorFlow_INCLUDE_DIRS@"
TENSORFLOW_LIBRARY_PATH="@TensorFlow_LIBRARY_PATH@"
TENSORFLOW_INCLUDE_DIRS="@BACKEND_INCLUDE_DIRS@"
TENSORFLOW_LIBRARY_PATH="@BACKEND_LIBRARY_PATH@"

TF_INCLUDE_DIRS=`echo $TENSORFLOW_INCLUDE_DIRS | sed "s/;/ -I/g"`
TF_LIBRARY_PATH=`echo $TENSORFLOW_LIBRARY_PATH | sed "s/;/ -L/g"`
Expand Down
4 changes: 2 additions & 2 deletions source/lmp/env_c.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
DEEPMD_ROOT=@CMAKE_INSTALL_PREFIX@
TENSORFLOW_INCLUDE_DIRS="@TensorFlow_INCLUDE_DIRS@"
TENSORFLOW_LIBRARY_PATH="@TensorFlow_LIBRARY_PATH@"
TENSORFLOW_INCLUDE_DIRS="@BACKEND_INCLUDE_DIRS@"
TENSORFLOW_LIBRARY_PATH="@BACKEND_LIBRARY_PATH@"

TF_INCLUDE_DIRS=`echo $TENSORFLOW_INCLUDE_DIRS | sed "s/;/ -I/g"`
TF_LIBRARY_PATH=`echo $TENSORFLOW_LIBRARY_PATH | sed "s/;/ -L/g"`
Expand Down
4 changes: 2 additions & 2 deletions source/lmp/env_py.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
DEEPMD_ROOT=@CMAKE_INSTALL_PREFIX@
TENSORFLOW_INCLUDE_DIRS="@TensorFlow_INCLUDE_DIRS@"
TENSORFLOW_LIBRARY_PATH="@TensorFlow_LIBRARY_PATH@"
TENSORFLOW_INCLUDE_DIRS="@BACKEND_INCLUDE_DIRS@"
TENSORFLOW_LIBRARY_PATH="@BACKEND_LIBRARY_PATH@"
PYTHON_LIBRARY_PATH="@Python_LIBRARY_DIRS@"

TF_INCLUDE_DIRS=`echo $TENSORFLOW_INCLUDE_DIRS | sed "s/;/ -I/g"`
Expand Down
4 changes: 2 additions & 2 deletions source/lmp/env_py_c.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
DEEPMD_ROOT=@CMAKE_INSTALL_PREFIX@
TENSORFLOW_INCLUDE_DIRS="@TensorFlow_INCLUDE_DIRS@"
TENSORFLOW_LIBRARY_PATH="@TensorFlow_LIBRARY_PATH@"
TENSORFLOW_INCLUDE_DIRS="@BACKEND_INCLUDE_DIRS@"
TENSORFLOW_LIBRARY_PATH="@BACKEND_LIBRARY_PATH@"
PYTHON_LIBRARY_PATH="@Python_LIBRARY_DIRS@"

TF_INCLUDE_DIRS=`echo $TENSORFLOW_INCLUDE_DIRS | sed "s/;/ -I/g"`
Expand Down
2 changes: 1 addition & 1 deletion source/lmp/plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if(DEFINED LAMMPS_SOURCE_ROOT OR DEFINED LAMMPS_VERSION)
"-Wl,-undefined,dynamic_lookup")
else()
set_target_properties(
${libname} PROPERTIES INSTALL_RPATH "$ORIGIN;${TensorFlow_LIBRARY_PATH}"
${libname} PROPERTIES INSTALL_RPATH "$ORIGIN;${BACKEND_LIBRARY_PATH}"
LINK_FLAGS "-rdynamic")
endif()
target_compile_definitions(
Expand Down
5 changes: 2 additions & 3 deletions source/op/tf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,10 @@ endif()
if(APPLE)
set_target_properties(
${LIB_DEEPMD_OP} PROPERTIES INSTALL_RPATH
"@loader_path;${TensorFlow_LIBRARY_PATH}")
"@loader_path;${BACKEND_LIBRARY_PATH}")
else()
set_target_properties(
${LIB_DEEPMD_OP} PROPERTIES INSTALL_RPATH
"$ORIGIN;${TensorFlow_LIBRARY_PATH}")
${LIB_DEEPMD_OP} PROPERTIES INSTALL_RPATH "$ORIGIN;${BACKEND_LIBRARY_PATH}")
endif()
if(CMAKE_TESTING_ENABLED)
target_link_libraries(${LIB_DEEPMD_OP} PRIVATE coverage_config)
Expand Down