Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
a2aa0087
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
a2aa0087
编写于
4月 17, 2023
作者:
S
Sanbu
提交者:
GitHub
4月 17, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support static graph code-gen for matrix_rank (#52659)
上级
b0911ecb
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
44 addition
and
124 deletion
+44
-124
paddle/fluid/operators/matrix_rank_op.cc
paddle/fluid/operators/matrix_rank_op.cc
+0
-123
paddle/phi/api/yaml/op_compat.yaml
paddle/phi/api/yaml/op_compat.yaml
+7
-0
paddle/phi/api/yaml/static_ops.yaml
paddle/phi/api/yaml/static_ops.yaml
+12
-0
paddle/phi/infermeta/binary.cc
paddle/phi/infermeta/binary.cc
+13
-1
paddle/phi/infermeta/binary.h
paddle/phi/infermeta/binary.h
+6
-0
paddle/phi/ops/compat/matrix_rank_sig.cc
paddle/phi/ops/compat/matrix_rank_sig.cc
+6
-0
未找到文件。
paddle/fluid/operators/matrix_rank_op.cc
已删除
100644 → 0
浏览文件 @
b0911ecb
// Copyright (c) 2021 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 <memory>
#include <string>
#include "paddle/fluid/operators/elementwise/elementwise_op_function.h"
#include "paddle/fluid/operators/svd_helper.h"
#include "paddle/phi/kernels/funcs/compare_functors.h"
namespace
paddle
{
namespace
operators
{
using
DDim
=
framework
::
DDim
;
namespace
detail
{
static
DDim
CheckAndGetOutputDim
(
const
DDim
&
dim_x
)
{
auto
x_vec
=
phi
::
vectorize
(
dim_x
);
if
(
x_vec
.
size
()
==
2
)
{
return
phi
::
make_ddim
({
1
});
}
x_vec
.
erase
(
x_vec
.
end
()
-
2
,
x_vec
.
end
());
return
phi
::
make_ddim
(
x_vec
);
}
}
// namespace detail
class
MatrixRankOp
:
public
framework
::
OperatorWithKernel
{
public:
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
OP_INOUT_CHECK
(
ctx
->
HasInput
(
"X"
),
"Input"
,
"X"
,
"MatrixRank"
);
OP_INOUT_CHECK
(
ctx
->
HasOutput
(
"Out"
),
"Output"
,
"Out"
,
"MatrixRank"
);
auto
dim_x
=
ctx
->
GetInputDim
(
"X"
);
PADDLE_ENFORCE_GE
(
dim_x
.
size
(),
2
,
platform
::
errors
::
InvalidArgument
(
"The dims of input must be greater than 2"
));
bool
hermitian
=
ctx
->
Attrs
().
Get
<
bool
>
(
"hermitian"
);
if
(
hermitian
)
{
int
rows
=
dim_x
[
dim_x
.
size
()
-
2
];
int
cols
=
dim_x
[
dim_x
.
size
()
-
1
];
PADDLE_ENFORCE_EQ
(
rows
,
cols
,
platform
::
errors
::
InvalidArgument
(
"if hermitian == true, matrix should be n*n"
));
}
DDim
dim_x_batch
=
detail
::
CheckAndGetOutputDim
(
dim_x
);
if
(
ctx
->
HasInput
(
"TolTensor"
))
{
auto
dim_tol
=
ctx
->
GetInputDim
(
"TolTensor"
);
if
(
dim_x_batch
==
dim_tol
)
{
ctx
->
SetOutputDim
(
"Out"
,
dim_x_batch
);
}
else
{
int
max_dim
=
std
::
max
(
dim_x_batch
.
size
(),
dim_tol
.
size
());
int
axis
=
std
::
abs
(
dim_x_batch
.
size
()
-
dim_tol
.
size
());
std
::
vector
<
int
>
x_batch_dims_array
(
max_dim
);
std
::
vector
<
int
>
tol_dims_array
(
max_dim
);
std
::
vector
<
int
>
out_dims_array
(
max_dim
);
phi
::
funcs
::
GetBroadcastDimsArrays
(
dim_x_batch
,
dim_tol
,
x_batch_dims_array
.
data
(),
tol_dims_array
.
data
(),
out_dims_array
.
data
(),
max_dim
,
axis
);
ctx
->
SetOutputDim
(
"Out"
,
phi
::
make_ddim
(
out_dims_array
));
}
}
else
{
ctx
->
SetOutputDim
(
"Out"
,
dim_x_batch
);
}
ctx
->
ShareLoD
(
"X"
,
/*->*/
"Out"
);
}
protected:
phi
::
KernelKey
GetExpectedKernelType
(
const
framework
::
ExecutionContext
&
ctx
)
const
override
{
auto
data_type
=
OperatorWithKernel
::
IndicateVarDataType
(
ctx
,
"X"
);
return
phi
::
KernelKey
(
data_type
,
ctx
.
GetPlace
());
}
};
class
MatrixRankOpMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
public:
void
Make
()
override
{
AddInput
(
"X"
,
"(Tensor), The input tensor of matrix_rank op."
);
AddInput
(
"TolTensor"
,
"(optional) Tol tensor, shape is same as X batch or can broadcast "
"with X batch."
)
.
AsDispensable
();
AddOutput
(
"Out"
,
"(Tensor), The output tensor of matrix_rank op."
);
AddAttr
<
float
>
(
"tol"
,
"(float, optional). tol"
).
SetDefault
(
0.0
f
);
AddAttr
<
bool
>
(
"use_default_tol"
,
"represent whether user input TolTensor/tol, if input "
"TolTensor/tol use_default_tol=true, otherwise "
"use_default_tol=false"
)
.
SetDefault
(
true
);
AddAttr
<
bool
>
(
"hermitian"
,
"(bool, optional). whether is hermitian matrix"
)
.
SetDefault
(
false
);
AddComment
(
R"DOC(MatrixRank Operator.
This operator is used to perform MatrixRank operation for batched matrics.
$$out = matrix_rank(X, tol, hermitian)$$
)DOC"
);
}
};
}
// namespace operators
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
REGISTER_OPERATOR
(
matrix_rank
,
ops
::
MatrixRankOp
,
ops
::
MatrixRankOpMaker
);
paddle/phi/api/yaml/op_compat.yaml
浏览文件 @
a2aa0087
...
@@ -1391,6 +1391,13 @@
...
@@ -1391,6 +1391,13 @@
outputs
:
outputs
:
out
:
Out
out
:
Out
-
op
:
matrix_rank
inputs
:
{
x
:
X
,
tol_tensor
:
TolTensor
}
outputs
:
out
:
Out
manual_signature
:
[
matrix_rank
]
-
op
:
max (reduce_max)
-
op
:
max (reduce_max)
backward
:
max_grad (reduce_max_grad)
backward
:
max_grad (reduce_max_grad)
inputs
:
inputs
:
...
...
paddle/phi/api/yaml/static_ops.yaml
浏览文件 @
a2aa0087
...
@@ -217,6 +217,18 @@
...
@@ -217,6 +217,18 @@
data_transform
:
data_transform
:
skip_transform
:
start, stop, number
skip_transform
:
start, stop, number
-
op
:
matrix_rank
args
:
(Tensor x, Tensor tol_tensor, float tol=0.0f, bool hermitian=false, bool use_default_tol=true)
output
:
Tensor(out)
infer_meta
:
func
:
MatrixRankStaticInferMeta
param
:
[
x
,
tol_tensor
,
hermitian
,
use_default_tol
]
optional
:
tol_tensor
kernel
:
func
:
matrix_rank {dense -> dense},
matrix_rank_tol {dense, dense -> dense}
data_type
:
x
-
op
:
not_equal
-
op
:
not_equal
args
:
(Tensor x, Tensor y, int axis = -1, bool force_cpu=false)
args
:
(Tensor x, Tensor y, int axis = -1, bool force_cpu=false)
output
:
Tensor(out)
output
:
Tensor(out)
...
...
paddle/phi/infermeta/binary.cc
浏览文件 @
a2aa0087
...
@@ -18,12 +18,12 @@ limitations under the License. */
...
@@ -18,12 +18,12 @@ limitations under the License. */
#include <vector>
#include <vector>
#include "glog/logging.h"
#include "glog/logging.h"
#include "paddle/phi/common/data_type.h"
#include "paddle/phi/common/data_type.h"
#include "paddle/phi/common/layout.h"
#include "paddle/phi/common/layout.h"
#include "paddle/phi/common/type_traits.h"
#include "paddle/phi/common/type_traits.h"
#include "paddle/phi/core/ddim.h"
#include "paddle/phi/core/ddim.h"
#include "paddle/phi/core/infermeta_utils.h"
#include "paddle/phi/core/infermeta_utils.h"
#include "paddle/phi/infermeta/unary.h"
#include "paddle/phi/kernels/cpu/conv_util.h"
#include "paddle/phi/kernels/cpu/conv_util.h"
#include "paddle/phi/kernels/funcs/axis_utils.h"
#include "paddle/phi/kernels/funcs/axis_utils.h"
#include "paddle/phi/kernels/funcs/common_shape.h"
#include "paddle/phi/kernels/funcs/common_shape.h"
...
@@ -2199,6 +2199,18 @@ void MatrixNMSInferMeta(const MetaTensor& bboxes,
...
@@ -2199,6 +2199,18 @@ void MatrixNMSInferMeta(const MetaTensor& bboxes,
}
}
}
}
void
MatrixRankStaticInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
atol_tensor
,
bool
use_default_tol
,
bool
hermitian
,
MetaTensor
*
out
)
{
if
(
atol_tensor
)
{
MatrixRankTolInferMeta
(
x
,
atol_tensor
,
use_default_tol
,
hermitian
,
out
);
}
else
{
MatrixRankInferMeta
(
x
,
hermitian
,
use_default_tol
,
out
);
}
}
void
MatrixRankTolInferMeta
(
const
MetaTensor
&
x
,
void
MatrixRankTolInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
atol_tensor
,
const
MetaTensor
&
atol_tensor
,
bool
use_default_tol
,
bool
use_default_tol
,
...
...
paddle/phi/infermeta/binary.h
浏览文件 @
a2aa0087
...
@@ -353,6 +353,12 @@ void MatrixNMSInferMeta(const MetaTensor& bboxes,
...
@@ -353,6 +353,12 @@ void MatrixNMSInferMeta(const MetaTensor& bboxes,
MetaTensor
*
roisnum
,
MetaTensor
*
roisnum
,
MetaConfig
config
=
MetaConfig
());
MetaConfig
config
=
MetaConfig
());
void
MatrixRankStaticInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
atol_tensor
,
bool
use_default_tol
,
bool
hermitian
,
MetaTensor
*
out
);
void
MatrixRankTolInferMeta
(
const
MetaTensor
&
x
,
void
MatrixRankTolInferMeta
(
const
MetaTensor
&
x
,
const
MetaTensor
&
atol_tensor
,
const
MetaTensor
&
atol_tensor
,
bool
use_default_tol
,
bool
use_default_tol
,
...
...
paddle/phi/ops/compat/matrix_rank_sig.cc
浏览文件 @
a2aa0087
...
@@ -18,6 +18,12 @@ namespace phi {
...
@@ -18,6 +18,12 @@ namespace phi {
// we have to return every specific KernelSignature for infrt now
// we have to return every specific KernelSignature for infrt now
KernelSignature
MatrixRankOpArgumentMapping
(
const
ArgumentMappingContext
&
ctx
)
{
KernelSignature
MatrixRankOpArgumentMapping
(
const
ArgumentMappingContext
&
ctx
)
{
if
(
ctx
.
IsForInferShape
())
{
return
KernelSignature
(
"matrix_rank_tol"
,
{
"X"
,
"TolTensor"
},
{
"use_default_tol"
,
"hermitian"
},
{
"Out"
});
}
if
(
ctx
.
HasInput
(
"TolTensor"
))
{
if
(
ctx
.
HasInput
(
"TolTensor"
))
{
return
KernelSignature
(
"matrix_rank_tol"
,
return
KernelSignature
(
"matrix_rank_tol"
,
{
"X"
,
"TolTensor"
},
{
"X"
,
"TolTensor"
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录