From aff1a2c02bfb27e9b7e93efe3c250634da664bf9 Mon Sep 17 00:00:00 2001 From: youge325 Date: Fri, 10 Oct 2025 21:27:45 +0800 Subject: [PATCH 1/2] fix file conflict on Windows --- .pre-commit-config.yaml | 2 +- .../kernels/funcs/blas/{cublaslt.h => cublaslt_helper.h} | 0 backends/metax_gpu/kernels/impl/matmul_kernel_impl.h | 2 +- backends/metax_gpu/kernels/impl/matmul_kernel_impl_maca.h | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename backends/metax_gpu/kernels/funcs/blas/{cublaslt.h => cublaslt_helper.h} (100%) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 327f715c9b3..eb701411c32 100755 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -91,7 +91,7 @@ repos: hooks: - id: cmake-format - repo: https://github.com/cmake-lint/cmake-lint - rev: 1.4.2 + rev: 1.4.3 hooks: - id: cmakelint args: [--config=./tools/codestyle/.cmakelintrc] diff --git a/backends/metax_gpu/kernels/funcs/blas/cublaslt.h b/backends/metax_gpu/kernels/funcs/blas/cublaslt_helper.h similarity index 100% rename from backends/metax_gpu/kernels/funcs/blas/cublaslt.h rename to backends/metax_gpu/kernels/funcs/blas/cublaslt_helper.h diff --git a/backends/metax_gpu/kernels/impl/matmul_kernel_impl.h b/backends/metax_gpu/kernels/impl/matmul_kernel_impl.h index 5221bd93ba9..b516533df79 100755 --- a/backends/metax_gpu/kernels/impl/matmul_kernel_impl.h +++ b/backends/metax_gpu/kernels/impl/matmul_kernel_impl.h @@ -31,7 +31,7 @@ limitations under the License. */ #include "paddle/phi/kernels/funcs/complex_functors.h" #include "paddle/phi/kernels/scale_kernel.h" #if defined(PADDLE_WITH_CUDA) -// #include "paddle/phi/kernels/funcs/cublaslt.h" +// #include "paddle/phi/kernels/funcs/cublaslt_helper.h" #include "paddle/phi/kernels/gpu/cuda_gemm_kernel.h" #include "paddle/phi/kernels/transpose_kernel.h" #elif defined(PADDLE_WITH_HIP) diff --git a/backends/metax_gpu/kernels/impl/matmul_kernel_impl_maca.h b/backends/metax_gpu/kernels/impl/matmul_kernel_impl_maca.h index 9750abae5ca..70cfaf5907c 100644 --- a/backends/metax_gpu/kernels/impl/matmul_kernel_impl_maca.h +++ b/backends/metax_gpu/kernels/impl/matmul_kernel_impl_maca.h @@ -31,7 +31,7 @@ limitations under the License. */ #include "paddle/phi/kernels/funcs/complex_functors.h" #include "paddle/phi/kernels/scale_kernel.h" #if defined(PADDLE_WITH_CUDA) -#include "paddle/phi/kernels/funcs/cublaslt.h" +#include "paddle/phi/kernels/funcs/cublaslt_helper.h" #include "paddle/phi/kernels/gpu/cuda_gemm_kernel.h" #include "paddle/phi/kernels/transpose_kernel.h" #elif defined(PADDLE_WITH_HIP) From 05d6111393bf25c53b48bce1fc7157fdf30ed814 Mon Sep 17 00:00:00 2001 From: Runming Xie <146702037+youge325@users.noreply.github.com> Date: Sat, 11 Oct 2025 00:13:17 +0800 Subject: [PATCH 2/2] Downgrade cmake-lint version from 1.4.3 to 1.4.2 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index eb701411c32..327f715c9b3 100755 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -91,7 +91,7 @@ repos: hooks: - id: cmake-format - repo: https://github.com/cmake-lint/cmake-lint - rev: 1.4.3 + rev: 1.4.2 hooks: - id: cmakelint args: [--config=./tools/codestyle/.cmakelintrc]