fix

Author: risemeup1

cmake/cudnn.cmake

@@ -12,12 +12,8 @@ endif()
 
 find_path(
   CUDNN_INCLUDE_DIR cudnn.h
-  PATHS
-    ${CUDNN_ROOT}/local/lib/python${PY_VERSION}/dist-packages/nvidia/cudnn/include/
-    ${CUDNN_ROOT}/include
-    $ENV{CUDNN_ROOT}
-    $ENV{CUDNN_ROOT}/include
-    ${CUDA_TOOLKIT_INCLUDE}
+  PATHS ${CUDNN_ROOT} ${CUDNN_ROOT}/include $ENV{CUDNN_ROOT}
+        $ENV{CUDNN_ROOT}/include ${CUDA_TOOLKIT_INCLUDE}
   NO_DEFAULT_PATH)
 
 get_filename_component(__libpath_hist ${CUDA_CUDART_LIBRARY} PATH)
@@ -32,7 +28,6 @@ list(
   CUDNN_CHECK_LIBRARY_DIRS
   ${CUDNN_ROOT}
   ${CUDNN_ROOT}/lib64
-  ${CUDNN_ROOT}/local/lib/python${PY_VERSION}/dist-packages/nvidia/cudnn/lib/
   ${CUDNN_ROOT}/lib
   ${CUDNN_ROOT}/lib/x64
   ${CUDNN_ROOT}/lib/${TARGET_ARCH}-linux-gnu
@@ -47,8 +42,7 @@ list(
 set(CUDNN_LIB_NAME "")
 
 if(LINUX)
-  set(CUDNN_LIB_NAME "libcudnn.so.8")
-  set(CUDNN_OPS_INFER_LIB_NAME "libcudnn_ops_infer.so.8")
+  set(CUDNN_LIB_NAME "libcudnn.so")
 endif()
 
 if(WIN32)
@@ -62,18 +56,11 @@ endif()
 
 find_library(
   CUDNN_LIBRARY
-  NAMES ${CUDNN_LIB_NAME}
+  NAMES ${CUDNN_LIB_NAME} # libcudnn_static.a
   PATHS ${CUDNN_CHECK_LIBRARY_DIRS} ${CUDNN_INCLUDE_DIR} ${__libpath_hist}
   NO_DEFAULT_PATH
   DOC "Path to cuDNN library.")
 
-find_library(
-  CUDNN_OPS_INFER_LIBRARY
-  NAMES ${CUDNN_OPS_INFER_LIB_NAME}
-  PATHS ${CUDNN_CHECK_LIBRARY_DIRS} ${CUDNN_INCLUDE_DIR} ${__libpath_hist}
-  NO_DEFAULT_PATH
-  DOC "Path to cuDNN_ops_infer library.")
-
 if(CUDNN_INCLUDE_DIR AND CUDNN_LIBRARY)
   set(CUDNN_FOUND ON)
 else()

paddle/fluid/pybind/CMakeLists.txt

@@ -543,16 +543,7 @@ if(WITH_PYTHON)
     ${SHARD_LIB_NAME} SHARED
     SRCS ${PYBIND_SRCS}
     DEPS ${PYBIND_DEPS} ${GLOB_OP_LIB} ${GLOB_OPERATOR_DEPS})
-  # get_target_property(PADDLE_RPATH ${SHARD_LIB_NAME} INSTALL_RPATH)
-  # list(APPEND PADDLE_RPATH $ORIGIN/../libs $ORIGIN/../../nvidia/cuda_runtime/lib)
-  # set_target_properties(
-  #   ${SHARD_LIB_NAME}
-  #   PROPERTIES
-  #     BUILD_WITH_INSTALL_RPATH TRUE
-  #     INSTALL_RPATH
-  #     "${PADDLE_RPATH}"
-  # )
-  #"/usr/local/cuda/targets/x86_64-linux/lib;/usr/local/lib/python${PY_VERSION}/dist-packages/nvidia/cuda_runtime/lib;$ORIGIN/../libs"
+
   # cc_test do not respect deps, whole archive to link symbols that may need by test
   if(WITH_TESTING)
     #set_target_properties(${SHARD_LIB_NAME} PROPERTIES LINK_FLAGS "-Wl,--whole-archive")

paddle/phi/CMakeLists.txt

@@ -133,15 +133,6 @@ if(WITH_GPU)
     phi ${PHI_BUILD_TYPE}
     SRCS ${PHI_SRCS}
     DEPS ${PHI_DEPS})
-  # get_target_property(PHI_RPATH phi INSTALL_RPATH)
-  # list(APPEND PHI_RPATH $ORIGIN/../libs $ORIGIN/../../nvidia/cuda_runtime/lib)
-  # set_target_properties(
-  #   phi
-  #   PROPERTIES
-  #     BUILD_WITH_INSTALL_RPATH TRUE
-  #     INSTALL_RPATH
-  #     "${PHI_RPATH}"
-  # )
 
 elseif(WITH_ROCM)
   hip_add_library(phi ${PHI_BUILD_TYPE} ${PHI_SRCS})

paddle/phi/backends/dynload/dynamic_loader.cc

@@ -228,7 +228,6 @@ static inline void* GetDsoHandleFromSearchPath(
   for (auto const& dso : dso_names) {
     // 1. search in user config path by FLAGS
     dso_handle = GetDsoHandleFromSpecificPath(config_path, dso, dynload_flags);
-    VLOG(1) << "dso:" << dso << "dyload_flags:" << dynload_flags;
     // 2. search in system default path
     if (nullptr == dso_handle) {
       dso_handle = GetDsoHandleFromDefaultPath(dso, dynload_flags);

python/env_dict.py.in

@@ -26,7 +26,6 @@ env_dict={
     'GNU_RT_LIB_1':'@GNU_RT_LIB_1@',
     'WITH_CUDNN_DSO':'@WITH_CUDNN_DSO@',
     'CUDNN_LIBRARY':'@CUDNN_LIBRARY@',
-    'CUDNN_OPS_INFER_LIBRARY':'@CUDNN_OPS_INFER_LIBRARY@',
     'GNU_RT_LIB_2':'@GNU_RT_LIB_2@',
     'WITH_MKL':'@WITH_MKL@',
     'MKLML_SHARED_LIB':'@MKLML_SHARED_LIB@',