未验证 提交 27aec62b 编写于 作者: Y YuanRisheng 提交者: GitHub

deal with conflict (#49766)

上级 1a9d6be9
......@@ -144,7 +144,6 @@ XPUOpMap& get_kl2_ops() {
{"dropout",
XPUKernelSet({phi::DataType::FLOAT32, phi::DataType::FLOAT16})},
{"einsum", XPUKernelSet({phi::DataType::FLOAT32})},
{"einsum_raw", XPUKernelSet({phi::DataType::FLOAT32})},
{"einsum_grad", XPUKernelSet({phi::DataType::FLOAT32})},
{"elementwise_add_grad",
XPUKernelSet({phi::DataType::FLOAT32, phi::DataType::FLOAT16})},
......
......@@ -19,6 +19,7 @@
#include "paddle/phi/kernels/impl/einsum_impl.h"
PD_REGISTER_KERNEL(einsum_raw, XPU, ALL_LAYOUT, phi::EinsumKernelRaw, float) {}
PD_REGISTER_KERNEL(
einsum_infer, XPU, ALL_LAYOUT, phi::EinsumInferKernel, float) {}
PD_REGISTER_KERNEL(einsum, XPU, ALL_LAYOUT, phi::EinsumKernel, float) {}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册