Browse Source

Pre Merge pull request !274 from gengchao/development

pull/274/MERGE
gengchao Gitee 4 years ago
parent
commit
5f3a67557c
2 changed files with 4 additions and 1 deletions
  1. +1
    -1
      ge/graph/partition/graph_partition.cc
  2. +3
    -0
      ge/graph/partition/graph_partition.h

+ 1
- 1
ge/graph/partition/graph_partition.cc View File

@@ -586,7 +586,7 @@ Status ge::GraphPartitioner::AddPartitionsToGraphNode(vector<ge::SubGraphInfoPtr
return FAILED; return FAILED;
} }
auto &engine_name = graph_info_.partitions_.at(sub_graph); auto &engine_name = graph_info_.partitions_.at(sub_graph);
GE_DUMP(sub_graph, sub_graph->GetName());
GE_DUMP(sub_graph, sub_graph->GetName() + "_" + mode_2_str_[graph_info_.mode_]);
if (!session_graph_id.empty()) { if (!session_graph_id.empty()) {
GE_IF_BOOL_EXEC(!AttrUtils::SetStr(sub_graph, ATTR_NAME_SESSION_GRAPH_ID, session_graph_id), GE_IF_BOOL_EXEC(!AttrUtils::SetStr(sub_graph, ATTR_NAME_SESSION_GRAPH_ID, session_graph_id),
GELOGW("SetStr ATTR_NAME_SESSION_GRAPH_ID failed");) GELOGW("SetStr ATTR_NAME_SESSION_GRAPH_ID failed");)


+ 3
- 0
ge/graph/partition/graph_partition.h View File

@@ -57,6 +57,7 @@ class GraphPartitioner {
/// MergeAfterSubGraphOptimization() can only be called in Merge mode. /// MergeAfterSubGraphOptimization() can only be called in Merge mode.
/// After Partition(), change to Merge mode. After MergeAfterSubGraphOptimization(), change to Partition mode /// After Partition(), change to Merge mode. After MergeAfterSubGraphOptimization(), change to Partition mode
enum Mode { kPartitioning, kSecondPartitioning, kMerging }; enum Mode { kPartitioning, kSecondPartitioning, kMerging };
using PartitionModeMap = std::map<Mode, std::string>;
GraphPartitioner() : partition_times_(0){}; GraphPartitioner() : partition_times_(0){};
~GraphPartitioner() = default; ~GraphPartitioner() = default;


@@ -176,6 +177,8 @@ class GraphPartitioner {
Graph2InputNodesSubGraphInfo graph_2_input_subgraph_; Graph2InputNodesSubGraphInfo graph_2_input_subgraph_;
GraphPartitionInfo graph_info_; GraphPartitionInfo graph_info_;
uint32_t partition_times_; // times of call partition uint32_t partition_times_; // times of call partition
PartitionModeMap mode_2_string_ = {{kPartitioning, "Partitioning"},
{kSecondPartitioning, "SecondPartitioning"},{kMerging, "Merging"}};
friend class GraphManager; friend class GraphManager;
}; };
} // namespace ge } // namespace ge


Loading…
Cancel
Save