Browse Source

!511 告警清除

Merge pull request !511 from 赵鲁鹏/com
pull/512/head
i-robot Gitee 3 years ago
parent
commit
5f3ab35b14
No known key found for this signature in database GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 11 additions and 10 deletions
  1. +4
    -3
      parser/tensorflow/tensorflow_parser.cc
  2. +3
    -3
      parser/tensorflow/tensorflow_parser.h
  3. +2
    -2
      parser/tensorflow/tensorflow_shape_n_parser.cc
  4. +2
    -2
      parser/tensorflow/tensorflow_shape_n_parser.h

+ 4
- 3
parser/tensorflow/tensorflow_parser.cc View File

@@ -3291,7 +3291,7 @@ Status TensorFlowModelParser::FusionNodeParseParams(shared_ptr<OpParser> &op_par
* @return false optimize failed
*
*/
Status TensorFlowModelParser::OptimizeConstNodes4CustomOp(domi::tensorflow::GraphDef *graph_def) {
Status TensorFlowModelParser::OptimizeConstNodes4CustomOp(domi::tensorflow::GraphDef *graph_def) const {
GE_CHECK_NOTNULL(graph_def);
// 1. find all the nodes in the graph and save them to all_nodedef_map
map<string, NodeDef *> all_nodedef_map;
@@ -3628,7 +3628,7 @@ Status TensorFlowModelParser::RecordFusionResult(const std::shared_ptr<ge::Scope
return SUCCESS;
}

Status TensorFlowModelParser::SetOriginNodeContext(NodeDef *node_def, OpNodeContext &op_node_context,
Status TensorFlowModelParser::SetOriginNodeContext(const NodeDef *node_def, OpNodeContext &op_node_context,
const std::vector<std::pair<std::string, int32_t>> &inputs,
const std::vector<std::pair<std::string, int32_t>> &outputs) {
int32_t in_index = 0;
@@ -3909,7 +3909,8 @@ Status TensorFlowModelParser::AddFusionNodeDef(shared_ptr<ge::ScopeGraph> &scope
}

Status TensorFlowModelParser::AddScopeInnerNode(TensorFlowModelParser *parser, ge::ComputeGraphPtr &graph,
std::mutex *graph_mutex, const domi::tensorflow::NodeDef *node_def) {
std::mutex *const graph_mutex,
const domi::tensorflow::NodeDef *node_def) {
// This is an internal function. The pointer input parameter is not empty when this function is invoked.
string node_name = node_def->name();
string node_op = node_def->op();


+ 3
- 3
parser/tensorflow/tensorflow_parser.h View File

@@ -533,7 +533,7 @@ class PARSER_FUNC_VISIBILITY TensorFlowModelParser : public domi::ModelParser {
* @return false optimize failed
*
*/
Status OptimizeConstNodes4CustomOp(domi::tensorflow::GraphDef *graph_def);
Status OptimizeConstNodes4CustomOp(domi::tensorflow::GraphDef *graph_def) const;

/**
* @ingroup domi_omg
@@ -593,7 +593,7 @@ class PARSER_FUNC_VISIBILITY TensorFlowModelParser : public domi::ModelParser {

static Status GetFunctionProto(const string &file, domi::tensorflow::GraphDefLibrary &graph_def_library);

Status SetOriginNodeContext(NodeDef *node_def, OpNodeContext &op_node_context,
Status SetOriginNodeContext(const NodeDef *node_def, OpNodeContext &op_node_context,
const std::vector<std::pair<std::string, int32_t>> &inputs,
const std::vector<std::pair<std::string, int32_t>> &outputs);

@@ -624,7 +624,7 @@ class PARSER_FUNC_VISIBILITY TensorFlowModelParser : public domi::ModelParser {
Status AddFusionNodeDef(shared_ptr<ge::ScopeGraph> &scope_graph, vector<string> &node_name_list);

static Status AddScopeInnerNode(TensorFlowModelParser *parser, ge::ComputeGraphPtr &graph,
std::mutex *graph_mutex, const domi::tensorflow::NodeDef *node_def);
std::mutex *const graph_mutex, const domi::tensorflow::NodeDef *node_def);

static void DumpNodeContext(const string &node_name, const OpNodeContext &ctx, const string &phase);
void DumpAllNodeContext(const string &phase) const;


+ 2
- 2
parser/tensorflow/tensorflow_shape_n_parser.cc View File

@@ -154,13 +154,13 @@ Status TensorFlowShapeNParser::ParseParams(const Message *op_src, ge::OpDescPtr
}

// AUTO GEN PLEASE DO NOT MODIFY IT
Status TensorFlowShapeNParser::PreParseParams(const domi::tensorflow::NodeDef *node, ShapeNOperator *op) {
Status TensorFlowShapeNParser::PreParseParams(const domi::tensorflow::NodeDef *node, const ShapeNOperator *op) {
(void)node;
(void)op;
return SUCCESS;
}

Status TensorFlowShapeNParser::PostParseParams(const domi::tensorflow::NodeDef *node, ShapeNOperator *op) {
Status TensorFlowShapeNParser::PostParseParams(const domi::tensorflow::NodeDef *node, const ShapeNOperator *op) {
(void)node;
(void)op;
return SUCCESS;


+ 2
- 2
parser/tensorflow/tensorflow_shape_n_parser.h View File

@@ -27,8 +27,8 @@ class PARSER_FUNC_VISIBILITY TensorFlowShapeNParser : public TensorFlowOpParser
Status ParseParams(const Message *op_src, ge::OpDescPtr &op_dest) override;

protected:
Status PreParseParams(const domi::tensorflow::NodeDef *node, ShapeNOperator *op);
Status PostParseParams(const domi::tensorflow::NodeDef *node, ShapeNOperator *op);
Status PreParseParams(const domi::tensorflow::NodeDef *node, const ShapeNOperator *op);
Status PostParseParams(const domi::tensorflow::NodeDef *node, const ShapeNOperator *op);

static Status ParseN(const domi::tensorflow::NodeDef *node, ShapeNOperator *op);
static Status ParseInType(const domi::tensorflow::NodeDef *node, ShapeNOperator *op);


Loading…
Cancel
Save