Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
马赛克医院
Paddle
提交
33c54533
P
Paddle
项目概览
马赛克医院
/
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
33c54533
编写于
10月 02, 2017
作者:
Y
Yu Yang
提交者:
GitHub
10月 02, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4547 from reyoung/feature/change_bind_data_types
Unify Map in OpDescBind
上级
a80e0100
2296d81c
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
74 addition
and
49 deletion
+74
-49
paddle/framework/attribute.h
paddle/framework/attribute.h
+1
-9
paddle/framework/op_desc.cc
paddle/framework/op_desc.cc
+26
-1
paddle/framework/op_desc.h
paddle/framework/op_desc.h
+6
-31
paddle/framework/op_info.h
paddle/framework/op_info.h
+1
-6
paddle/framework/type_defs.h
paddle/framework/type_defs.h
+38
-0
paddle/platform/enforce.h
paddle/platform/enforce.h
+2
-2
未找到文件。
paddle/framework/attribute.h
浏览文件 @
33c54533
...
...
@@ -21,20 +21,12 @@ limitations under the License. */
#include <vector>
#include "paddle/framework/framework.pb.h"
#include "paddle/framework/type_defs.h"
#include "paddle/platform/enforce.h"
#include "paddle/platform/variant.h"
namespace
paddle
{
namespace
framework
{
// The order should be as same as framework.proto
typedef
boost
::
variant
<
boost
::
blank
,
int
,
float
,
std
::
string
,
std
::
vector
<
int
>
,
std
::
vector
<
float
>
,
std
::
vector
<
std
::
string
>
,
bool
,
std
::
vector
<
bool
>
,
BlockDesc
*>
Attribute
;
typedef
std
::
unordered_map
<
std
::
string
,
Attribute
>
AttributeMap
;
ProgramDesc
&
GetProgramDesc
();
template
<
typename
T
>
...
...
paddle/framework/op_desc.cc
浏览文件 @
33c54533
...
...
@@ -112,6 +112,30 @@ const std::unordered_map<std::string, Attribute> &OpDescBind::GetAttrMap()
return
attrs_
;
}
struct
SetAttrDescVisitor
:
public
boost
::
static_visitor
<
void
>
{
explicit
SetAttrDescVisitor
(
OpDesc
::
Attr
*
attr
)
:
attr_
(
attr
)
{}
mutable
OpDesc
::
Attr
*
attr_
;
void
operator
()(
int
v
)
const
{
attr_
->
set_i
(
v
);
}
void
operator
()(
float
v
)
const
{
attr_
->
set_f
(
v
);
}
void
operator
()(
const
std
::
string
&
v
)
const
{
attr_
->
set_s
(
v
);
}
void
operator
()(
bool
b
)
const
{
attr_
->
set_b
(
b
);
}
void
operator
()(
const
std
::
vector
<
int
>
&
v
)
const
{
VectorToRepeated
(
v
,
attr_
->
mutable_ints
());
}
void
operator
()(
const
std
::
vector
<
float
>
&
v
)
const
{
VectorToRepeated
(
v
,
attr_
->
mutable_floats
());
}
void
operator
()(
const
std
::
vector
<
std
::
string
>
&
v
)
const
{
VectorToRepeated
(
v
,
attr_
->
mutable_strings
());
}
void
operator
()(
const
std
::
vector
<
bool
>
&
v
)
const
{
VectorToRepeated
(
v
,
attr_
->
mutable_bools
());
}
void
operator
()(
BlockDesc
*
desc
)
const
{
attr_
->
set_block_idx
(
desc
->
idx
());
}
void
operator
()(
boost
::
blank
)
const
{
PADDLE_THROW
(
"Unexpected branch"
);
}
};
void
OpDescBind
::
Sync
()
{
if
(
need_update_
)
{
this
->
op_desc_
.
mutable_inputs
()
->
Clear
();
...
...
@@ -134,7 +158,8 @@ void OpDescBind::Sync() {
attr_desc
->
set_name
(
attr
.
first
);
attr_desc
->
set_type
(
static_cast
<
framework
::
AttrType
>
(
attr
.
second
.
which
()
-
1
));
boost
::
apply_visitor
(
SetAttrDescVisitor
(
attr_desc
),
attr
.
second
);
SetAttrDescVisitor
visitor
(
attr_desc
);
boost
::
apply_visitor
(
visitor
,
attr
.
second
);
}
need_update_
=
false
;
...
...
paddle/framework/op_desc.h
浏览文件 @
33c54533
...
...
@@ -17,6 +17,7 @@ limitations under the License. */
#include <unordered_map>
#include <vector>
#include "paddle/framework/attribute.h"
#include "paddle/framework/type_defs.h"
#include "paddle/framework/var_desc.h"
namespace
paddle
{
...
...
@@ -61,48 +62,22 @@ class OpDescBind {
void
SetBlockAttr
(
const
std
::
string
&
name
,
BlockDescBind
&
block
);
// Only be used in C++
void
SetAttrMap
(
const
std
::
unordered_map
<
std
::
string
,
Attribute
>
&
attr_map
);
void
SetAttrMap
(
const
AttributeMap
&
attr_map
);
Attribute
GetAttr
(
const
std
::
string
&
name
)
const
;
int
GetBlockAttr
(
const
std
::
string
&
name
)
const
;
// Only be used in C++
const
std
::
unordered_map
<
std
::
string
,
Attribute
>
&
GetAttrMap
()
const
;
const
AttributeMap
&
GetAttrMap
()
const
;
private:
struct
SetAttrDescVisitor
:
public
boost
::
static_visitor
<
void
>
{
explicit
SetAttrDescVisitor
(
OpDesc
::
Attr
*
attr
)
:
attr_
(
attr
)
{}
mutable
OpDesc
::
Attr
*
attr_
;
void
operator
()(
int
v
)
const
{
attr_
->
set_i
(
v
);
}
void
operator
()(
float
v
)
const
{
attr_
->
set_f
(
v
);
}
void
operator
()(
const
std
::
string
&
v
)
const
{
attr_
->
set_s
(
v
);
}
void
operator
()(
bool
b
)
const
{
attr_
->
set_b
(
b
);
}
void
operator
()(
const
std
::
vector
<
int
>
&
v
)
const
{
VectorToRepeated
(
v
,
attr_
->
mutable_ints
());
}
void
operator
()(
const
std
::
vector
<
float
>
&
v
)
const
{
VectorToRepeated
(
v
,
attr_
->
mutable_floats
());
}
void
operator
()(
const
std
::
vector
<
std
::
string
>
&
v
)
const
{
VectorToRepeated
(
v
,
attr_
->
mutable_strings
());
}
void
operator
()(
const
std
::
vector
<
bool
>
&
v
)
const
{
VectorToRepeated
(
v
,
attr_
->
mutable_bools
());
}
void
operator
()(
BlockDesc
*
desc
)
const
{
attr_
->
set_block_idx
(
desc
->
idx
());
}
void
operator
()(
boost
::
blank
)
const
{
PADDLE_THROW
(
"Unexpected branch"
);
}
};
void
Sync
();
OpDesc
op_desc_
;
std
::
unordered_map
<
std
::
string
,
std
::
vector
<
std
::
string
>>
inputs_
;
std
::
unordered_map
<
std
::
string
,
std
::
vector
<
std
::
string
>>
outputs_
;
std
::
unordered_map
<
std
::
string
,
Attribute
>
attrs_
;
VariableNameMap
inputs_
;
VariableNameMap
outputs_
;
AttributeMap
attrs_
;
// need_update_ indicate there some local changes not be synchronized. If
// local changes should be synchronized, need_update_ should be set to true.
...
...
paddle/framework/op_info.h
浏览文件 @
33c54533
...
...
@@ -19,15 +19,10 @@
#include <unordered_map>
#include "paddle/framework/attribute.h"
#include "paddle/framework/op_desc.h"
#include "paddle/framework/type_defs.h"
namespace
paddle
{
namespace
framework
{
class
OperatorBase
;
using
VariableNameMap
=
std
::
map
<
std
::
string
,
std
::
vector
<
std
::
string
>>
;
using
OpCreator
=
std
::
function
<
OperatorBase
*
(
const
std
::
string
&
/*type*/
,
const
VariableNameMap
&
/*inputs*/
,
const
VariableNameMap
&
/*outputs*/
,
const
AttributeMap
&
/*attrs*/
)
>
;
class
GradOpDescMakerBase
{
public:
...
...
paddle/framework/type_defs.h
0 → 100644
浏览文件 @
33c54533
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
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 <functional>
#include <map>
#include "paddle/platform/variant.h"
namespace
paddle
{
namespace
framework
{
class
OperatorBase
;
using
VariableNameMap
=
std
::
map
<
std
::
string
,
std
::
vector
<
std
::
string
>>
;
// The order should be as same as framework.proto
using
Attribute
=
boost
::
variant
<
boost
::
blank
,
int
,
float
,
std
::
string
,
std
::
vector
<
int
>
,
std
::
vector
<
float
>
,
std
::
vector
<
std
::
string
>
,
bool
,
std
::
vector
<
bool
>
,
BlockDesc
*>
;
using
AttributeMap
=
std
::
unordered_map
<
std
::
string
,
Attribute
>
;
using
OpCreator
=
std
::
function
<
OperatorBase
*
(
const
std
::
string
&
/*type*/
,
const
VariableNameMap
&
/*inputs*/
,
const
VariableNameMap
&
/*outputs*/
,
const
AttributeMap
&
/*attrs*/
)
>
;
}
// namespace framework
}
// namespace paddle
paddle/platform/enforce.h
浏览文件 @
33c54533
...
...
@@ -185,7 +185,7 @@ inline void throw_on_error(T e) {
std::make_exception_ptr( \
std::runtime_error(paddle::string::Sprintf(__VA_ARGS__))), \
__FILE__, __LINE__); \
} while (
0
)
} while (
false
)
#define PADDLE_ENFORCE(...) \
do { \
...
...
@@ -195,7 +195,7 @@ inline void throw_on_error(T e) {
throw ::paddle::platform::EnforceNotMet(std::current_exception(), \
__FILE__, __LINE__); \
} \
} while (
0
)
} while (
false
)
/*
* Some enforce helpers here, usage:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录