!103 Sort include file in parallel dir.

Merge pull request !103 from suteng/master
5 years ago · 13b6da8602
parent 2aae218f4b 60b68a1470
commit 13b6da8602
92 changed files with 248 additions and 250 deletions
--- a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.cc
+++ b/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.cc
@ -15,16 +15,16 @@
 */

 #include "parallel/allreduce_fusion/allreduce_fusion.h"
+#include <memory>
 #include <queue>
-#include <unordered_set>
 #include <string>
-#include <memory>
-#include "utils/log_adapter.h"
-#include "parallel/status.h"
+#include <unordered_set>
 #include "ir/func_graph.h"
-#include "parallel/step_parallel.h"
-#include "parallel/graph_util/node_info.h"
 #include "parallel/costmodel_context.h"
+#include "parallel/graph_util/node_info.h"
+#include "parallel/status.h"
+#include "parallel/step_parallel.h"
+#include "utils/log_adapter.h"

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.h
+++ b/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.h
@ -20,8 +20,8 @@
 #include <unordered_map>
 #include <vector>
 #include "ir/anf.h"
-#include "parallel/status.h"
 #include "parallel/allreduce_fusion/allreduce_graph.h"
+#include "parallel/status.h"

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.cc
+++ b/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.cc
@ -17,9 +17,9 @@
 #include "parallel/allreduce_fusion/allreduce_graph.h"
 #include <algorithm>
 #include <functional>
-#include "utils/log_adapter.h"
 #include "ir/anf.h"
 #include "parallel/allreduce_fusion/allreduce_node.h"
+#include "utils/log_adapter.h"

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.h
+++ b/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.h
@ -18,14 +18,14 @@
 #define MINDSPORE_CCSRC_PARALLEL_ALLREDUCE_FUSION_ALLREDUCE_GRAPH_H_

 #include <memory>
-#include <vector>
+#include <set>
 #include <unordered_map>
 #include <unordered_set>
-#include <set>
 #include <utility>
+#include <vector>
 #include "ir/anf.h"
-#include "parallel/status.h"
 #include "parallel/allreduce_fusion/allreduce_node.h"
+#include "parallel/status.h"

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_node.h
+++ b/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_node.h
@ -17,9 +17,9 @@
 #ifndef MINDSPORE_CCSRC_PARALLEL_ALLREDUCE_FUSION_ALLREDUCE_NODE_H_
 #define MINDSPORE_CCSRC_PARALLEL_ALLREDUCE_FUSION_ALLREDUCE_NODE_H_

-#include <unordered_set>
-#include <unordered_map>
 #include <memory>
+#include <unordered_map>
+#include <unordered_set>
 #include <vector>
 #include "ir/anf.h"
 #include "parallel/status.h"
--- a/mindspore/ccsrc/parallel/allreduce_fusion/step_allreduce_fusion.cc
+++ b/mindspore/ccsrc/parallel/allreduce_fusion/step_allreduce_fusion.cc
@ -17,12 +17,12 @@
 #include "parallel/allreduce_fusion/step_allreduce_fusion.h"
 #include <ctime>
 #include <string>
-#include "utils/log_adapter.h"
-#include "parallel/status.h"
-#include "parallel/context.h"
 #include "optimizer/optimizer.h"
 #include "parallel/allreduce_fusion/allreduce_fusion.h"
+#include "parallel/context.h"
 #include "parallel/graph_util/graph_info.h"
+#include "parallel/status.h"
+#include "utils/log_adapter.h"

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/auto_parallel/costmodel.cc
+++ b/mindspore/ccsrc/parallel/auto_parallel/costmodel.cc
@ -15,9 +15,9 @@
 */

 #include "parallel/auto_parallel/costmodel.h"
-#include <utility>
-#include <numeric>
 #include <cmath>
