Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
656e60b1
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
656e60b1
编写于
8月 24, 2020
作者:
石
石晓伟
提交者:
GitHub
8月 24, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
new class: op_version_registry, test=develop (#26542)
上级
24566e95
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
189 addition
and
0 deletion
+189
-0
paddle/fluid/framework/CMakeLists.txt
paddle/fluid/framework/CMakeLists.txt
+4
-0
paddle/fluid/framework/op_version_registry.cc
paddle/fluid/framework/op_version_registry.cc
+15
-0
paddle/fluid/framework/op_version_registry.h
paddle/fluid/framework/op_version_registry.h
+123
-0
paddle/fluid/framework/op_version_registry_test.cc
paddle/fluid/framework/op_version_registry_test.cc
+47
-0
未找到文件。
paddle/fluid/framework/CMakeLists.txt
浏览文件 @
656e60b1
...
@@ -122,6 +122,10 @@ cc_library(data_transform SRCS data_transform.cc DEPS math_function tensor
...
@@ -122,6 +122,10 @@ cc_library(data_transform SRCS data_transform.cc DEPS math_function tensor
cc_library
(
attribute SRCS attribute.cc DEPS framework_proto boost
)
cc_library
(
attribute SRCS attribute.cc DEPS framework_proto boost
)
cc_test
(
program_desc_test SRCS program_desc_test.cc DEPS proto_desc
cc_test
(
program_desc_test SRCS program_desc_test.cc DEPS proto_desc
device_context
)
device_context
)
cc_library
(
op_version_registry SRCS op_version_registry.cc DEPS framework_proto boost
)
cc_test
(
op_version_registry_test SRCS op_version_registry_test.cc DEPS op_version_registry
)
cc_library
(
op_proto_maker SRCS op_proto_maker.cc DEPS framework_proto attribute glog
)
cc_library
(
op_proto_maker SRCS op_proto_maker.cc DEPS framework_proto attribute glog
)
cc_test
(
op_proto_maker_test SRCS op_proto_maker_test.cc DEPS op_proto_maker
)
cc_test
(
op_proto_maker_test SRCS op_proto_maker_test.cc DEPS op_proto_maker
)
cc_library
(
no_need_buffer_vars_inference SRCS no_need_buffer_vars_inference.cc DEPS attribute device_context
)
cc_library
(
no_need_buffer_vars_inference SRCS no_need_buffer_vars_inference.cc DEPS attribute device_context
)
...
...
paddle/fluid/framework/op_version_registry.cc
0 → 100644
浏览文件 @
656e60b1
/* Copyright (c) 2016 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/fluid/framework/op_version_registry.h"
paddle/fluid/framework/op_version_registry.h
0 → 100644
浏览文件 @
656e60b1
/* Copyright (c) 2016 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. */
#pragma once
#include <memory>
#include <string>
#include <unordered_map>
#include <utility>
#include <vector>
#include <boost/any.hpp>
#include "paddle/fluid/framework/framework.pb.h"
#include "paddle/fluid/platform/enforce.h"
namespace
paddle
{
namespace
framework
{
namespace
compatible
{
struct
OpUpdateRecord
{
enum
class
Type
{
kInvalid
=
0
,
kModifyAttr
,
kNewAttr
};
Type
type_
;
std
::
string
remark_
;
};
struct
ModifyAttr
:
OpUpdateRecord
{
ModifyAttr
(
const
std
::
string
&
name
,
const
std
::
string
&
remark
,
boost
::
any
default_value
)
:
OpUpdateRecord
({
Type
::
kModifyAttr
,
remark
}),
name_
(
name
),
default_value_
(
default_value
)
{
// TODO(Shixiaowei02): Check the data type with proto::OpDesc.
}
private:
std
::
string
name_
;
boost
::
any
default_value_
;
};
struct
NewAttr
:
OpUpdateRecord
{
NewAttr
(
const
std
::
string
&
name
,
const
std
::
string
&
remark
)
:
OpUpdateRecord
({
Type
::
kNewAttr
,
remark
}),
name_
(
name
)
{}
private:
std
::
string
name_
;
};
class
OpVersionDesc
{
public:
OpVersionDesc
&
ModifyAttr
(
const
std
::
string
&
name
,
const
std
::
string
&
remark
,
boost
::
any
default_value
)
{
infos_
.
push_back
(
std
::
shared_ptr
<
OpUpdateRecord
>
(
new
compatible
::
ModifyAttr
(
name
,
remark
,
default_value
)));
return
*
this
;
}
OpVersionDesc
&
NewAttr
(
const
std
::
string
&
name
,
const
std
::
string
&
remark
)
{
infos_
.
push_back
(
std
::
shared_ptr
<
OpUpdateRecord
>
(
new
compatible
::
NewAttr
(
name
,
remark
)));
return
*
this
;
}
private:
std
::
vector
<
std
::
shared_ptr
<
OpUpdateRecord
>>
infos_
;
};
class
OpVersion
{
public:
OpVersion
&
AddCheckpoint
(
const
std
::
string
&
note
,
const
OpVersionDesc
&
op_version_desc
)
{
checkpoints_
.
push_back
(
Checkpoint
({
note
,
op_version_desc
}));
return
*
this
;
}
private:
struct
Checkpoint
{
std
::
string
note_
;
OpVersionDesc
op_version_desc_
;
};
std
::
vector
<
Checkpoint
>
checkpoints_
;
};
class
OpVersionRegistrar
{
public:
static
OpVersionRegistrar
&
GetInstance
()
{
static
OpVersionRegistrar
instance
;
return
instance
;
}
OpVersion
&
Register
(
const
std
::
string
&
op_type
)
{
if
(
op_version_map_
.
find
(
op_type
)
!=
op_version_map_
.
end
())
{
PADDLE_THROW
(
"'%s' is registered in operator version more than once."
,
op_type
);
}
op_version_map_
.
insert
({
op_type
,
OpVersion
()});
return
op_version_map_
[
op_type
];
}
private:
std
::
unordered_map
<
std
::
string
,
OpVersion
>
op_version_map_
;
OpVersionRegistrar
()
=
default
;
OpVersionRegistrar
&
operator
=
(
const
OpVersionRegistrar
&
)
=
delete
;
};
}
// namespace compatible
}
// namespace framework
}
// namespace paddle
#define REGISTER_OP_VERSION(op_type) \
static paddle::framework::compatible::OpVersion \
RegisterOpVersion__##op_type = \
paddle::framework::compatible::OpVersionRegistrar::GetInstance() \
.Register(#op_type)
paddle/fluid/framework/op_version_registry_test.cc
0 → 100644
浏览文件 @
656e60b1
/* Copyright (c) 2016 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 <glog/logging.h>
#include <gtest/gtest.h>
#include "paddle/fluid/framework/op_version_registry.h"
namespace
paddle
{
namespace
framework
{
namespace
compatible
{
TEST
(
test_operator_version
,
test_operator_version
)
{
REGISTER_OP_VERSION
(
test__
)
.
AddCheckpoint
(
R"ROC(
Upgrade reshape, modified one attribute [axis] and add a new attribute [size].
)ROC"
,
framework
::
compatible
::
OpVersionDesc
()
.
ModifyAttr
(
"axis"
,
"Increased from the original one method to two."
,
-
1
)
.
NewAttr
(
"size"
,
"In order to represent a two-dimensional rectangle, the "
"parameter size is added."
))
.
AddCheckpoint
(
R"ROC(
Add a new attribute [height]
)ROC"
,
framework
::
compatible
::
OpVersionDesc
().
NewAttr
(
"height"
,
"In order to represent a two-dimensional rectangle, the "
"parameter height is added."
));
}
}
// namespace compatible
}
// namespace framework
}
// namespace paddle
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录