Adjust the search path for libnccl.so (#62492)

risemeup1 · web-flow · commit 2c34d763d36d · 2024-03-07T10:30:17.000+08:00
* adpate libnccl.so in pdc

* adpate libnccl.so in pdc
diff --git a/paddle/phi/backends/dynload/dynamic_loader.cc b/paddle/phi/backends/dynload/dynamic_loader.cc
@@ -587,7 +587,7 @@ void* GetNCCLDsoHandle() {
 #else
 #ifdef WITH_PIP_CUDA_LIBRARIES
   return GetDsoHandleFromSearchPath(
-      FLAGS_nccl_dir, "libnccl.so.2", true, {}, warning_msg);
+      FLAGS_nccl_dir, "libnccl.so;libnccl.so.2", true, {}, warning_msg);
 #else
   return GetDsoHandleFromSearchPath(
       FLAGS_nccl_dir, "libnccl.so", true, {}, warning_msg);
diff --git a/python/paddle/__init__.py b/python/paddle/__init__.py
@@ -565,7 +565,11 @@
     import os
     import platform
 
-    if platform.system() == 'Linux' and platform.machine() == 'x86_64':
+    if (
+        platform.system() == 'Linux'
+        and platform.machine() == 'x86_64'
+        and paddle.version.with_pip_cuda_libraries == 'ON'
+    ):
         package_dir = os.path.dirname(os.path.abspath(__file__))
         cublas_lib_path = package_dir + "/.." + "/nvidia/cublas/lib"
         set_flags({"FLAGS_cublas_dir": cublas_lib_path})
diff --git a/python/setup.py.in b/python/setup.py.in
@@ -135,6 +135,7 @@ is_tagged          = %(is_tagged)s
 commit           = '%(commit)s'
 with_mkl         = '%(with_mkl)s'
 cinn_version      = '%(cinn)s'
+with_pip_cuda_libraries       = '%(with_pip_cuda_libraries)s'
 
 __all__ = ['cuda', 'cudnn', 'nccl', 'show', 'xpu', 'xpu_xccl', 'xpu_xhpc']
 
@@ -357,7 +358,8 @@ def cinn():
             'commit': commit,
             'is_tagged': is_tagged(),
             'with_mkl': '@WITH_MKL@',
-            'cinn': get_cinn_version()})
+            'cinn': get_cinn_version(),
+            'with_pip_cuda_libraries': '@WITH_PIP_CUDA_LIBRARIES@'})
 
 write_version_py(filename='@PADDLE_BINARY_DIR@/python/paddle/version/__init__.py')
 
diff --git a/setup.py b/setup.py
@@ -458,6 +458,7 @@ def write_version_py(filename='paddle/version/__init__.py'):
 commit           = '%(commit)s'
 with_mkl         = '%(with_mkl)s'
 cinn_version      = '%(cinn)s'
+with_pip_cuda_libraries       = '%(with_pip_cuda_libraries)s'
 
 __all__ = ['cuda', 'cudnn', 'nccl', 'show', 'xpu', 'xpu_xccl', 'xpu_xhpc']
 
@@ -682,6 +683,9 @@ def cinn():
                 'is_tagged': is_tagged(),
                 'with_mkl': env_dict.get("WITH_MKL"),
                 'cinn': get_cinn_version(),
+                'with_pip_cuda_libraries': env_dict.get(
+                    "with_pip_cuda_libraries"
+                ),
             }
         )
 

Original file line number	Diff line number	Diff line change
`@@ -458,6 +458,7 @@ def write_version_py(filename='paddle/version/__init__.py'):`
`458`	`458`	`commit = '%(commit)s'`
`459`	`459`	`with_mkl = '%(with_mkl)s'`
`460`	`460`	`cinn_version = '%(cinn)s'`
	`461`	`+with_pip_cuda_libraries = '%(with_pip_cuda_libraries)s'`
`461`	`462`
`462`	`463`	`__all__ = ['cuda', 'cudnn', 'nccl', 'show', 'xpu', 'xpu_xccl', 'xpu_xhpc']`
`463`	`464`
`@@ -682,6 +683,9 @@ def cinn():`
`682`	`683`	`'is_tagged': is_tagged(),`
`683`	`684`	`'with_mkl': env_dict.get("WITH_MKL"),`
`684`	`685`	`'cinn': get_cinn_version(),`
	`686`	`+ 'with_pip_cuda_libraries': env_dict.get(`
	`687`	`+ "with_pip_cuda_libraries"`
	`688`	`+ ),`
`685`	`689`	`}`
`686`	`690`	`)`
`687`	`691`