Skip to content

Commit 9afad36

Browse files
committed
updata_patch
1 parent 931b1bc commit 9afad36

1 file changed

Lines changed: 6 additions & 19 deletions

File tree

backends/metax_gpu/patch/paddle.patch

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ index 62beb53cfe..0b0ac09fc0 100644
5050
} \
5151
}; \
5252
diff --git a/paddle/phi/backends/dynload/cublasLt.h b/paddle/phi/backends/dynload/cublasLt.h
53-
index 0527e743e7..247a844f18 100644
53+
index 8b2e08c777..ca926df151 100644
5454
--- a/paddle/phi/backends/dynload/cublasLt.h
5555
+++ b/paddle/phi/backends/dynload/cublasLt.h
5656
@@ -46,12 +46,14 @@ extern void *cublasLt_dso_handle;
@@ -68,7 +68,7 @@ index 0527e743e7..247a844f18 100644
6868
extern DynLoad__##__name __name
6969
-
7070
// APIs available after CUDA 11.1
71-
#if CUDA_VERSION >= 11010
71+
#if CUDA_VERSION >= 11010 || defined(PADDLE_WITH_CUSTOM_DEVICE)
7272
#define CUBLASLT_BLAS_ROUTINE_EACH(__macro) \
7373
@@ -79,8 +81,8 @@ extern void *cublasLt_dso_handle;
7474
__macro(cublasLtMatmulAlgoConfigGetAttribute); \
@@ -440,6 +440,7 @@ index 024a7de73e..66b373d698 100644
440440
} \
441441
} while (0)
442442
#elif defined(__HIPCC__)
443+
443444
diff --git a/paddle/phi/kernels/funcs/blas/blaslt_gemm_search.h b/paddle/phi/kernels/funcs/blas/blaslt_gemm_search.h
444445
index e63b3d2f6e..95d7e6f204 100644
445446
--- a/paddle/phi/kernels/funcs/blas/blaslt_gemm_search.h
@@ -470,7 +471,7 @@ index e63b3d2f6e..95d7e6f204 100644
470471
for (const auto& [seed, algo] : algo_caches_) {
471472
outfile << seed << " ";
472473
diff --git a/paddle/phi/kernels/funcs/cublaslt.h b/paddle/phi/kernels/funcs/cublaslt.h
473-
index e7e1dd2370..583c7d6474 100644
474+
index fbbf57c25a..f690db59e9 100644
474475
--- a/paddle/phi/kernels/funcs/cublaslt.h
475476
+++ b/paddle/phi/kernels/funcs/cublaslt.h
476477
@@ -42,19 +42,11 @@ class CublasLtHelper {
@@ -569,20 +570,6 @@ index e5361b836e..5ad238df08 100644
569570
return val;
570571
}
571572

572-
diff --git a/paddle/phi/kernels/funcs/quant_dequant.h b/paddle/phi/kernels/funcs/quant_dequant.h
573-
index 8f0736f64e..f11c29a6ef 100644
574-
--- a/paddle/phi/kernels/funcs/quant_dequant.h
575-
+++ b/paddle/phi/kernels/funcs/quant_dequant.h
576-
@@ -19,9 +19,7 @@ limitations under the License. */
577-
#include "paddle/phi/backends/gpu/gpu_launch_config.h"
578-
#include "paddle/phi/common/transform.h"
579-
#include "paddle/phi/kernels/funcs/aligned_vector.h"
580-
-#ifndef PADDLE_WITH_CUSTOM_DEVICE
581-
#include "paddle/phi/kernels/funcs/blas/blas.h"
582-
-#endif
583-
namespace phi {
584-
585-
using backends::gpu::GpuLaunchConfig;
586573
diff --git a/paddle/phi/kernels/funcs/top_k_function_cuda.h b/paddle/phi/kernels/funcs/top_k_function_cuda.h
587574
index e30d440ff3..108edda7ca 100644
588575
--- a/paddle/phi/kernels/funcs/top_k_function_cuda.h
@@ -893,7 +880,7 @@ index b2d15a59f8..f64582e85a 100644
893880
namespace phi {
894881
namespace fusion {
895882
diff --git a/paddle/phi/kernels/gpu/depthwise_conv.h b/paddle/phi/kernels/gpu/depthwise_conv.h
896-
index f0cca0f701..02ea957240 100644
883+
index 2edac5eba5..4f265e3db7 100644
897884
--- a/paddle/phi/kernels/gpu/depthwise_conv.h
898885
+++ b/paddle/phi/kernels/gpu/depthwise_conv.h
899886
@@ -29,8 +29,8 @@ namespace cub = hipcub;
@@ -959,7 +946,7 @@ index 63c35dd4ee..15da9aea45 100644
959946
namespace phi {
960947

961948
diff --git a/paddle/phi/kernels/gpu/lstsq_kernel.cu b/paddle/phi/kernels/gpu/lstsq_kernel.cu
962-
index 1bdbe1564c..f753b54bc6 100644
949+
index c7f27b2924..4cf6204ac7 100644
963950
--- a/paddle/phi/kernels/gpu/lstsq_kernel.cu
964951
+++ b/paddle/phi/kernels/gpu/lstsq_kernel.cu
965952
@@ -21,7 +21,7 @@

0 commit comments

Comments
 (0)