From 656caa162275d52423fb001db647c500698f2913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B3=E9=BE=99=E9=94=8B?= Date: Thu, 26 Sep 2024 20:09:33 +0800 Subject: [PATCH] update warn --- .../optimizers/om_partition_subgraphs_pass.cc | 18 +++++++++--------- tf_adapter/util/ge_plugin.cc | 8 ++++---- tf_adapter/util/generate_report.cc | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tf_adapter/optimizers/om_partition_subgraphs_pass.cc b/tf_adapter/optimizers/om_partition_subgraphs_pass.cc index eef34c856..e6c3c913b 100644 --- a/tf_adapter/optimizers/om_partition_subgraphs_pass.cc +++ b/tf_adapter/optimizers/om_partition_subgraphs_pass.cc @@ -415,8 +415,8 @@ int FindNodesInPaths(Node *op_head, const NodeSet &ops_tail, NodeSet &ops_save) for (auto out_node : cur_node->out_nodes()) { auto num_outputs = [](const Node *node) { unsigned int n = 0; - for (auto out_node : node->out_nodes()) { - if (out_node->id() > -1) { + for (auto out_node_index : node->out_nodes()) { + if (out_node_index->id() > -1) { ++n; } } @@ -1202,8 +1202,8 @@ Status MarkForPartition(const std::unique_ptr *graph_in, int &clusterNum, // A node/slot pair. struct NodeSlot { NodeSlot() : node(nullptr), slot(-1), dtype(DT_INVALID) {} - NodeSlot(const Node *node, int slot) : node(node), slot(slot), dtype(DT_INVALID) {} - NodeSlot(const Node *node, int slot, DataType dtype) : node(node), slot(slot), dtype(dtype) {} + NodeSlot(const Node *nodeArg, int slotArg) : node(nodeArg), slot(slotArg), dtype(DT_INVALID) {} + NodeSlot(const Node *nodeArg, int slotArg, DataType dtypeArg) : node(nodeArg), slot(slotArg), dtype(dtypeArg) {} const Node *node; int slot; @@ -2070,20 +2070,20 @@ void OMPartitionSubgraphsPass::GetGraphConfig(const Node &node, bool enable_dp, graph_options["recompute_mode"] = recompute_mode; } if (node_attrs.find(kMaxKeyNum) != node_attrs.end()) { - graph_options["max_key_num"] = std::to_string(static_cast(node_attrs.at(kMaxKeyNum).i())); + graph_options["max_key_num"] = std::to_string(static_cast(node_attrs.at(kMaxKeyNum).i())); } if (node_attrs.find(kEmbeddingDim) != node_attrs.end()) { const auto embedding_dim = node_attrs.at(kEmbeddingDim).i(); - graph_options["embedding_dim"] = std::to_string(static_cast(embedding_dim)); + graph_options["embedding_dim"] = std::to_string(static_cast(embedding_dim)); } if (node_attrs.find(kUseCounterFilter) != node_attrs.end()) { - graph_options["use_counter_filter"] = std::to_string(static_cast(node_attrs.at(kUseCounterFilter).i())); + graph_options["use_counter_filter"] = std::to_string(static_cast(node_attrs.at(kUseCounterFilter).i())); } if (node_attrs.find(kPaddingKey) != node_attrs.end()) { - graph_options["padding_key"] = std::to_string(static_cast(node_attrs.at(kPaddingKey).i())); + graph_options["padding_key"] = std::to_string(static_cast(node_attrs.at(kPaddingKey).i())); } if (node_attrs.find(kPaddingKeyMask) != node_attrs.end()) { - graph_options["embedding_flags"] = std::to_string(static_cast(node_attrs.at(kPaddingKeyMask).b())); + graph_options["embedding_flags"] = std::to_string(static_cast(node_attrs.at(kPaddingKeyMask).b())); } } diff --git a/tf_adapter/util/ge_plugin.cc b/tf_adapter/util/ge_plugin.cc index a336c81c4..f83e08591 100644 --- a/tf_adapter/util/ge_plugin.cc +++ b/tf_adapter/util/ge_plugin.cc @@ -327,9 +327,9 @@ void GePlugin::Init(std::map &init_options, const bool std::launch::async, [this](const std::map &init_options) -> ge::Status { const auto init_ascend_string_options = ChangeStringToAscendString(init_options); - const auto ret = ge::GEInitialize(init_ascend_string_options); + const auto init_ret = ge::GEInitialize(init_ascend_string_options); error_message_ = std::string(ge::GEGetErrorMsgV2().GetString()); - return ret; + return init_ret; }, init_options) .share(); @@ -445,8 +445,8 @@ void GePlugin::Finalize() { } if (!kIsHeterogeneous && tdt_init) { ADP_LOG(INFO) << "[GePlugin] Close TsdClient and destroy tdt."; - int32_t ret = tdt::TdtOutFeedDestroy(); - if (ret != 0) { + int32_t tdt_ret = tdt::TdtOutFeedDestroy(); + if (tdt_ret != 0) { LOG(ERROR) << "[GePlugin] Close tdt host failed."; ADP_LOG(ERROR) << "[GePlugin] Close tdt host failed."; } diff --git a/tf_adapter/util/generate_report.cc b/tf_adapter/util/generate_report.cc index 09eed2f97..41ab864f5 100644 --- a/tf_adapter/util/generate_report.cc +++ b/tf_adapter/util/generate_report.cc @@ -84,7 +84,7 @@ Status GenerateReport::SaveUnsupportedInfo() { {kKeyReason, reason}}; graph_info[kKeyOp].push_back(op); } - info_str = graph_info.dump(static_cast(kInterval), ' ', false, Json::error_handler_t::ignore); + info_str = graph_info.dump(static_cast(kInterval), ' ', false, Json::error_handler_t::ignore); } catch (std::exception &e) { return errors::Internal("Failed to convert json to string ,reason:", e.what()); } catch (...) { -- Gitee