experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change fronend-attribute value format as a string and add missing parsing

Browse Source 
PiperOrigin-RevId: 308688157
Change-Id: Iba79b5e7ede0f5b1fa562b75ada15315b6b6cae1
This commit is contained in:
HyoukJoong Lee 2020-04-27 13:36:33 -07:00 committed by TensorFlower Gardener
parent 76f02c7f34
commit 2d72bcdebe
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tensorflow/compiler/xla/service/hlo_instruction.cc
View File

@ -3366,8 +3366,14 @@ string FrontendAttributesToString(
std::vector<std::pair<string, string>> sorted_attributes( std::vector<std::pair<string, string>> sorted_attributes(
frontend_attributes.map().begin(), frontend_attributes.map().end()); frontend_attributes.map().begin(), frontend_attributes.map().end());
absl::c_sort(sorted_attributes); absl::c_sort(sorted_attributes);
return absl::StrFormat( // Frontend attribute is a comma-separated list of attribute="value" pairs,
"{%s}", absl::StrJoin(sorted_attributes, ",", absl::PairFormatter("="))); // e.g., frontend_attributes={name="value_a",type="int32"}.
const auto formatter = [](string* out,
const std::pair<string, string>& item) {
absl::StrAppend(out, item.first, "=\"", item.second, "\"");
};
return absl::StrFormat("{%s}",
absl::StrJoin(sorted_attributes, ",", formatter));
} }
string PaddingConfigToString(const PaddingConfig& padding) { string PaddingConfigToString(const PaddingConfig& padding) {

5
tensorflow/compiler/xla/service/hlo_parser.cc
View File

@ -1892,6 +1892,9 @@ bool HloParserImpl::ParseInstructionRhs(HloComputation::Builder* builder,
if (outer_dimension_partitions) { if (outer_dimension_partitions) {
instruction->set_outer_dimension_partitions(*outer_dimension_partitions); instruction->set_outer_dimension_partitions(*outer_dimension_partitions);
} }
if (frontend_attributes) {
instruction->set_frontend_attributes(*frontend_attributes);
}
return AddInstruction(name, instruction, name_loc); return AddInstruction(name, instruction, name_loc);
} // NOLINT(readability/fn_size) } // NOLINT(readability/fn_size)
@ -1946,7 +1949,7 @@ bool HloParserImpl::ParseFrontendAttributes(
if (!ParseAttributeName(&attribute)) { if (!ParseAttributeName(&attribute)) {
return false; return false;
} }
if (lexer_.GetKind() != TokKind::kIdent) { if (lexer_.GetKind() != TokKind::kString) {
return false; return false;
} }
(*frontend_attributes->mutable_map())[attribute] = lexer_.GetStrVal(); (*frontend_attributes->mutable_map())[attribute] = lexer_.GetStrVal();

3
tensorflow/compiler/xla/service/hlo_parser_test.cc
View File

@ -2422,7 +2422,8 @@ TEST_F(HloParserTest, ParseSharding) {
} }
TEST_F(HloParserTest, ParseFrontendAttributes) { TEST_F(HloParserTest, ParseFrontendAttributes) {
const string original = "{attr_a=test_a,attr_b=b}"; const string original =
R"({attr_a="test_a",attr_b="b",attr_c="s64",attr_d="a/b"})";
TF_ASSERT_OK_AND_ASSIGN(FrontendAttributes frontend_attributes, TF_ASSERT_OK_AND_ASSIGN(FrontendAttributes frontend_attributes,
ParseFrontendAttributes(original)); ParseFrontendAttributes(original));
EXPECT_EQ(FrontendAttributesToString(frontend_attributes), original); EXPECT_EQ(FrontendAttributesToString(frontend_attributes), original);