Skip to content

P
Paddle

PaddlePaddle / Paddle
大约 1 年 前同步成功

通知 2299
Star 20931
Fork 5422
P
Paddle
未验证 提交 c5173591 编写于 作者: H HongyuJia 提交者： GitHub
浏览文件
操作

change mkldnn interp to normal GetExpectedKernelType (#46685)

上级 b4d7ef9d
隐藏空白更改
内联 并排
Showing with 8 addition and 6 deletion
paddle/fluid/operators/interpolate_op.cc
浏览文件 @ c5173591
...@@ -342,10 +342,11 @@ class InterpolateOp : public framework::OperatorWithKernel { ...@@ -342,10 +342,11 @@ class InterpolateOp : public framework::OperatorWithKernel {
auto data_type = OperatorWithKernel::IndicateVarDataType(ctx, "X"); auto data_type = OperatorWithKernel::IndicateVarDataType(ctx, "X");
#ifdef PADDLE_WITH_MKLDNN #ifdef PADDLE_WITH_MKLDNN
const auto& interp_method = ctx.Attr<std::string>("interp_method");
// TODO(danqing): support other interp_method // TODO(danqing): support other interp_method
if (this->CanMKLDNNBeUsed(ctx, data_type) && // (https://github.com/PaddlePaddle/Paddle/pull/30016/files)
(interp_method == "nearest" || interp_method == "bilinear")) { // NOTE(jiahy0825): currently only support interp_method = nearest or
// interp_method = bilinear
if (this->CanMKLDNNBeUsed(ctx, data_type)) {
return framework::OpKernelType(data_type, return framework::OpKernelType(data_type,
ctx.GetPlace(), ctx.GetPlace(),
framework::DataLayout::kMKLDNN, framework::DataLayout::kMKLDNN,
......
paddle/fluid/operators/interpolate_v2_op.cc
浏览文件 @ c5173591
...@@ -446,10 +446,11 @@ class InterpolateV2Op : public framework::OperatorWithKernel { ...@@ -446,10 +446,11 @@ class InterpolateV2Op : public framework::OperatorWithKernel {
auto data_type = OperatorWithKernel::IndicateVarDataType(ctx, "X"); auto data_type = OperatorWithKernel::IndicateVarDataType(ctx, "X");
#ifdef PADDLE_WITH_MKLDNN #ifdef PADDLE_WITH_MKLDNN
const auto& interp_method = ctx.Attr<std::string>("interp_method");
// TODO(danqing): support other interp_method // TODO(danqing): support other interp_method
if (this->CanMKLDNNBeUsed(ctx, data_type) && // (https://github.com/PaddlePaddle/Paddle/pull/30016/files)
(interp_method == "nearest" || interp_method == "bilinear")) { // NOTE(jiahy0825): currently only support interp_method = nearest or
// interp_method = bilinear
if (this->CanMKLDNNBeUsed(ctx, data_type)) {
return framework::OpKernelType(data_type, return framework::OpKernelType(data_type,
ctx.GetPlace(), ctx.GetPlace(),
framework::DataLayout::kMKLDNN, framework::DataLayout::kMKLDNN,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或