parquet

* fix IsThreadLocalCapturing * run cuda kernel: CalcAucKernel with 512 threads * fix_afs_api_download_dnn_plugin * fix_fleet_last_base * parquet parser * add ps core so * chg cmake * fix libjvm lost Co-authored-by: rensilin <[email protected]> Co-authored-by: root <[email protected]>
zmxdream · Jun 10, 2022 · d4dd749 · d4dd749
1 parent 054fe1c
commit d4dd749
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cmake/external/pslib.cmake b/cmake/external/pslib.cmake
@@ -31,6 +31,7 @@ SET(PSLIB_ROOT          ${PSLIB_INSTALL_DIR})
 SET(PSLIB_INC_DIR       ${PSLIB_ROOT}/include)
 SET(PSLIB_LIB_DIR       ${PSLIB_ROOT}/lib)
 SET(PSLIB_LIB           ${PSLIB_LIB_DIR}/libps.so)
+SET(JVM_LIB           ${PSLIB_LIB_DIR}/libjvm.so)
 SET(PSLIB_VERSION_PY    ${PSLIB_DOWNLOAD_DIR}/pslib/version.py)
 SET(PSLIB_IOMP_LIB      ${PSLIB_LIB_DIR}/libiomp5.so) #todo what is this
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}" "${PSLIB_ROOT}/lib")
@@ -64,5 +65,5 @@ SET_PROPERTY(TARGET pslib PROPERTY IMPORTED_LOCATION ${PSLIB_LIB})
 ADD_DEPENDENCIES(pslib ${PSLIB_PROJECT})
 
 ADD_LIBRARY(jvm SHARED IMPORTED GLOBAL)
-SET_PROPERTY(TARGET jvm PROPERTY IMPORTED_LOCATION  ${PSLIB_LIB_DIR}/libjvm.so)
+SET_PROPERTY(TARGET jvm PROPERTY IMPORTED_LOCATION  ${JVM_LIB})
 ADD_DEPENDENCIES(jvm ${PSLIB_PROJECT})
diff --git a/python/setup.py.in b/python/setup.py.in
@@ -494,10 +494,13 @@ if '${WITH_CINN}' == 'ON':
     package_data['paddle.libs']+=['cinn_cuda_runtime_source.cuh']
 
 if '${WITH_PSLIB}' == 'ON':
+    os.system('patchelf --set-rpath \$ORIGIN ' + '${PSLIB_LIB}')
     shutil.copy('${PSLIB_LIB}', libs_path)
+    shutil.copy('${JVM_LIB}', libs_path)
     if os.path.exists('${PSLIB_VERSION_PY}'):
         shutil.copy('${PSLIB_VERSION_PY}', '${PADDLE_BINARY_DIR}/python/paddle/fluid/incubate/fleet/parameter_server/pslib/')
     package_data['paddle.libs'] += ['libps' + ext_name]
+    package_data['paddle.libs'] += ['libjvm' + ext_name]
 
 if '${WITH_MKLDNN}' == 'ON':
     if '${CMAKE_BUILD_TYPE}' == 'Release' and os.name != 'nt':