diff --git a/parser/caffe/caffe_parser.cc b/parser/caffe/caffe_parser.cc index 528d549..8bad0d2 100644 --- a/parser/caffe/caffe_parser.cc +++ b/parser/caffe/caffe_parser.cc @@ -86,7 +86,7 @@ graphStatus aclgrphParseCaffe(const char *model_file, const char *weights_file, options.insert(std::pair(string(ge::FRAMEWORK_TYPE), to_string(domi::CAFFE))); // load custom plugin so and proto - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; domi::Status status = acl_graph_parse_util.AclParserInitialize(options); if (status != domi::SUCCESS) { REPORT_CALL_ERROR("E19999", "AclParserInitialize failed, ret:%d.", status); @@ -144,7 +144,7 @@ graphStatus aclgrphParseCaffe(const char *model_file, const char *weights_file, options.insert(std::pair(string(ge::FRAMEWORK_TYPE), to_string(domi::CAFFE))); // load custom plugin so and proto - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; domi::Status status = acl_graph_parse_util.AclParserInitialize(options); if (status != domi::SUCCESS) { REPORT_CALL_ERROR("E19999", "AclParserInitialize failed, ret:%d.", status); diff --git a/parser/common/acl_graph_parser_util.cc b/parser/common/acl_graph_parser_util.cc index 8a9b1b5..9412baf 100644 --- a/parser/common/acl_graph_parser_util.cc +++ b/parser/common/acl_graph_parser_util.cc @@ -149,7 +149,7 @@ static Status CheckOutNode(ge::OpDescPtr op_desc, int32_t index) { return domi::SUCCESS; } -domi::Status AclGraphParseUtil::LoadOpsProtoLib() { +domi::Status AclGraphParserUtil::LoadOpsProtoLib() { string opsproto_path; ge::Status ret = ge::TBEPluginLoader::GetOpsProtoPath(opsproto_path); if (ret != ge::SUCCESS) { @@ -170,7 +170,7 @@ domi::Status AclGraphParseUtil::LoadOpsProtoLib() { return SUCCESS; } -void AclGraphParseUtil::SaveCustomCaffeProtoPath() { +void AclGraphParserUtil::SaveCustomCaffeProtoPath() { GELOGD("Enter save custom caffe proto path."); std::string path_base = GetSoPath(); path_base = path_base.substr(0, path_base.rfind('/')); @@ -192,7 +192,7 @@ void AclGraphParseUtil::SaveCustomCaffeProtoPath() { // Initialize PARSER, load custom op plugin // options will be used later for parser decoupling -domi::Status AclGraphParseUtil::AclParserInitialize(const std::map &options) { +domi::Status AclGraphParserUtil::AclParserInitialize(const std::map &options) { GELOGT(TRACE_INIT, "AclParserInitialize start"); // check init status if (parser_initialized) { @@ -240,7 +240,7 @@ domi::Status AclGraphParseUtil::AclParserInitialize(const std::map &adjust_fp16_format_vec, - const string &fp16_nodes_name, size_t index, OpDescPtr &op_desc) { +void AclGraphParserUtil::AddAttrsForInputNodes(const vector &adjust_fp16_format_vec, + const string &fp16_nodes_name, size_t index, OpDescPtr &op_desc) { if (AttrUtils::SetStr(op_desc, ATTR_ATC_USER_DEFINE_DATATYPE, TypeUtils::DataTypeToSerialString(DT_FLOAT16))) { if ((index < adjust_fp16_format_vec.size()) && (adjust_fp16_format_vec[index] == "true")) { GELOGI("This node [%s] should be set NC1HWC0", fp16_nodes_name.c_str()); @@ -368,8 +368,8 @@ void AclGraphParseUtil::AddAttrsForInputNodes(const vector &adjust_fp16_ } } -domi::Status AclGraphParseUtil::ParseAclInputFp16Nodes(const ComputeGraphPtr &graph, const string &input_fp16_nodes, - const string &is_input_adjust_hw_layout) const { +domi::Status AclGraphParserUtil::ParseAclInputFp16Nodes(const ComputeGraphPtr &graph, const string &input_fp16_nodes, + const string &is_input_adjust_hw_layout) const { GE_CHECK_NOTNULL(graph); vector adjust_fp16_format_vec; if (!is_input_adjust_hw_layout.empty()) { @@ -411,7 +411,7 @@ domi::Status AclGraphParseUtil::ParseAclInputFp16Nodes(const ComputeGraphPtr &gr return SUCCESS; } -domi::Status AclGraphParseUtil::SetSpecifyIndexAttrByInputNames(const ComputeGraphPtr &graph, +domi::Status AclGraphParserUtil::SetSpecifyIndexAttrByInputNames(const ComputeGraphPtr &graph, const std::string &input_data_names) const { std::vector input_names = StringUtils::Split(input_data_names, ','); std::unordered_map name_to_index; @@ -446,8 +446,8 @@ domi::Status AclGraphParseUtil::SetSpecifyIndexAttrByInputNames(const ComputeGra return SUCCESS; } -void AclGraphParseUtil::CreateOutputNodesInfo(std::vector> &output_nodes_info, - std::vector &output_nodes_name) const { +void AclGraphParserUtil::CreateOutputNodesInfo(std::vector> &output_nodes_info, + std::vector &output_nodes_name) const { output_nodes_name.clear(); auto &out_tensor_names = ge::GetParserContext().out_tensor_names; if (out_tensor_names.empty()) { @@ -478,8 +478,8 @@ void AclGraphParseUtil::CreateOutputNodesInfo(std::vector> &output_nodes_info) const { +domi::Status AclGraphParserUtil::GetOutputLeaf(NodePtr node, + std::vector> &output_nodes_info) const { ge::OpDescPtr tmpDescPtr = node->GetOpDesc(); if (tmpDescPtr == nullptr) { REPORT_INNER_ERROR("E19999", "param node has no opdesc."); @@ -508,7 +508,7 @@ domi::Status AclGraphParseUtil::GetOutputLeaf(NodePtr node, return SUCCESS; } -domi::Status AclGraphParseUtil::GetDefaultOutInfo(ge::ComputeGraphPtr &compute_graph, +domi::Status AclGraphParserUtil::GetDefaultOutInfo(ge::ComputeGraphPtr &compute_graph, std::vector> &output_nodes_info) const { std::vector> default_out_nodes = ge::GetParserContext().default_out_nodes; if (!default_out_nodes.empty()) { @@ -531,8 +531,8 @@ domi::Status AclGraphParseUtil::GetDefaultOutInfo(ge::ComputeGraphPtr &compute_g return domi::SUCCESS; } -domi::Status AclGraphParseUtil::SetOutputNodeInfo(ge::Graph &graph, - const std::map &parser_params) const { +domi::Status AclGraphParserUtil::SetOutputNodeInfo(ge::Graph &graph, + const std::map &parser_params) const { (void)parser_params; ge::ComputeGraphPtr compute_graph = ge::GraphUtils::GetComputeGraph(graph); GE_CHECK_NOTNULL(compute_graph); @@ -588,7 +588,7 @@ domi::Status AclGraphParseUtil::SetOutputNodeInfo(ge::Graph &graph, return domi::SUCCESS; } -domi::Status AclGraphParseUtil::CheckOptions(const std::map &parser_params) const { +domi::Status AclGraphParserUtil::CheckOptions(const std::map &parser_params) const { for (auto &ele : parser_params) { const char *key_ascend = ele.first.GetString(); if (key_ascend == nullptr) { @@ -609,8 +609,8 @@ domi::Status AclGraphParseUtil::CheckOptions(const std::map &parser_params, - string &graph_name) const { +domi::Status AclGraphParserUtil::ParseParamsBeforeGraph(const std::map &parser_params, + string &graph_name) const { GELOGI("Parse graph user options start."); ge::GetParserContext().input_nodes_format_map.clear(); ge::GetParserContext().output_formats.clear(); @@ -663,8 +663,8 @@ domi::Status AclGraphParseUtil::ParseParamsBeforeGraph(const std::map &parser_params) const { +domi::Status AclGraphParserUtil::ParseParamsAfterGraph(ge::Graph &graph, + const std::map &parser_params) const { // support paragrams: input_fp16_nodes, is_input_adjust_hw_layout, ComputeGraphPtr compute_graph = GraphUtils::GetComputeGraph(graph); GE_CHECK_NOTNULL(compute_graph); diff --git a/parser/common/acl_graph_parser_util.h b/parser/common/acl_graph_parser_util.h index 070658e..bfd6790 100644 --- a/parser/common/acl_graph_parser_util.h +++ b/parser/common/acl_graph_parser_util.h @@ -34,10 +34,10 @@ namespace ge { using google::protobuf::Message; -class AclGraphParseUtil { +class AclGraphParserUtil { public: - AclGraphParseUtil() {} - virtual ~AclGraphParseUtil() {} + AclGraphParserUtil() {} + virtual ~AclGraphParserUtil() {} static domi::Status LoadOpsProtoLib(); static void SaveCustomCaffeProtoPath(); domi::Status AclParserInitialize(const std::map &options); diff --git a/parser/onnx/onnx_parser.cc b/parser/onnx/onnx_parser.cc index 976dbcc..fecef89 100644 --- a/parser/onnx/onnx_parser.cc +++ b/parser/onnx/onnx_parser.cc @@ -52,7 +52,7 @@ const char *kLocation = "location"; } namespace ge { -graphStatus PrepareBeforeParse(AclGraphParseUtil &acl_graph_parse_util, +graphStatus PrepareBeforeParse(AclGraphParserUtil &acl_graph_parse_util, const std::map &parser_params, ge::Graph &graph, std::shared_ptr &model_parser) { GetParserContext().type = domi::ONNX; @@ -82,7 +82,7 @@ graphStatus PrepareBeforeParse(AclGraphParseUtil &acl_graph_parse_util, return ge::SUCCESS; } -graphStatus HandleAfterParse(AclGraphParseUtil &acl_graph_parse_util, +graphStatus HandleAfterParse(AclGraphParserUtil &acl_graph_parse_util, const std::map &parser_params, ge::Graph &graph) { if (acl_graph_parse_util.ParseParamsAfterGraph(graph, parser_params) != ge::SUCCESS) { @@ -104,7 +104,7 @@ graphStatus aclgrphParseONNX(const char *model_file, const std::map &parser_params, ge::Graph &graph) { GE_CHECK_NOTNULL(model_file); // load custom plugin so and proto - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; std::shared_ptr model_parser; if (PrepareBeforeParse(acl_graph_parse_util, parser_params, graph, model_parser) != ge::SUCCESS) { @@ -136,7 +136,7 @@ graphStatus aclgrphParseONNXFromMem(const char *buffer, size_t size, const std::map &parser_params, ge::Graph &graph) { GE_CHECK_NOTNULL(buffer); // load custom plugin so and proto - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; std::shared_ptr model_parser; if (PrepareBeforeParse(acl_graph_parse_util, parser_params, graph, model_parser) != ge::SUCCESS) { diff --git a/parser/tensorflow/tensorflow_parser.cc b/parser/tensorflow/tensorflow_parser.cc index a377157..3af6ace 100644 --- a/parser/tensorflow/tensorflow_parser.cc +++ b/parser/tensorflow/tensorflow_parser.cc @@ -94,7 +94,7 @@ graphStatus aclgrphParseTensorFlow(const char *model_file, ge::Graph &graph) { options.insert(std::pair(string(ge::FRAMEWORK_TYPE), to_string(domi::TENSORFLOW))); // load custom plugin so and proto - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; if (acl_graph_parse_util.AclParserInitialize(options) != domi::SUCCESS) { GELOGE(GRAPH_FAILED, "Parser Initialize failed."); return GRAPH_FAILED; @@ -142,7 +142,7 @@ graphStatus aclgrphParseTensorFlow(const char *model_file, const std::map(string(ge::FRAMEWORK_TYPE), to_string(domi::TENSORFLOW))); // load custom plugin so and proto - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; domi::Status status = acl_graph_parse_util.AclParserInitialize(options); if (status != domi::SUCCESS) { GELOGE(GRAPH_FAILED, "Parser Initialize failed."); diff --git a/tests/st/testcase/test_caffe_parser.cc b/tests/st/testcase/test_caffe_parser.cc index b03a231..c02206c 100644 --- a/tests/st/testcase/test_caffe_parser.cc +++ b/tests/st/testcase/test_caffe_parser.cc @@ -191,7 +191,7 @@ TEST_F(STestCaffeParser, caffe_parser_user_output_with_default) { ge::Graph graph = ge::GraphUtils::CreateGraphFromComputeGraph(compute_graph); auto ret = model_parser->Parse(model_file.c_str(), graph); ASSERT_EQ(ret, GRAPH_SUCCESS); - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; std::map parser_params; auto status = acl_graph_parse_util.SetOutputNodeInfo(graph, parser_params); ASSERT_EQ(status, SUCCESS); @@ -483,7 +483,7 @@ TEST_F(STestCaffeParser, CaffeWeightsParser_CreateCustomOperator_test) TEST_F(STestCaffeParser, CaffeWeightsParser_ParseOutputNodeTopInfo_test) { CaffeModelParser model_parser; - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; domi::caffe::NetParameter net; domi::caffe::LayerParameter *lay0 = net.add_layer(); diff --git a/tests/st/testcase/test_tensorflow_parser.cc b/tests/st/testcase/test_tensorflow_parser.cc index 812e0ed..3456012 100644 --- a/tests/st/testcase/test_tensorflow_parser.cc +++ b/tests/st/testcase/test_tensorflow_parser.cc @@ -1104,7 +1104,7 @@ TEST_F(STestTensorflowParser, parser_tensorflow_model) { // parser tensorflow model out_node_size is equal to index string graph_name; - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; std::map out_nodes_with_node_and_index = { {AscendString(ge::ir_option::OUT_NODES), AscendString("Placeholder:0;Placeholder_1:1")}}; ParerSTestsUtils::ClearParserInnerCtx(); @@ -1356,7 +1356,7 @@ TEST_F(STestTensorflowParser, tensorflow_parserAllGraph_failed) TEST_F(STestTensorflowParser, test_parse_acl_output_nodes) { - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; string graph_name; // case 1: Normal with 'node and index' ParerSTestsUtils::ClearParserInnerCtx(); @@ -1523,7 +1523,7 @@ TEST_F(STestTensorflowParser, parse_AddFmkNode) std::string modelFile = caseDir + "/origin_models/tf_add.pb"; ge::Graph graph; string graph_name; - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; std::map parser_options = {{AscendString(ge::ir_option::OUT_NODES), AscendString("Placeholder:0;Placeholder_1:0")}}; ParerSTestsUtils::ClearParserInnerCtx(); Status ret = acl_graph_parse_util.ParseParamsBeforeGraph(parser_options, graph_name); @@ -3781,9 +3781,9 @@ TEST_F(STestTensorflowParser, tensorflow_ReadBytesFromBinaryFile_test) EXPECT_EQ(realPath, ""); } -TEST_F(STestTensorflowParser, tensorflow_AclGraphParseUtil_ParseAclInputFp16Nodes_test) +TEST_F(STestTensorflowParser, tensorflow_AclGraphParserUtil_ParseAclInputFp16Nodes_test) { - AclGraphParseUtil parserUtil; + AclGraphParserUtil parserUtil; ge::ComputeGraphPtr graph = std::make_shared(GRAPH_DEFAULT_NAME); std::string input_fp16_nodes = "Add"; std::string is_input_adjust_hw_layout = "is_input_adjust_hw_layout"; @@ -4010,7 +4010,7 @@ TEST_F(STestTensorflowParser, tensorflow_FP16_parser_test) TEST_F(STestTensorflowParser, tensorflow_AclParserInitialize_test) { - AclGraphParseUtil parseUtil; + AclGraphParserUtil parseUtil; std::map options; Status ret = parseUtil.AclParserInitialize(options); EXPECT_EQ(ret, FAILED); @@ -4022,7 +4022,7 @@ TEST_F(STestTensorflowParser, tensorflow_AclParserInitialize_test) TEST_F(STestTensorflowParser, tensorflow_GetOutputLeaf_test) { - AclGraphParseUtil parseUtil; + AclGraphParserUtil parseUtil; ge::ComputeGraphPtr compute_graph = build_graph(true); ge::NodePtr output_nodes_info = compute_graph->FindNode("Relu3"); std::vector> output_nodes = {{output_nodes_info,0}}; diff --git a/tests/ut/parser/testcase/caffe_parser_testcase/caffe_parser_unittest.cc b/tests/ut/parser/testcase/caffe_parser_testcase/caffe_parser_unittest.cc index b1a28d1..1aa2059 100755 --- a/tests/ut/parser/testcase/caffe_parser_testcase/caffe_parser_unittest.cc +++ b/tests/ut/parser/testcase/caffe_parser_testcase/caffe_parser_unittest.cc @@ -189,7 +189,7 @@ TEST_F(UtestCaffeParser, caffe_parser_user_output_with_name_and_index) { ge::GetParserContext().user_out_nodes.push_back({"abs", 0}); auto ret = model_parser->Parse(model_file.c_str(), graph); ASSERT_EQ(ret, GRAPH_SUCCESS); - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; std::map parser_params; auto status = acl_graph_parse_util.SetOutputNodeInfo(graph, parser_params); ASSERT_EQ(status, SUCCESS); @@ -216,7 +216,7 @@ TEST_F(UtestCaffeParser, caffe_parser_user_output_with_top_name) { ge::GetParserContext().user_out_tensors.push_back("abs_out"); auto ret = model_parser->Parse(model_file.c_str(), graph); ASSERT_EQ(ret, GRAPH_SUCCESS); - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; std::map parser_params; auto status = acl_graph_parse_util.SetOutputNodeInfo(graph, parser_params); ASSERT_EQ(status, SUCCESS); @@ -241,7 +241,7 @@ TEST_F(UtestCaffeParser, caffe_parser_user_output_with_default) { ge::Graph graph = ge::GraphUtils::CreateGraphFromComputeGraph(compute_graph); auto ret = model_parser->Parse(model_file.c_str(), graph); ASSERT_EQ(ret, GRAPH_SUCCESS); - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; std::map parser_params; auto status = acl_graph_parse_util.SetOutputNodeInfo(graph, parser_params); ASSERT_EQ(status, SUCCESS); @@ -543,7 +543,7 @@ TEST_F(UtestCaffeParser, CaffeWeightsParser_CreateCustomOperator_test) TEST_F(UtestCaffeParser, CaffeWeightsParser_ParseOutputNodeTopInfo_test) { CaffeModelParser model_parser; - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; domi::caffe::NetParameter net; domi::caffe::LayerParameter *lay0 = net.add_layer(); diff --git a/tests/ut/parser/testcase/common/acl_graph_parser_unittest.cc b/tests/ut/parser/testcase/common/acl_graph_parser_unittest.cc index e7ef5e8..503fdd1 100755 --- a/tests/ut/parser/testcase/common/acl_graph_parser_unittest.cc +++ b/tests/ut/parser/testcase/common/acl_graph_parser_unittest.cc @@ -53,7 +53,7 @@ class UtestAclGraphParser : public testing::Test { }; TEST_F(UtestAclGraphParser, test_parse_acl_output_nodes) { - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; string graph_name; // case 1: Normal with 'node and index' ParerUTestsUtils::ClearParserInnerCtx(); diff --git a/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc b/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc index acfe2c9..996c5b0 100644 --- a/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc +++ b/tests/ut/parser/testcase/tensorflow_parser_testcase/tensorflow_parser_unittest.cc @@ -1106,7 +1106,7 @@ TEST_F(UtestTensorflowParser, parser_tensorflow_model) { // parser tensorflow model out_node_size is equal to index string graph_name; - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; std::map out_nodes_with_node_and_index = { {AscendString(ge::ir_option::OUT_NODES), AscendString("Placeholder:0;Placeholder_1:1")}}; ParerUTestsUtils::ClearParserInnerCtx(); @@ -1452,7 +1452,7 @@ TEST_F(UtestTensorflowParser, tensorflow_parserAllGraph_failed) TEST_F(UtestTensorflowParser, test_parse_acl_output_nodes) { - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; string graph_name; // case 1: Normal with 'node and index' ParerUTestsUtils::ClearParserInnerCtx(); @@ -1621,7 +1621,7 @@ TEST_F(UtestTensorflowParser, parse_AddFmkNode) std::string modelFile = caseDir + "/tensorflow_model/tf_add.pb"; ge::Graph graph; string graph_name; - AclGraphParseUtil acl_graph_parse_util; + AclGraphParserUtil acl_graph_parse_util; std::map parser_options = {{AscendString(ge::ir_option::OUT_NODES), AscendString("Placeholder:0;Placeholder_1:0")}}; ParerUTestsUtils::ClearParserInnerCtx(); Status ret = acl_graph_parse_util.ParseParamsBeforeGraph(parser_options, graph_name); @@ -3885,9 +3885,9 @@ TEST_F(UtestTensorflowParser, tensorflow_ReadBytesFromBinaryFile_test) EXPECT_EQ(realPath, ""); } -TEST_F(UtestTensorflowParser, tensorflow_AclGraphParseUtil_ParseAclInputFp16Nodes_test) +TEST_F(UtestTensorflowParser, tensorflow_AclGraphParserUtil_ParseAclInputFp16Nodes_test) { - AclGraphParseUtil parserUtil; + AclGraphParserUtil parserUtil; ge::ComputeGraphPtr graph = std::make_shared(GRAPH_DEFAULT_NAME); std::string input_fp16_nodes = "Add"; std::string is_input_adjust_hw_layout = "is_input_adjust_hw_layout"; @@ -4094,7 +4094,7 @@ TEST_F(UtestTensorflowParser, tensorflow_FP16_parser_test) TEST_F(UtestTensorflowParser, tensorflow_AclParserInitialize_test) { - AclGraphParseUtil parseUtil; + AclGraphParserUtil parseUtil; std::map options; Status ret = parseUtil.AclParserInitialize(options); EXPECT_EQ(ret, FAILED); @@ -4106,7 +4106,7 @@ TEST_F(UtestTensorflowParser, tensorflow_AclParserInitialize_test) TEST_F(UtestTensorflowParser, tensorflow_GetOutputLeaf_test) { - AclGraphParseUtil parseUtil; + AclGraphParserUtil parseUtil; ge::ComputeGraphPtr compute_graph = build_graph(true); ge::NodePtr output_nodes_info = compute_graph->FindNode("Relu3"); std::vector> output_nodes = {{output_nodes_info,0}};