Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
bb3fb69c
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2305
Star
20932
Fork
5423
代码
文件
提交
分支
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看板
未验证
提交
bb3fb69c
编写于
8月 24, 2023
作者:
K
kangguangli
提交者:
GitHub
8月 24, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[NewIR] add method to check_unregistered_ops in `paddle dialect` (#56587)
* check_unregistered_ops * fix
上级
4e0fc706
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
184 addition
and
60 deletion
+184
-60
paddle/fluid/ir_adaptor/translator/op_translator.cc
paddle/fluid/ir_adaptor/translator/op_translator.cc
+8
-60
paddle/fluid/ir_adaptor/translator/op_translator.h
paddle/fluid/ir_adaptor/translator/op_translator.h
+83
-0
paddle/fluid/ir_adaptor/translator/utils.cc
paddle/fluid/ir_adaptor/translator/utils.cc
+35
-0
paddle/fluid/ir_adaptor/translator/utils.h
paddle/fluid/ir_adaptor/translator/utils.h
+5
-0
paddle/fluid/pybind/ir.cc
paddle/fluid/pybind/ir.cc
+16
-0
python/paddle/ir/__init__.py
python/paddle/ir/__init__.py
+1
-0
test/cpp/ir/core/program_translator_test.cc
test/cpp/ir/core/program_translator_test.cc
+22
-0
test/ir/new_ir/test_special_op_translator.py
test/ir/new_ir/test_special_op_translator.py
+14
-0
未找到文件。
paddle/fluid/ir_adaptor/translator/op_translator.cc
浏览文件 @
bb3fb69c
...
...
@@ -246,66 +246,6 @@ inline ir::OpResult GetAttributeAsInput(ir::IrContext* ctx,
}
// namespace
/// @brief This class is used to translate a OpDesc, it's a functor class and
/// should have no non-static data member, since we expected it's stateless.
struct
OpTranscriber
{
public:
virtual
~
OpTranscriber
()
=
default
;
public:
virtual
ir
::
Operation
*
operator
()(
ir
::
IrContext
*
ctx
,
TranslationContext
*
param_map
,
const
OpDesc
&
op_desc
,
ir
::
Program
*
program
);
public:
virtual
ir
::
OpInfo
LoopkUpOpInfo
(
ir
::
IrContext
*
ctx
,
const
OpDesc
&
op_desc
);
virtual
std
::
vector
<
ir
::
OpResult
>
GenerateOperationInput
(
ir
::
IrContext
*
ctx
,
TranslationContext
*
param_map
,
const
OpDesc
&
op_desc
,
const
std
::
string
&
normalized_op_name
,
const
OpInputInfoList
&
input_infos
,
ir
::
Program
*
program
);
virtual
std
::
tuple
<
OpOutputTypeList
,
OpOutputMapping
>
GenerateOperationOutput
(
ir
::
IrContext
*
ctx
,
const
OpDesc
&
op_desc
,
const
OpOutputInfoList
&
output_infos
);
virtual
void
HandleNonexistentAttribute
(
ir
::
IrContext
*
,
ir
::
AttributeMap
*
attribute_map
,
const
OpAttributeInfo
&
info
)
{
auto
&
attribute_translator
=
AttributeTranslator
::
instance
();
(
*
attribute_map
)[
info
.
name
]
=
attribute_translator
(
info
.
type_name
,
paddle
::
framework
::
Attribute
());
}
virtual
ir
::
AttributeMap
TranslateOpAttribute
(
ir
::
IrContext
*
ctx
,
const
std
::
string
&
normalized_op_name
,
const
OpAttributeInfoList
&
op_attr_infos
,
const
OpDesc
&
op_desc
);
virtual
void
RecordOpResultMapping
(
ir
::
IrContext
*
ctx
,
TranslationContext
*
param_map
,
const
OpDesc
&
op_desc
,
ir
::
Operation
*
operation
,
const
OpOutputMapping
&
arg_to_idx
);
public:
virtual
InputHandlerFn
GetSpecialInputHandlers
(
const
std
::
string
&
input_name
)
{
return
nullptr
;
}
virtual
AttributeHandlerFn
GetSpecialAttributeHandlers
(
const
std
::
string
&
input_name
)
{
return
nullptr
;
}
virtual
void
InsertSliceOperationForInput
(
ir
::
IrContext
*
ctx
,
TranslationContext
*
param_map
,
const
OpDesc
&
op_desc
,
const
OpInputInfoList
&
input_infos
,
ir
::
Program
*
program
);
};
ir
::
OpInfo
OpTranscriber
::
LoopkUpOpInfo
(
ir
::
IrContext
*
ctx
,
const
OpDesc
&
op_desc
)
{
std
::
string
target_op_name
=
...
...
@@ -625,6 +565,14 @@ ir::AttributeMap OpTranscriber::TranslateOpAttribute(
return
attribute_map
;
}
void
OpTranscriber
::
HandleNonexistentAttribute
(
ir
::
IrContext
*
,
ir
::
AttributeMap
*
attribute_map
,
const
OpAttributeInfo
&
info
)
{
auto
&
attribute_translator
=
AttributeTranslator
::
instance
();
(
*
attribute_map
)[
info
.
name
]
=
attribute_translator
(
info
.
type_name
,
paddle
::
framework
::
Attribute
());
}
void
OpTranscriber
::
RecordOpResultMapping
(
ir
::
IrContext
*
ctx
,
TranslationContext
*
param_map
,
const
OpDesc
&
op_desc
,
...
...
paddle/fluid/ir_adaptor/translator/op_translator.h
浏览文件 @
bb3fb69c
...
...
@@ -20,6 +20,7 @@
#include "paddle/fluid/framework/block_desc.h"
#include "paddle/fluid/framework/op_desc.h"
#include "paddle/fluid/framework/var_desc.h"
#include "paddle/fluid/ir/dialect/paddle_dialect/interface/op_yaml_info.h"
#include "paddle/fluid/ir_adaptor/translator/program_translator.h"
#include "paddle/ir/core/ir_context.h"
#include "paddle/ir/core/operation.h"
...
...
@@ -29,6 +30,84 @@
namespace
paddle
{
namespace
translator
{
/// @brief This class is used to translate a OpDesc, it's a functor class and
/// should have no non-static data member, since we expected it's stateless.
struct
OpTranscriber
{
public:
virtual
~
OpTranscriber
()
=
default
;
public:
using
IdxInOp
=
size_t
;
using
IdxInVector
=
size_t
;
using
ResultIdx
=
std
::
tuple
<
IdxInOp
,
IdxInVector
>
;
using
OpDesc
=
paddle
::
framework
::
OpDesc
;
using
OpOutputTypeList
=
std
::
vector
<
ir
::
Type
>
;
using
OpOutputMapping
=
std
::
unordered_map
<
std
::
string
,
ResultIdx
>
;
using
OpInputInfo
=
dialect
::
OpInputInfo
;
using
OpInputInfoList
=
std
::
vector
<
dialect
::
OpInputInfo
>
;
using
OpAttributeInfo
=
dialect
::
OpAttributeInfo
;
using
OpAttributeInfoList
=
std
::
vector
<
dialect
::
OpAttributeInfo
>
;
using
OpOutputInfo
=
dialect
::
OpOutputInfo
;
using
OpOutputInfoList
=
std
::
vector
<
dialect
::
OpOutputInfo
>
;
using
InputHandlerFn
=
std
::
function
<
ir
::
OpResult
(
ir
::
IrContext
*
,
TranslationContext
*
,
const
OpDesc
&
,
const
std
::
string
&
,
const
OpInputInfo
&
,
ir
::
Program
*
)
>
;
using
AttributeHandlerFn
=
std
::
function
<
ir
::
Attribute
(
ir
::
IrContext
*
,
const
OpDesc
&
,
const
OpAttributeInfo
&
)
>
;
public:
virtual
ir
::
Operation
*
operator
()(
ir
::
IrContext
*
ctx
,
TranslationContext
*
param_map
,
const
OpDesc
&
op_desc
,
ir
::
Program
*
program
);
public:
virtual
ir
::
OpInfo
LoopkUpOpInfo
(
ir
::
IrContext
*
ctx
,
const
OpDesc
&
op_desc
);
virtual
std
::
vector
<
ir
::
OpResult
>
GenerateOperationInput
(
ir
::
IrContext
*
ctx
,
TranslationContext
*
param_map
,
const
OpDesc
&
op_desc
,
const
std
::
string
&
normalized_op_name
,
const
OpInputInfoList
&
input_infos
,
ir
::
Program
*
program
);
virtual
std
::
tuple
<
OpOutputTypeList
,
OpOutputMapping
>
GenerateOperationOutput
(
ir
::
IrContext
*
ctx
,
const
OpDesc
&
op_desc
,
const
OpOutputInfoList
&
output_infos
);
virtual
void
HandleNonexistentAttribute
(
ir
::
IrContext
*
,
ir
::
AttributeMap
*
attribute_map
,
const
OpAttributeInfo
&
info
);
virtual
ir
::
AttributeMap
TranslateOpAttribute
(
ir
::
IrContext
*
ctx
,
const
std
::
string
&
normalized_op_name
,
const
OpAttributeInfoList
&
op_attr_infos
,
const
OpDesc
&
op_desc
);
virtual
void
RecordOpResultMapping
(
ir
::
IrContext
*
ctx
,
TranslationContext
*
param_map
,
const
OpDesc
&
op_desc
,
ir
::
Operation
*
operation
,
const
OpOutputMapping
&
arg_to_idx
);
public:
virtual
InputHandlerFn
GetSpecialInputHandlers
(
const
std
::
string
&
input_name
)
{
return
nullptr
;
}
virtual
AttributeHandlerFn
GetSpecialAttributeHandlers
(
const
std
::
string
&
input_name
)
{
return
nullptr
;
}
virtual
void
InsertSliceOperationForInput
(
ir
::
IrContext
*
ctx
,
TranslationContext
*
param_map
,
const
OpDesc
&
op_desc
,
const
OpInputInfoList
&
input_infos
,
ir
::
Program
*
program
);
};
class
OpTranslator
{
public:
using
ResultIdx
=
size_t
;
...
...
@@ -61,6 +140,10 @@ class OpTranslator {
return
special_handlers
[
op_type
];
}
}
bool
HasSpecialHandler
(
const
std
::
string
&
op_type
)
{
return
special_handlers
.
count
(
op_type
)
!=
0
;
}
};
using
OpTranslateFn
=
OpTranslator
::
OpTranslateFn
;
...
...
paddle/fluid/ir_adaptor/translator/utils.cc
浏览文件 @
bb3fb69c
...
...
@@ -16,8 +16,11 @@
#include <unordered_map>
#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
#include "paddle/fluid/ir_adaptor/translator/op_translator.h"
#include "paddle/ir/core/builtin_attribute.h"
#include "paddle/ir/core/builtin_type.h"
#include "paddle/ir/core/enforce.h"
#include "paddle/ir/core/utils.h"
namespace
paddle
{
...
...
@@ -57,5 +60,37 @@ std::ostream& operator<<(std::ostream& os,
return
os
;
}
std
::
vector
<
std
::
string
>
CheckUnregisteredOperationInBlock
(
ir
::
IrContext
*
ctx
,
const
framework
::
BlockDesc
&
block
)
{
auto
&
op_translator
=
OpTranslator
::
instance
();
std
::
vector
<
std
::
string
>
unregistered_ops
;
for
(
auto
op
:
block
.
AllOps
())
{
if
(
op_translator
.
HasSpecialHandler
(
op
->
Type
()))
{
continue
;
}
OpTranscriber
general_handler
;
try
{
general_handler
.
LoopkUpOpInfo
(
ctx
,
*
op
);
}
catch
(
ir
::
IrNotMetException
&
e
)
{
unregistered_ops
.
push_back
(
op
->
Type
());
}
}
return
unregistered_ops
;
}
std
::
vector
<
std
::
string
>
CheckUnregisteredOperation
(
ir
::
IrContext
*
ctx
,
const
framework
::
ProgramDesc
&
legacy_program
)
{
ctx
->
GetOrRegisterDialect
<
dialect
::
PaddleDialect
>
();
std
::
vector
<
std
::
string
>
unregistered_ops
;
for
(
size_t
block_idx
=
0
;
block_idx
<
legacy_program
.
Size
();
block_idx
++
)
{
const
framework
::
BlockDesc
&
block
=
legacy_program
.
Block
(
block_idx
);
auto
ops
=
CheckUnregisteredOperationInBlock
(
ctx
,
block
);
unregistered_ops
.
insert
(
unregistered_ops
.
end
(),
ops
.
begin
(),
ops
.
end
());
}
return
unregistered_ops
;
}
}
// namespace translator
}
// namespace paddle
paddle/fluid/ir_adaptor/translator/utils.h
浏览文件 @
bb3fb69c
...
...
@@ -15,7 +15,9 @@
#pragma once
#include <string>
#include <vector>
#include "paddle/fluid/framework/program_desc.h"
#include "paddle/fluid/ir_adaptor/translator/program_translator.h"
#include "paddle/ir/core/ir_context.h"
#include "paddle/ir/core/operation.h"
...
...
@@ -34,5 +36,8 @@ ir::Operation* InsertSliceOperationForTarget(
std
::
ostream
&
operator
<<
(
std
::
ostream
&
os
,
const
std
::
vector
<
std
::
string
>&
vec_str
);
std
::
vector
<
std
::
string
>
CheckUnregisteredOperation
(
ir
::
IrContext
*
ctx
,
const
framework
::
ProgramDesc
&
legacy_program
);
}
// namespace translator
}
// namespace paddle
paddle/fluid/pybind/ir.cc
浏览文件 @
bb3fb69c
...
...
@@ -31,6 +31,7 @@
#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
#include "paddle/fluid/ir/dialect/paddle_dialect/utils/utils.h"
#include "paddle/fluid/ir_adaptor/translator/translate.h"
#include "paddle/fluid/ir_adaptor/translator/utils.h"
#include "paddle/ir/core/block.h"
#include "paddle/ir/core/builtin_attribute.h"
#include "paddle/ir/core/program.h"
...
...
@@ -444,6 +445,21 @@ void BindUtils(pybind11::module *m) {
print(newir_program)
)DOC"
);
m
->
def
(
"check_unregistered_ops"
,
[](
const
framework
::
ProgramDesc
&
legacy_program
)
{
ir
::
IrContext
*
ctx
=
ir
::
IrContext
::
Instance
();
return
paddle
::
translator
::
CheckUnregisteredOperation
(
ctx
,
legacy_program
);
},
R"DOC(
Check unregistered operators in paddle dialect.
Args:
legacy_program (ProgramDesc): The Fluid Program that need checked.
Returns:
list[str] : List of unregistered operators in paddle dialect, the name is expressed by origin op name.
)DOC"
);
}
void
BindNewIR
(
pybind11
::
module
*
module
)
{
...
...
python/paddle/ir/__init__.py
浏览文件 @
bb3fb69c
...
...
@@ -27,6 +27,7 @@ from paddle.fluid.libpaddle.ir import (
set_insertion_point
,
reset_insertion_point_to_start
,
reset_insertion_point_to_end
,
check_unregistered_ops
,
)
# noqa: F401
from
.
import
core
...
...
test/cpp/ir/core/program_translator_test.cc
浏览文件 @
bb3fb69c
...
...
@@ -16,14 +16,18 @@
#include <chrono>
#include <iostream>
#include <map>
#include <memory>
#include <sstream>
#include <string>
#include <vector>
#include "paddle/fluid/framework/block_desc.h"
#include "paddle/fluid/framework/framework.pb.h"
#include "paddle/fluid/framework/operator.h"
#include "paddle/fluid/framework/program_desc.h"
#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_dialect.h"
#include "paddle/fluid/ir_adaptor/translator/translate.h"
#include "paddle/fluid/ir_adaptor/translator/utils.h"
#include "paddle/ir/core/builtin_dialect.h"
#include "paddle/ir/core/dialect.h"
#include "paddle/ir/core/ir_context.h"
...
...
@@ -85,3 +89,21 @@ TEST(PaddleDialectTest, StartupProgram) {
program
->
Print
(
ss
);
EXPECT_GT
(
ss
.
str
().
size
(),
0u
);
}
TEST
(
RegisterInfoTest
,
MainProgram
)
{
auto
p
=
load_from_file
(
"resnet50_startup.prog"
);
ir
::
IrContext
*
ctx
=
ir
::
IrContext
::
Instance
();
auto
unregistered_ops
=
paddle
::
translator
::
CheckUnregisteredOperation
(
ctx
,
p
);
EXPECT_EQ
(
unregistered_ops
.
size
(),
0u
);
auto
new_op
=
std
::
unique_ptr
<
OpDesc
>
(
new
OpDesc
(
"something must not be registered"
,
{},
{},
{}));
auto
*
block
=
p
.
MutableBlock
(
0
);
block
->
AppendAllocatedOp
(
std
::
move
(
new_op
));
unregistered_ops
=
paddle
::
translator
::
CheckUnregisteredOperation
(
ctx
,
p
);
EXPECT_EQ
(
unregistered_ops
.
size
(),
1u
);
EXPECT_EQ
(
unregistered_ops
[
0
],
"something must not be registered"
);
}
test/ir/new_ir/test_special_op_translator.py
浏览文件 @
bb3fb69c
...
...
@@ -325,5 +325,19 @@ class TestShadowOutputSlice(unittest.TestCase):
l
=
ir
.
translate_to_new_ir
(
main_program
.
desc
)
class
TestCheckUnregisteredOp
(
unittest
.
TestCase
):
def
test_program
(
self
):
main_program
=
paddle
.
static
.
Program
()
with
paddle
.
static
.
program_guard
(
main_program
):
x
=
paddle
.
randn
((
4
,
16
))
prev_h
=
paddle
.
randn
((
4
,
32
))
cell
=
paddle
.
nn
.
SimpleRNNCell
(
16
,
32
)
y
,
h
=
cell
(
x
,
prev_h
)
ops
=
ir
.
check_unregistered_ops
(
main_program
.
desc
)
assert
len
(
ops
)
==
0
if
__name__
==
"__main__"
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录