提交 f8192f72 编写于 作者: Y Yu Yang 提交者: GitHub

Merge pull request #4374 from reyoung/feature/remove_int_pair

Feature/remove int pair
...@@ -70,14 +70,6 @@ Attribute GetAttrValue(const OpDesc::Attr& attr_desc) { ...@@ -70,14 +70,6 @@ Attribute GetAttrValue(const OpDesc::Attr& attr_desc) {
} }
return val; return val;
} }
case framework::AttrType::INT_PAIRS: {
std::vector<std::pair<int, int>> val(attr_desc.int_pairs_size());
for (int i = 0; i < attr_desc.int_pairs_size(); ++i) {
val[i].first = attr_desc.int_pairs(i).first();
val[i].second = attr_desc.int_pairs(i).second();
}
return val;
}
case framework::AttrType::BLOCK: { case framework::AttrType::BLOCK: {
return GetProgramDesc().mutable_blocks(attr_desc.block_idx()); return GetProgramDesc().mutable_blocks(attr_desc.block_idx());
} }
......
...@@ -29,8 +29,7 @@ namespace framework { ...@@ -29,8 +29,7 @@ namespace framework {
// The order should be as same as framework.proto // The order should be as same as framework.proto
typedef boost::variant<boost::blank, int, float, std::string, std::vector<int>, typedef boost::variant<boost::blank, int, float, std::string, std::vector<int>,
std::vector<float>, std::vector<std::string>, std::vector<float>, std::vector<std::string>, bool,
std::vector<std::pair<int, int>>, bool,
std::vector<bool>, BlockDesc*> std::vector<bool>, BlockDesc*>
Attribute; Attribute;
......
...@@ -22,17 +22,11 @@ enum AttrType { ...@@ -22,17 +22,11 @@ enum AttrType {
INTS = 3; INTS = 3;
FLOATS = 4; FLOATS = 4;
STRINGS = 5; STRINGS = 5;
INT_PAIRS = 6; BOOLEAN = 6;
BOOLEAN = 7; BOOLEANS = 7;
BOOLEANS = 8; BLOCK = 8;
BLOCK = 9;
} }
message IntPair {
required int32 first = 1;
required int32 second = 2;
};
// OpDesc describes an instance of a C++ framework::OperatorBase // OpDesc describes an instance of a C++ framework::OperatorBase
// derived class type. // derived class type.
message OpDesc { message OpDesc {
...@@ -46,7 +40,6 @@ message OpDesc { ...@@ -46,7 +40,6 @@ message OpDesc {
repeated int32 ints = 6; repeated int32 ints = 6;
repeated float floats = 7; repeated float floats = 7;
repeated string strings = 8; repeated string strings = 8;
repeated IntPair int_pairs = 9;
optional bool b = 10; optional bool b = 10;
repeated bool bools = 11; repeated bool bools = 11;
optional int32 block_idx = 12; optional int32 block_idx = 12;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册