Fix conflict of CppTypeToDataType (#51919)

paddle/fluid/operators/fused/attn_gemm.h

@@ -68,12 +68,12 @@ 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()),
+      auto fused_impl =
+          phi::funcs::MatmulPlanner(vectorize(input->dims()),
                                     vectorize(weight->dims()),
                                     transA_,
                                     transB_,
-          paddle::experimental::CppTypeToDataType<T>::Type(),
+                                    phi::CppTypeToDataType<T>::Type(),
                                     phi::funcs::MatmulFusedType::kMatmulBias,
                                     static_cast<const void*>(bias->data<T>()),
                                     nullptr);

paddle/fluid/operators/fused/fused_gemm_epilogue_op.cu

@@ -96,12 +96,12 @@ 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()),
+    auto fused_impl =
+        phi::funcs::MatmulPlanner(vectorize(x->dims()),
                                   vectorize(y->dims()),
                                   trans_x,
                                   trans_y,
-        paddle::experimental::CppTypeToDataType<T>::Type(),
+                                  phi::CppTypeToDataType<T>::Type(),
                                   fused_type,
                                   static_cast<const void*>(bias->data<T>()),
                                   reserve_data);