Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OPTHREE
Paddle
提交
aad0ae2a
P
Paddle
项目概览
OPTHREE
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
aad0ae2a
编写于
3月 22, 2022
作者:
C
Chen Weihang
提交者:
GitHub
3月 22, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add conv2d for infrt (#40776)
上级
0331cfda
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
131 addition
and
14 deletion
+131
-14
paddle/phi/infermeta/binary.cc
paddle/phi/infermeta/binary.cc
+26
-2
paddle/phi/infermeta/binary.h
paddle/phi/infermeta/binary.h
+11
-0
paddle/phi/kernels/conv_kernel.cc
paddle/phi/kernels/conv_kernel.cc
+57
-0
paddle/phi/kernels/conv_kernel.h
paddle/phi/kernels/conv_kernel.h
+12
-0
paddle/phi/ops/compat/conv2d_sig.cc
paddle/phi/ops/compat/conv2d_sig.cc
+25
-12
未找到文件。
paddle/phi/infermeta/binary.cc
浏览文件 @
aad0ae2a
...
@@ -23,8 +23,6 @@ limitations under the License. */
...
@@ -23,8 +23,6 @@ limitations under the License. */
#include "paddle/phi/kernels/cpu/conv_util.h"
#include "paddle/phi/kernels/cpu/conv_util.h"
#include "paddle/phi/kernels/funcs/common_shape.h"
#include "paddle/phi/kernels/funcs/common_shape.h"
#include "paddle/phi/kernels/cpu/conv_util.h"
namespace
phi
{
namespace
phi
{
namespace
detail
{
namespace
detail
{
...
@@ -469,6 +467,31 @@ void ConvInferMeta(const MetaTensor& input,
...
@@ -469,6 +467,31 @@ void ConvInferMeta(const MetaTensor& input,
out
->
set_dtype
(
input
.
dtype
());
out
->
set_dtype
(
input
.
dtype
());
}
}
void
ConvInferInferMeta
(
const
MetaTensor
&
input
,
const
MetaTensor
&
filter
,
const
std
::
vector
<
int
>&
strides
,
const
std
::
vector
<
int
>&
paddings
,
const
std
::
string
&
paddding_algorithm
,
int
groups
,
const
std
::
vector
<
int
>&
dilations
,
const
std
::
string
&
data_format
,
MetaTensor
*
out
,
MetaConfig
config
)
{
ConvInferMeta
(
input
,
filter
,
strides
,
paddings
,
paddding_algorithm
,
groups
,
dilations
,
data_format
,
/*use_addto=*/
false
,
/*workspace_size_MB=*/
512
,
// useless in infermeta
/*exhaustive_search=*/
false
,
out
,
config
);
}
void
ConvTransposeInferMeta
(
const
MetaTensor
&
x
,
void
ConvTransposeInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
filter
,
const
MetaTensor
&
filter
,
const
std
::
vector
<
int
>&
strides
,
const
std
::
vector
<
int
>&
strides
,
...
@@ -1670,3 +1693,4 @@ void ValueCompareInferMeta(const MetaTensor& x,
...
@@ -1670,3 +1693,4 @@ void ValueCompareInferMeta(const MetaTensor& x,
PD_REGISTER_INFER_META_FN
(
add_raw
,
phi
::
ElementwiseRawInferMeta
);
PD_REGISTER_INFER_META_FN
(
add_raw
,
phi
::
ElementwiseRawInferMeta
);
PD_REGISTER_INFER_META_FN
(
conv2d
,
phi
::
ConvInferMeta
);
PD_REGISTER_INFER_META_FN
(
conv2d
,
phi
::
ConvInferMeta
);
PD_REGISTER_INFER_META_FN
(
conv2d_infer
,
phi
::
ConvInferInferMeta
);
paddle/phi/infermeta/binary.h
浏览文件 @
aad0ae2a
...
@@ -83,6 +83,17 @@ void ConvInferMeta(const MetaTensor& input,
...
@@ -83,6 +83,17 @@ void ConvInferMeta(const MetaTensor& input,
MetaTensor
*
out
,
MetaTensor
*
out
,
MetaConfig
config
=
MetaConfig
());
MetaConfig
config
=
MetaConfig
());
void
ConvInferInferMeta
(
const
MetaTensor
&
input
,
const
MetaTensor
&
filter
,
const
std
::
vector
<
int
>&
strides
,
const
std
::
vector
<
int
>&
paddings
,
const
std
::
string
&
paddding_algorithm
,
int
groups
,
const
std
::
vector
<
int
>&
dilations
,
const
std
::
string
&
data_format
,
MetaTensor
*
out
,
MetaConfig
config
=
MetaConfig
());
void
ConvTransposeInferMeta
(
const
MetaTensor
&
x
,
void
ConvTransposeInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
filter
,
const
MetaTensor
&
filter
,
const
std
::
vector
<
int
>&
strides
,
const
std
::
vector
<
int
>&
strides
,
...
...
paddle/phi/kernels/conv_kernel.cc
0 → 100644
浏览文件 @
aad0ae2a
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "paddle/phi/kernels/conv_kernel.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/fluid/platform/cudnn_workspace_helper.h"
namespace
phi
{
template
<
typename
T
,
typename
Context
>
void
ConvInferKernel
(
const
Context
&
dev_ctx
,
const
DenseTensor
&
input
,
const
DenseTensor
&
filter
,
const
std
::
vector
<
int
>&
strides
,
const
std
::
vector
<
int
>&
paddings
,
const
std
::
string
&
paddding_algorithm
,
int
groups
,
const
std
::
vector
<
int
>&
dilations
,
const
std
::
string
&
data_format
,
DenseTensor
*
out
)
{
ConvKernel
<
T
,
Context
>
(
dev_ctx
,
input
,
filter
,
strides
,
paddings
,
paddding_algorithm
,
groups
,
dilations
,
data_format
,
/*use_addto=*/
false
,
/*workspace_size_MB=*/
paddle
::
platform
::
GetDefaultConvWorkspaceSizeLimitMB
(),
/*exhaustive_search=*/
false
,
out
);
}
}
// namespace phi
PD_REGISTER_KERNEL
(
conv2d_infer
,
CPU
,
ALL_LAYOUT
,
phi
::
ConvInferKernel
,
float
,
double
)
{}
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
PD_REGISTER_KERNEL
(
conv2d_infer
,
GPU
,
ALL_LAYOUT
,
phi
::
ConvInferKernel
,
float
,
double
)
{}
#endif
paddle/phi/kernels/conv_kernel.h
浏览文件 @
aad0ae2a
...
@@ -64,4 +64,16 @@ void DepthwiseConvKernel(const Context& dev_ctx,
...
@@ -64,4 +64,16 @@ void DepthwiseConvKernel(const Context& dev_ctx,
bool
fuse_relu
,
bool
fuse_relu
,
DenseTensor
*
out
);
DenseTensor
*
out
);
template
<
typename
T
,
typename
Context
>
void
ConvInferKernel
(
const
Context
&
dev_ctx
,
const
DenseTensor
&
input
,
const
DenseTensor
&
filter
,
const
std
::
vector
<
int
>&
strides
,
const
std
::
vector
<
int
>&
paddings
,
const
std
::
string
&
paddding_algorithm
,
int
groups
,
const
std
::
vector
<
int
>&
dilations
,
const
std
::
string
&
data_format
,
DenseTensor
*
out
);
}
// namespace phi
}
// namespace phi
paddle/phi/ops/compat/conv2d_sig.cc
浏览文件 @
aad0ae2a
...
@@ -17,6 +17,18 @@
...
@@ -17,6 +17,18 @@
namespace
phi
{
namespace
phi
{
KernelSignature
Conv2dOpArgumentMapping
(
const
ArgumentMappingContext
&
ctx
)
{
KernelSignature
Conv2dOpArgumentMapping
(
const
ArgumentMappingContext
&
ctx
)
{
if
(
!
ctx
.
HasAttr
(
"use_addto"
)
||
!
ctx
.
HasAttr
(
"workspace_size_MB"
)
||
!
ctx
.
HasAttr
(
"exhaustive_search"
))
{
return
KernelSignature
(
"conv2d_infer"
,
{
"Input"
,
"Filter"
},
{
"strides"
,
"paddings"
,
"padding_algorithm"
,
"groups"
,
"dilations"
,
"data_format"
},
{
"Output"
});
}
else
{
return
KernelSignature
(
"conv2d"
,
return
KernelSignature
(
"conv2d"
,
{
"Input"
,
"Filter"
},
{
"Input"
,
"Filter"
},
{
"strides"
,
{
"strides"
,
...
@@ -29,6 +41,7 @@ KernelSignature Conv2dOpArgumentMapping(const ArgumentMappingContext& ctx) {
...
@@ -29,6 +41,7 @@ KernelSignature Conv2dOpArgumentMapping(const ArgumentMappingContext& ctx) {
"workspace_size_MB"
,
"workspace_size_MB"
,
"exhaustive_search"
},
"exhaustive_search"
},
{
"Output"
});
{
"Output"
});
}
}
}
KernelSignature
Conv2dGradOpArgumentMapping
(
const
ArgumentMappingContext
&
ctx
)
{
KernelSignature
Conv2dGradOpArgumentMapping
(
const
ArgumentMappingContext
&
ctx
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录