+#include <numeric>
+#include <utility>
 #include "parallel/auto_parallel/graph_costmodel.h"

 namespace mindspore {
--- a/mindspore/ccsrc/parallel/auto_parallel/costmodel.h
+++ b/mindspore/ccsrc/parallel/auto_parallel/costmodel.h
@ -17,11 +17,11 @@
 #ifndef MINDSPORE_CCSRC_PARALLEL_AUTO_PARALLEL_COSTMODEL_H_
 #define MINDSPORE_CCSRC_PARALLEL_AUTO_PARALLEL_COSTMODEL_H_

-#include <memory>
 #include <algorithm>
-#include <vector>
+#include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 #include "parallel/strategy.h"
 #include "parallel/tensor_layout/tensor_info.h"

--- a/mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.cc
+++ b/mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.cc
@ -17,8 +17,8 @@
 #include "parallel/auto_parallel/dp_algo_costmodel.h"

 #include <memory>
-#include <vector>
 #include <utility>
+#include <vector>

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.h
+++ b/mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.h
@ -18,8 +18,8 @@
 #define MINDSPORE_CCSRC_PARALLEL_AUTO_PARALLEL_DP_ALGO_COSTMODEL_H_

 #include <memory>
-#include <vector>
 #include <utility>
+#include <vector>
 #include "ir/value.h"
 #include "parallel/auto_parallel/edge_costmodel.h"
 #include "parallel/auto_parallel/graph_costmodel.h"
--- a/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.cc
+++ b/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.cc
@ -18,11 +18,11 @@

 #include <algorithm>
 #include <functional>
-#include <utility>
 #include <iterator>
+#include <utility>
 #include "parallel/auto_parallel/costmodel.h"
-#include "parallel/tensor_layout/tensor_redistribution.h"
 #include "parallel/auto_parallel/graph_costmodel.h"
+#include "parallel/tensor_layout/tensor_redistribution.h"

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.h
+++ b/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.h
@ -17,16 +17,16 @@
 #ifndef PARALLEL_AUTO_PARALLEL_EDGE_COSTMODEL_H_
 #define PARALLEL_AUTO_PARALLEL_EDGE_COSTMODEL_H_

-#include <memory>
-#include <vector>
-#include <utility>
 #include <map>
+#include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 #include "common/utils.h"
-#include "parallel/tensor_layout/tensor_layout.h"
-#include "parallel/tensor_layout/tensor_info.h"
-#include "parallel/ops_info/operator_info.h"
 #include "parallel/auto_parallel/costmodel.h"
+#include "parallel/ops_info/operator_info.h"
+#include "parallel/tensor_layout/tensor_info.h"
+#include "parallel/tensor_layout/tensor_layout.h"

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.cc
+++ b/mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.cc
@ -17,11 +17,11 @@
 #include "parallel/auto_parallel/graph_costmodel.h"

 #include <algorithm>
+#include <cstdlib>
+#include <iterator>
 #include <numeric>
 #include <string>
 #include <utility>
-#include <iterator>
-#include <cstdlib>
 #include <vector>

 namespace mindspore {
--- a/mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.h
+++ b/mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.h
@ -17,17 +17,17 @@
 #ifndef MINDSPORE_CCSRC_PARALLEL_AUTO_PARALLEL_GRAPH_COSTMODEL_H_
 #define MINDSPORE_CCSRC_PARALLEL_AUTO_PARALLEL_GRAPH_COSTMODEL_H_

-#include <memory>
-#include <vector>
 #include <map>
-#include <utility>
+#include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 #include "../../common.h"
 #include "common/utils.h"
-#include "parallel/ops_info/operator_info.h"
 #include "parallel/auto_parallel/edge_costmodel.h"
-#include "parallel/ops_info/tmp_identity_info.h"
 #include "parallel/costmodel_context.h"
+#include "parallel/ops_info/operator_info.h"
+#include "parallel/ops_info/tmp_identity_info.h"

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/auto_parallel/operator_costmodel.h
+++ b/mindspore/ccsrc/parallel/auto_parallel/operator_costmodel.h
@ -17,10 +17,10 @@
 #ifndef PARALLEL_AUTO_PARALLEL_OPERATOR_COSTMODEL_H_
 #define PARALLEL_AUTO_PARALLEL_OPERATOR_COSTMODEL_H_

-#include <vector>
 #include <memory>
-#include "parallel/tensor_layout/tensor_info.h"
+#include <vector>
 #include "parallel/device_manager.h"
+#include "parallel/tensor_layout/tensor_info.h"

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.cc
+++ b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.cc
@ -16,13 +16,13 @@

 #include "parallel/auto_parallel/rec_core/rec_cost.h"

-#include <iostream>
-#include <vector>
-#include <string>
-#include <utility>
 #include <algorithm>
+#include <iostream>
 #include <limits>
 #include <memory>
+#include <string>
+#include <utility>
+#include <vector>

 #include "ir/anf.h"

--- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.h
+++ b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.h
@ -18,13 +18,13 @@
 #define PARALLEL_AUTO_PARALLEL_REC_COST_H_

 #include <iostream>
-#include <vector>
+#include <memory>
 #include <string>
 #include <utility>
-#include <memory>
+#include <vector>

-#include "parallel/auto_parallel/rec_core/rec_strategy.h"
 #include "parallel/auto_parallel/rec_core/rec_graph.h"
+#include "parallel/auto_parallel/rec_core/rec_strategy.h"

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.cc
+++ b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.cc
@ -16,14 +16,14 @@

 #include "parallel/auto_parallel/rec_core/rec_generate_strategy.h"

-#include <vector>
 #include <algorithm>
 #include <memory>
+#include <vector>

-#include "parallel/ops_info/operator_info.h"
+#include "ir/value.h"
 #include "parallel/auto_parallel/rec_core/rec_partition.h"
+#include "parallel/ops_info/operator_info.h"
 #include "parallel/strategy.h"
-#include "ir/value.h"

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.h
+++ b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.h
@ -17,10 +17,10 @@
 #ifndef PARALLEL_AUTO_PARALLEL_REC_GENERATE_STRATEGY_H_
 #define PARALLEL_AUTO_PARALLEL_REC_GENERATE_STRATEGY_H_

-#include <vector>
+#include <memory>
 #include <string>
 #include <utility>
-#include <memory>
+#include <vector>

 #include "parallel/auto_parallel/rec_core/rec_graph.h"
 #include "parallel/ops_info/operator_info.h"
--- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_graph.h
+++ b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_graph.h
@ -18,11 +18,11 @@
 #define PARALLEL_AUTO_PARALLEL_REC_GRAPH_H_

 #include <iostream>
-#include <vector>
 #include <string>
+#include <vector>

-#include "parallel/auto_parallel/rec_core/rec_tensor.h"
 #include "parallel/auto_parallel/rec_core/rec_strategy.h"
+#include "parallel/auto_parallel/rec_core/rec_tensor.h"

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.cc
+++ b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.cc
@ -17,14 +17,14 @@
 #include "parallel/auto_parallel/rec_core/rec_parse_graph.h"

 #include <algorithm>
+#include <memory>
 #include <string>
 #include <vector>
-#include <memory>

-#include "parallel/ops_info/operator_info.h"
-#include "parallel/auto_parallel/rec_core/rec_tensor.h"
-#include "parallel/auto_parallel/rec_core/rec_graph.h"
 #include "ir/value.h"
+#include "parallel/auto_parallel/rec_core/rec_graph.h"
+#include "parallel/auto_parallel/rec_core/rec_tensor.h"
+#include "parallel/ops_info/operator_info.h"

 namespace mindspore {
 namespace parallel {
--- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.h
+++ b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.h
@ -17,11 +17,11 @@
 #ifndef PARALLEL_AUTO_PARALLEL_REC_PARSE_GRAPH_H_
 #define PARALLEL_AUTO_PARALLEL_REC_PARSE_GRAPH_H_

-#include <vector>
+#include <map>
+#include <memory>
 #include <string>
 #include <utility>
-#include <memory>
-#include <map>
+#include <vector>

 #include "parallel/auto_parallel/rec_core/rec_graph.h"
 #include "parallel/ops_info/operator_info.h"
--- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.cc
+++ b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.cc
@ -16,13 +16,13 @@

 #include "parallel/auto_parallel/rec_core/rec_partition.h"

+#include <algorithm>
+#include <cmath>
 #include <iostream>
-#include <vector>
+#include <memory>
 #include <string>
 #include <utility>
-#include <memory>
-#include <cmath>
-#include <algorithm>
+#include <vector>

 #include "ir/anf.h"
 #include "parallel/status.h"
--- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.h
+++ b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.h
@ -17,17 +17,17 @@
 #ifndef PARALLEL_AUTO_PARALLEL_REC_PARTITION_H_
 #define PARALLEL_AUTO_PARALLEL_REC_PARTITION_H_

+#include <cmath>
 #include <iostream>
-#include <vector>
-#include <string>
 #include <map>
-#include <utility>
-#include <cmath>
 #include <memory>
+#include <string>
+#include <utility>
+#include <vector>

+#include "parallel/auto_parallel/rec_core/rec_cost.h"
 #include "parallel/auto_parallel/rec_core/rec_graph.h"
 #include "parallel/auto_parallel/rec_core/rec_strategy.h"
-#include "parallel/auto_parallel/rec_core/rec_cost.h"
 #include "parallel/status.h"

 namespace mindspore {
--- a/mindspore/ccsrc/parallel/context.cc
+++ b/mindspore/ccsrc/parallel/context.cc
@ -16,15 +16,15 @@

 #include "parallel/context.h"

-#include <cstdint>
 #include <algorithm>
-#include <utility>
-#include <numeric>
+#include <cstdint>
 #include <functional>
 #include <memory>
+#include <numeric>
+#include <utility>

-#include "parallel/device_manager.h"
 #include "common/utils.h"
+#include "parallel/device_manager.h"

 namespace mindspore {
 namespace parallel {
--- a/Show More
+++ b/Show More