Installing paddle does not depend on local cuda and cudnn #60841

risemeup1 · 2024-01-16T03:40:28Z

PR types

Others

PR changes

Others

Description

功能：
支持用户在linux系统，x86_64平台下安装paddle，本地不需要装cuda和cudnn
收益：
1 whl包体积缩小180M
2 用户安装体验提升

Pcard-67164

paddle-bot · 2024-01-16T03:40:33Z

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

paddle-bot · 2024-01-16T03:40:34Z

✅ This PR's description meets the template requirements!
Please wait for other CI results.

zhangbo9674 · 2024-01-22T03:07:36Z

paddle/phi/backends/dynload/dynamic_loader.cc

+#if defined(__linux__) && defined(PADDLE_WITH_CUDA)
+  if (CUDA_VERSION >= 11000 && CUDA_VERSION < 12000) {
+    return GetDsoHandleFromSearchPath(FLAGS_cublas_dir, "libcublasLt.so.11");
+  } else if (CUDA_VERSION >= 12000 && CUDA_VERSION <= 12030) {
+    return GetDsoHandleFromSearchPath(FLAGS_cublas_dir, "libcublasLt.so.12");
+  } else {
+    std::string warning_msg(
+        "Your CUDA_VERSION is less than 11 or greater than 12, paddle "
+        "temporarily no longer supports");
+    return nullptr;
+  }
+#elif defined(PADDLE_WITH_CUDA) && CUDA_VERSION >= 10010


这段逻辑会和下面的这个 elif 分支冲突吧？

zhangbo9674 · 2024-01-22T03:08:17Z

paddle/phi/backends/dynload/dynamic_loader.cc

@@ -369,17 +353,30 @@ void* GetCUDNNDsoHandle() {
  return GetDsoHandleFromSearchPath(FLAGS_miopen_dir, "libMIOpen.so", false);
 #else
  return GetDsoHandleFromSearchPath(
-      FLAGS_cudnn_dir, "libcudnn.so", false, {cuda_lib_path});
+      FLAGS_cudnn_dir, "libcudnn.so.8", false, {cuda_lib_path});


为什么一定是 .8 ?

因为nvidia提供的包没有libcudnn.so，止呕libcudnn.so.8

zhangbo9674 · 2024-01-22T03:08:45Z

paddle/phi/backends/dynload/dynamic_loader.cc

 #else
  return GetDsoHandleFromSearchPath(
-      FLAGS_cupti_dir, "libcupti.so", false, {cupti_lib_path});
+      FLAGS_cupti_dir, "libcupti.so.11.7", false, {cupti_lib_path});


同上，为什么一定是 .11.7

zhangbo9674 · 2024-01-22T03:09:01Z

paddle/phi/backends/dynload/dynamic_loader.cc

