@@ -48,7 +48,7 @@ index bff0f2bf70..9376b5781f 100644
4848 #include "paddle/phi/core/platform/device/gpu/gpu_info.h"
4949 #include "paddle/phi/core/platform/profiler/utils.h"
5050diff --git a/paddle/phi/backends/dynload/cublas.h b/paddle/phi/backends/dynload/cublas.h
51- index 62beb53cfe..0b0ac09fc0 100644
51+ index bda9cbe17e..c73eba9c8a 100644
5252--- a/paddle/phi/backends/dynload/cublas.h
5353+++ b/paddle/phi/backends/dynload/cublas.h
5454@@ -49,7 +49,12 @@ extern void *cublas_dso_handle;
@@ -98,107 +98,21 @@ index 8b2e08c777..ca926df151 100644
9898 #define CUBLASLT_BLAS_ROUTINE_EACH(__macro) \
9999 __macro(cublasLtCreate); \
100100diff --git a/paddle/phi/backends/dynload/cudnn.h b/paddle/phi/backends/dynload/cudnn.h
101- index c0080f0a5e..458ca3e2e8 100644
101+ index a943bbed9a..af931490e3 100644
102102--- a/paddle/phi/backends/dynload/cudnn.h
103103+++ b/paddle/phi/backends/dynload/cudnn.h
104- @@ -38,7 +38,9 @@ extern void EnforceCUDNNLoaded(const char* fn_name);
104+ @@ -38,7 +38,10 @@ extern void EnforceCUDNNLoaded(const char* fn_name);
105105 cudnn_dso_handle = phi::dynload::GetCUDNNDsoHandle(); \
106106 }); \
107107 EnforceCUDNNLoaded(#__name); \
108108- static void* p_##__name = dlsym(cudnn_dso_handle, #__name); \
109109+ std::string replaced_name = #__name; \
110- + replaced_name = replaced_name.replace(0,2,"mc"); \
111- + static void* p_##__name = dlsym(cudnn_dso_handle, replaced_name.c_str()); \
110+ + replaced_name = replaced_name.replace(0, 2, "mc"); \
111+ + static void* p_##__name = \
112+ + dlsym(cudnn_dso_handle, replaced_name.c_str()); \
112113 return reinterpret_cast<cudnn_func>(p_##__name)(args...); \
113114 } \
114115 }; \
115- @@ -49,7 +51,6 @@ extern void EnforceCUDNNLoaded(const char* fn_name);
116- * different cudnn version has different interfaces
117- **/
118- #define CUDNN_DNN_ROUTINE_EACH(__macro) \
119- - __macro(cudnnSetCallback); \
120- __macro(cudnnSetTensor4dDescriptor); \
121- __macro(cudnnSetTensor4dDescriptorEx); \
122- __macro(cudnnSetTensorNdDescriptor); \
123- @@ -104,6 +105,13 @@ extern void EnforceCUDNNLoaded(const char* fn_name);
124- __macro(cudnnSetDropoutDescriptor); \
125- __macro(cudnnRestoreDropoutDescriptor); \
126- __macro(cudnnCreateRNNDescriptor); \
127- + __macro(cudnnGetRNNParamsSize); \
128- + __macro(cudnnGetRNNWorkspaceSize); \
129- + __macro(cudnnGetRNNTrainingReserveSize); \
130- + __macro(cudnnRNNForwardTraining); \
131- + __macro(cudnnRNNBackwardData); \
132- + __macro(cudnnRNNBackwardWeights); \
133- + __macro(cudnnRNNForwardInference); \
134- __macro(cudnnDestroyDropoutDescriptor); \
135- __macro(cudnnDestroyRNNDescriptor); \
136- __macro(cudnnSetTensorNdDescriptorEx); \
137- @@ -118,7 +126,8 @@ extern void EnforceCUDNNLoaded(const char* fn_name);
138- __macro(cudnnCreateActivationDescriptor); \
139- __macro(cudnnSetActivationDescriptor); \
140- __macro(cudnnGetActivationDescriptor); \
141- - __macro(cudnnDestroyActivationDescriptor);
142- + __macro(cudnnDestroyActivationDescriptor); \
143- + __macro(cudnnSetRNNDescriptor_v6);
144- CUDNN_DNN_ROUTINE_EACH(DECLARE_DYNAMIC_LOAD_CUDNN_WRAP)
145-
146- #if CUDNN_VERSION >= 7000 && CUDNN_VERSION < 8000
147- @@ -152,7 +161,12 @@ CUDNN_DNN_ROUTINE_EACH_R7(DECLARE_DYNAMIC_LOAD_CUDNN_WRAP)
148- #define CUDNN_DNN_ROUTINE_EACH_AFTER_TWO_R7(__macro) \
149- __macro(cudnnCreateRNNDataDescriptor); \
150- __macro(cudnnDestroyRNNDataDescriptor); \
151- - __macro(cudnnSetRNNDataDescriptor);
152- + __macro(cudnnSetRNNDataDescriptor); \
153- + __macro(cudnnSetRNNPaddingMode); \
154- + __macro(cudnnRNNForwardTrainingEx); \
155- + __macro(cudnnRNNBackwardDataEx); \
156- + __macro(cudnnRNNBackwardWeightsEx); \
157- + __macro(cudnnRNNForwardInferenceEx);
158- CUDNN_DNN_ROUTINE_EACH_AFTER_TWO_R7(DECLARE_DYNAMIC_LOAD_CUDNN_WRAP)
159- #endif
160-
161- @@ -195,40 +209,6 @@ CUDNN_DNN_ROUTINE_EACH_R8(DECLARE_DYNAMIC_LOAD_CUDNN_WRAP)
162- CUDNN_DNN_ROUTINE_EACH_FRONTEND(DECLARE_DYNAMIC_LOAD_CUDNN_WRAP)
163- #endif
164-
165- - #if CUDNN_VERSION < 90000
166- - #define CUDNN_DNN_ROUTINE_EACH_REMOVED_IN_E9(__macro) \
167- - __macro(cudnnGetRNNParamsSize); \
168- - __macro(cudnnGetRNNWorkspaceSize); \
169- - __macro(cudnnGetRNNTrainingReserveSize); \
170- - __macro(cudnnSetRNNDescriptor_v6); \
171- - __macro(cudnnRNNForwardInference); \
172- - __macro(cudnnRNNForwardTraining); \
173- - __macro(cudnnRNNBackwardData); \
174- - __macro(cudnnRNNBackwardWeights);
175- - CUDNN_DNN_ROUTINE_EACH_REMOVED_IN_E9(DECLARE_DYNAMIC_LOAD_CUDNN_WRAP)
176- - #endif
177- -
178- - #if CUDNN_VERSION < 90000 && CUDNN_VERSION >= 7201
179- - #define CUDNN_DNN_ROUTINE_EACH_AFTER_TWO_R7_REMOVED_IN_E9(__macro) \
180- - __macro(cudnnSetRNNPaddingMode); \
181- - __macro(cudnnRNNForwardInferenceEx); \
182- - __macro(cudnnRNNForwardTrainingEx); \
183- - __macro(cudnnRNNBackwardDataEx); \
184- - __macro(cudnnRNNBackwardWeightsEx);
185- - CUDNN_DNN_ROUTINE_EACH_AFTER_TWO_R7_REMOVED_IN_E9(
186- - DECLARE_DYNAMIC_LOAD_CUDNN_WRAP)
187- - #endif
188- -
189- - #if CUDNN_VERSION >= 90000
190- - #define CUDNN_DNN_ROUTINE_EACH_R9(__macro) \
191- - __macro(cudnnGetLastErrorString); \
192- - __macro(cudnnGetRNNWeightSpaceSize); \
193- - __macro(cudnnGetRNNTempSpaceSizes); \
194- - __macro(cudnnRNNForward); \
195- - __macro(cudnnRNNBackwardData_v8); \
196- - __macro(cudnnRNNBackwardWeights_v8);
197- - CUDNN_DNN_ROUTINE_EACH_R9(DECLARE_DYNAMIC_LOAD_CUDNN_WRAP)
198- - #endif
199- } // namespace dynload
200- } // namespace phi
201-
202116diff --git a/paddle/phi/backends/dynload/cufft.h b/paddle/phi/backends/dynload/cufft.h
203117index 1547909d92..ef20838434 100644
204118--- a/paddle/phi/backends/dynload/cufft.h
@@ -247,7 +161,7 @@ index 59e92955c9..d2f8c2da15 100644
247161+ #endif // PADDLE_WITH_CUPTI
248162\ No newline at end of file
249163diff --git a/paddle/phi/backends/dynload/cusolver.h b/paddle/phi/backends/dynload/cusolver.h
250- index 86651fc8f1..7c9b122a17 100644
164+ index 57e09bb6e4..87fb5b1797 100644
251165--- a/paddle/phi/backends/dynload/cusolver.h
252166+++ b/paddle/phi/backends/dynload/cusolver.h
253167@@ -34,7 +34,9 @@ extern void *cusolver_dso_handle;
@@ -262,7 +176,7 @@ index 86651fc8f1..7c9b122a17 100644
262176 } \
263177 }; \
264178diff --git a/paddle/phi/backends/dynload/cusparse.h b/paddle/phi/backends/dynload/cusparse.h
265- index 8ec3cf2792..6f5460df00 100644
179+ index e8cb0ac643..e8e7596d44 100644
266180--- a/paddle/phi/backends/dynload/cusparse.h
267181+++ b/paddle/phi/backends/dynload/cusparse.h
268182@@ -34,7 +34,9 @@ extern void *cusparse_dso_handle;
@@ -277,7 +191,7 @@ index 8ec3cf2792..6f5460df00 100644
277191 } \
278192 }; \
279193diff --git a/paddle/phi/backends/dynload/dynamic_loader.cc b/paddle/phi/backends/dynload/dynamic_loader.cc
280- index 859f696896..87b5100a1b 100644
194+ index c74ae9592e..f6dc68917c 100644
281195--- a/paddle/phi/backends/dynload/dynamic_loader.cc
282196+++ b/paddle/phi/backends/dynload/dynamic_loader.cc
283197@@ -18,7 +18,6 @@ limitations under the License. */
@@ -755,7 +669,7 @@ index 4eae698648..5c047723ea 100644
755669 return block_dim >= kMaxBlockDim ? kMaxBlockDim : lwarpSize;
756670 }
757671diff --git a/paddle/phi/kernels/funcs/math_cuda_utils.h b/paddle/phi/kernels/funcs/math_cuda_utils.h
758- index e5361b836e..5ad238df08 100644
672+ index dff1033db4..0098123818 100644
759673--- a/paddle/phi/kernels/funcs/math_cuda_utils.h
760674+++ b/paddle/phi/kernels/funcs/math_cuda_utils.h
761675@@ -175,12 +175,12 @@ struct KeyValuePair<half> {
0 commit comments