Fix conflict of CppTypeToDataType (#51919)

paddle/fluid/operators/fused/attn_gemm.h

@@ -68,15 +68,15 @@ class AttnMatMul {
               "The output (= input * weight) is expected to be nullptr or the "
               "same as bias_out when fused is true."));
 
-      auto fused_impl = phi::funcs::MatmulPlanner(
-          vectorize(input->dims()),
-          vectorize(weight->dims()),
-          transA_,
-          transB_,
-          paddle::experimental::CppTypeToDataType<T>::Type(),
-          phi::funcs::MatmulFusedType::kMatmulBias,
-          static_cast<const void*>(bias->data<T>()),
-          nullptr);
+      auto fused_impl =
+          phi::funcs::MatmulPlanner(vectorize(input->dims()),
+                                    vectorize(weight->dims()),
+                                    transA_,
+                                    transB_,
+                                    phi::CppTypeToDataType<T>::Type(),
+                                    phi::funcs::MatmulFusedType::kMatmulBias,
+                                    static_cast<const void*>(bias->data<T>()),
+                                    nullptr);
       phi::funcs::MatmulWithCublasLt<T>::Run(dev_ctx_,
                                              input->data<T>(),
                                              weight->data<T>(),

paddle/fluid/operators/fused/fused_gemm_epilogue_op.cu

@@ -96,15 +96,15 @@ class FusedGemmEpilogueKernel : public framework::OpKernel<T> {
             << ", activation=" << activation << ", fused_type=" << fused_type
             << ", reserve_space=" << reserve_space;
 
-    auto fused_impl = phi::funcs::MatmulPlanner(
-        vectorize(x->dims()),
-        vectorize(y->dims()),
-        trans_x,
-        trans_y,
-        paddle::experimental::CppTypeToDataType<T>::Type(),
-        fused_type,
-        static_cast<const void*>(bias->data<T>()),
-        reserve_data);
+    auto fused_impl =
+        phi::funcs::MatmulPlanner(vectorize(x->dims()),
+                                  vectorize(y->dims()),
+                                  trans_x,
+                                  trans_y,
+                                  phi::CppTypeToDataType<T>::Type(),
+                                  fused_type,
+                                  static_cast<const void*>(bias->data<T>()),
+                                  reserve_data);
 
     phi::funcs::MatmulWithCublasLt<T>::Run(dev_ctx,
                                            x->data<T>(),