@@ -392,7 +389,7 @@ void* GetCurandDsoHandle() {
 #elif defined(PADDLE_WITH_HIP)
  return GetDsoHandleFromSearchPath(FLAGS_rocm_dir, "libhiprand.so");
 #else
-  return GetDsoHandleFromSearchPath(FLAGS_cuda_dir, "libcurand.so");
+  return GetDsoHandleFromSearchPath(FLAGS_curand_dir, "libcurand.so.10");


zhangbo9674 · 2024-01-22T03:11:57Z

python/setup.py.in

-            commands = ["patchelf --set-rpath '$ORIGIN/../libs/' ${PADDLE_BINARY_DIR}/python/paddle/base/${FLUID_CORE_NAME}" + '.so']
-            commands.append("patchelf --set-rpath '$ORIGIN' ${PADDLE_BINARY_DIR}/python/paddle/libs/${COMMON_NAME}")
+            commands = ["patchelf --set-rpath '$ORIGIN/../libs/:$ORIGIN/../../nvidia/cuda_runtime/lib' ${PADDLE_BINARY_DIR}/python/paddle/base/${FLUID_CORE_NAME}" + '.so']
+            #commands.append("patchelf --set-rpath '$ORIGIN' ${PADDLE_BINARY_DIR}/python/paddle/libs/${COMMON_NAME}")


YuanRisheng · 2024-01-22T03:13:08Z

python/setup.py.in

-            commands = ["patchelf --set-rpath '$ORIGIN/../libs/' ${PADDLE_BINARY_DIR}/python/paddle/base/${FLUID_CORE_NAME}" + '.so']
-            commands.append("patchelf --set-rpath '$ORIGIN' ${PADDLE_BINARY_DIR}/python/paddle/libs/${COMMON_NAME}")
+            commands = ["patchelf --set-rpath '$ORIGIN/../libs/:$ORIGIN/../../nvidia/cuda_runtime/lib' ${PADDLE_BINARY_DIR}/python/paddle/base/${FLUID_CORE_NAME}" + '.so']
+            #commands.append("patchelf --set-rpath '$ORIGIN' ${PADDLE_BINARY_DIR}/python/paddle/libs/${COMMON_NAME}")


注释代码不需要删掉吧

… install_paddle_upgrade

wanghuancoder

LGTM

zyfncg

LGTM for setup.py.in

lanxianghit

LGTM for flags

zhangbo9674

LGTM!

…le#60841) * fix bug * fix bug * fix * fix * fix * fix * fix * fix * fix * fix * fix

fix bug

2868809

fix bug

c28648d

risemeup1 changed the title ~~fix bug~~ Update paddle install Jan 16, 2024

risemeup1 added 4 commits January 16, 2024 09:55

fix

0974c70

fix

9102dd4

fix

020d418

fix

0e72bc2

zhangbo9674 reviewed Jan 22, 2024

View reviewed changes

YuanRisheng previously approved these changes Jan 22, 2024

View reviewed changes

risemeup1 dismissed YuanRisheng’s stale review via 0e72bc2 January 22, 2024 06:23

risemeup1 added 2 commits January 24, 2024 03:36

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

0168c33

… install_paddle_upgrade

fix

c110115

risemeup1 force-pushed the install_paddle_upgrade branch from 5b98ce0 to c110115 Compare January 24, 2024 03:40

fix

178298b

risemeup1 changed the title ~~Update paddle install~~ Installing paddle does not depend on local cuda and cudnn Jan 25, 2024

risemeup1 added 2 commits January 25, 2024 12:22

fix

2207b38

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

a0a19f1

… install_paddle_upgrade

risemeup1 force-pushed the install_paddle_upgrade branch from 493fb59 to a0a19f1 Compare January 25, 2024 12:24

risemeup1 added 2 commits January 25, 2024 12:29

fix

e2101ee

fix

7c50c93

wanghuancoder approved these changes Jan 26, 2024

View reviewed changes

zyfncg approved these changes Jan 26, 2024

View reviewed changes

lanxianghit approved these changes Jan 26, 2024

View reviewed changes

zhangbo9674 approved these changes Jan 26, 2024

View reviewed changes

risemeup1 merged commit fe3897f into PaddlePaddle:develop Jan 26, 2024

xuxinyi389 mentioned this pull request Jan 26, 2024

Revert "Installing paddle does not depend on local cuda and cudnn" #61230

Merged

eee4017 pushed a commit to eee4017/Paddle that referenced this pull request Jan 30, 2024

Installing paddle does not depend on local cuda and cudnn (PaddlePadd…

28c9680

…le#60841) * fix bug * fix bug * fix * fix * fix * fix * fix * fix * fix * fix * fix

Installing paddle does not depend on local cuda and cudnn #60841

Installing paddle does not depend on local cuda and cudnn #60841

Uh oh!

Conversation

risemeup1 commented Jan 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR types

PR changes

Description

Uh oh!

paddle-bot bot commented Jan 16, 2024

Uh oh!

paddle-bot bot commented Jan 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wanghuancoder left a comment

Choose a reason for hiding this comment

Uh oh!

zyfncg left a comment

Choose a reason for hiding this comment

Uh oh!

lanxianghit left a comment

Choose a reason for hiding this comment

Uh oh!

zhangbo9674 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

risemeup1 commented Jan 16, 2024 •

edited

Loading

paddle-bot bot commented Jan 16, 2024 •

edited

Loading