Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
5d08a447
P
Paddle
项目概览
机器未来
/
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看板
未验证
提交
5d08a447
编写于
3月 15, 2022
作者:
C
Chen Weihang
提交者:
GitHub
3月 14, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move allclose infershape (#40508)
上级
e157f2af
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
61 addition
and
35 deletion
+61
-35
paddle/fluid/operators/allclose_op.cc
paddle/fluid/operators/allclose_op.cc
+6
-35
paddle/phi/infermeta/binary.cc
paddle/phi/infermeta/binary.cc
+50
-0
paddle/phi/infermeta/binary.h
paddle/phi/infermeta/binary.h
+5
-0
未找到文件。
paddle/fluid/operators/allclose_op.cc
浏览文件 @
5d08a447
...
@@ -15,10 +15,13 @@
...
@@ -15,10 +15,13 @@
#include <cmath>
#include <cmath>
#include <string>
#include <string>
#include "paddle/fluid/framework/infershape_utils.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/framework/op_version_registry.h"
#include "paddle/fluid/framework/op_version_registry.h"
#include "paddle/fluid/framework/operator.h"
#include "paddle/fluid/framework/operator.h"
#include "paddle/fluid/platform/enforce.h"
#include "paddle/fluid/platform/enforce.h"
#include "paddle/phi/core/infermeta_utils.h"
#include "paddle/phi/infermeta/binary.h"
namespace
paddle
{
namespace
paddle
{
namespace
operators
{
namespace
operators
{
...
@@ -61,40 +64,6 @@ class AllcloseOp : public framework::OperatorWithKernel {
...
@@ -61,40 +64,6 @@ class AllcloseOp : public framework::OperatorWithKernel {
public:
public:
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"Input"
),
"Input"
,
"Input"
,
"Allclose"
);
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"Other"
),
"Input"
,
"Other"
,
"Allclose"
);
OP_INOUT_CHECK
(
ctx
->
HasOutput
(
"Out"
),
"Output"
,
"Out"
,
"Allclose"
);
auto
input_dim
=
ctx
->
GetInputDim
(
"Input"
);
auto
other_dim
=
ctx
->
GetInputDim
(
"Other"
);
PADDLE_ENFORCE_EQ
(
input_dim
.
size
(),
other_dim
.
size
(),
platform
::
errors
::
PreconditionNotMet
(
"Input(Input) and Input(Other) must have the same "
"dimension size."
));
int
n
=
input_dim
.
size
();
bool
is_runtime
=
ctx
->
IsRuntime
();
for
(
int
i
=
0
;
i
<
n
;
i
++
)
{
if
(
is_runtime
)
{
PADDLE_ENFORCE_EQ
(
input_dim
[
i
],
other_dim
[
i
],
platform
::
errors
::
PreconditionNotMet
(
"The value at dim %d of Input(Input) is not "
"equal to the Input(Other): %ld != %ld."
,
i
,
input_dim
[
i
],
other_dim
[
i
]));
}
else
{
if
(
!
(
input_dim
[
i
]
<
0
||
other_dim
[
i
]
<
0
))
{
PADDLE_ENFORCE_EQ
(
input_dim
[
i
],
other_dim
[
i
],
platform
::
errors
::
PreconditionNotMet
(
"The value at dim %d of Input(Input) is not "
"equal to the Input(Other): %ld != %ld."
,
i
,
input_dim
[
i
],
other_dim
[
i
]));
}
}
}
ctx
->
SetOutputDim
(
"Out"
,
phi
::
make_ddim
({
1
}));
}
protected:
protected:
framework
::
OpKernelType
GetExpectedKernelType
(
framework
::
OpKernelType
GetExpectedKernelType
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
...
@@ -117,11 +86,13 @@ class AllcloseOpVarTypeInference : public framework::VarTypeInference {
...
@@ -117,11 +86,13 @@ class AllcloseOpVarTypeInference : public framework::VarTypeInference {
namespace
ops
=
paddle
::
operators
;
namespace
ops
=
paddle
::
operators
;
using
CPU
=
paddle
::
platform
::
CPUDeviceContext
;
using
CPU
=
paddle
::
platform
::
CPUDeviceContext
;
DECLARE_INFER_SHAPE_FUNCTOR
(
allclose
,
AllcloseInferShapeFunctor
,
PD_INFER_META
(
phi
::
AllValueCompareInferMeta
));
REGISTER_OPERATOR
(
REGISTER_OPERATOR
(
allclose
,
ops
::
AllcloseOp
,
ops
::
AllcloseOpMaker
,
allclose
,
ops
::
AllcloseOp
,
ops
::
AllcloseOpMaker
,
paddle
::
framework
::
EmptyGradOpMaker
<
paddle
::
framework
::
OpDesc
>
,
paddle
::
framework
::
EmptyGradOpMaker
<
paddle
::
framework
::
OpDesc
>
,
paddle
::
framework
::
EmptyGradOpMaker
<
paddle
::
imperative
::
OpBase
>
,
paddle
::
framework
::
EmptyGradOpMaker
<
paddle
::
imperative
::
OpBase
>
,
ops
::
AllcloseOpVarTypeInference
);
ops
::
AllcloseOpVarTypeInference
,
AllcloseInferShapeFunctor
);
/* ========================== register checkpoint ===========================*/
/* ========================== register checkpoint ===========================*/
REGISTER_OP_VERSION
(
allclose
)
REGISTER_OP_VERSION
(
allclose
)
...
...
paddle/phi/infermeta/binary.cc
浏览文件 @
5d08a447
...
@@ -21,6 +21,56 @@ limitations under the License. */
...
@@ -21,6 +21,56 @@ limitations under the License. */
#include "paddle/phi/kernels/funcs/common_shape.h"
#include "paddle/phi/kernels/funcs/common_shape.h"
namespace
phi
{
namespace
phi
{
namespace
detail
{
static
void
BinarySameInputDimsCheck
(
const
MetaTensor
&
x
,
const
MetaTensor
&
y
,
MetaConfig
config
)
{
auto
input_dim
=
x
.
dims
();
auto
other_dim
=
y
.
dims
();
PADDLE_ENFORCE_EQ
(
input_dim
.
size
(),
other_dim
.
size
(),
phi
::
errors
::
PreconditionNotMet
(
"Input(Input) and Input(Other) must have the same "
"dimension size."
));
int
n
=
input_dim
.
size
();
bool
is_runtime
=
config
.
is_runtime
;
for
(
int
i
=
0
;
i
<
n
;
i
++
)
{
if
(
is_runtime
)
{
PADDLE_ENFORCE_EQ
(
input_dim
[
i
],
other_dim
[
i
],
phi
::
errors
::
PreconditionNotMet
(
"The value at dim %d of Input(Input) is not "
"equal to the Input(Other): %ld != %ld."
,
i
,
input_dim
[
i
],
other_dim
[
i
]));
}
else
{
if
(
!
(
input_dim
[
i
]
<
0
||
other_dim
[
i
]
<
0
))
{
PADDLE_ENFORCE_EQ
(
input_dim
[
i
],
other_dim
[
i
],
phi
::
errors
::
PreconditionNotMet
(
"The value at dim %d of Input(Input) is not "
"equal to the Input(Other): %ld != %ld."
,
i
,
input_dim
[
i
],
other_dim
[
i
]));
}
}
}
}
}
// namespace detail
void
AllValueCompareInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
y
,
MetaTensor
*
out
,
MetaConfig
config
)
{
detail
::
BinarySameInputDimsCheck
(
x
,
y
,
config
);
out
->
set_dims
(
phi
::
make_ddim
({
1
}));
out
->
set_dtype
(
DataType
::
BOOL
);
}
void
Atan2InferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
y
,
MetaTensor
*
out
)
{
void
Atan2InferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
y
,
MetaTensor
*
out
)
{
out
->
share_meta
(
x
);
out
->
share_meta
(
x
);
...
...
paddle/phi/infermeta/binary.h
浏览文件 @
5d08a447
...
@@ -29,6 +29,11 @@ namespace phi {
...
@@ -29,6 +29,11 @@ namespace phi {
// Because functions in this file not only can infer shape, but also need
// Because functions in this file not only can infer shape, but also need
// infer lod or other useful data.
// infer lod or other useful data.
void
AllValueCompareInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
y
,
MetaTensor
*
out
,
MetaConfig
config
=
MetaConfig
());
void
Atan2InferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
y
,
MetaTensor
*
out
);
void
Atan2InferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
y
,
MetaTensor
*
out
);
void
BCELossInferMeta
(
const
MetaTensor
&
input
,
void
BCELossInferMeta
(
const
MetaTensor
&
input
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录