diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.cc b/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.cc index 37b6eb42ed..e4f54056a8 100644 --- 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 #include -#include #include -#include -#include "utils/log_adapter.h" -#include "parallel/status.h" +#include #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 { diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.h b/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.h index de2844fa51..a2fea45187 100644 --- a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.h +++ b/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.h @@ -20,8 +20,8 @@ #include #include #include "ir/anf.h" -#include "parallel/status.h" #include "parallel/allreduce_fusion/allreduce_graph.h" +#include "parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.cc b/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.cc index 5c97eda8d8..559ce02349 100644 --- 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 #include -#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 { diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.h b/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.h index da4cbf8800..f0db78a130 100644 --- 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 -#include +#include #include #include -#include #include +#include #include "ir/anf.h" -#include "parallel/status.h" #include "parallel/allreduce_fusion/allreduce_node.h" +#include "parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_node.h b/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_node.h index f3eeb53ec7..dc6fbed4ba 100644 --- 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 -#include #include +#include +#include #include #include "ir/anf.h" #include "parallel/status.h" diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/step_allreduce_fusion.cc b/mindspore/ccsrc/parallel/allreduce_fusion/step_allreduce_fusion.cc index 4db7007448..9dbd3a0246 100644 --- 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 #include -#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 { diff --git a/mindspore/ccsrc/parallel/auto_parallel/costmodel.cc b/mindspore/ccsrc/parallel/auto_parallel/costmodel.cc index 618e505eba..f5cf5069be 100644 --- 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 -#include #include +#include +#include #include "parallel/auto_parallel/graph_costmodel.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/auto_parallel/costmodel.h b/mindspore/ccsrc/parallel/auto_parallel/costmodel.h index 97155fb9c3..361c19573f 100644 --- 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 #include -#include +#include #include #include +#include #include "parallel/strategy.h" #include "parallel/tensor_layout/tensor_info.h" diff --git a/mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.cc b/mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.cc index 8e042eadab..060caa4cca 100644 --- 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 -#include #include +#include namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.h b/mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.h index de8ebc6fca..c9b6a07317 100644 --- 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 -#include #include +#include #include "ir/value.h" #include "parallel/auto_parallel/edge_costmodel.h" #include "parallel/auto_parallel/graph_costmodel.h" diff --git a/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.cc b/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.cc index 30fa90457e..6381049f17 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.cc +++ b/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.cc @@ -18,11 +18,11 @@ #include #include -#include #include +#include #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 { diff --git a/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.h b/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.h index d2bad60215..1fa49029fa 100644 --- 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 -#include -#include #include +#include #include +#include +#include #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 { diff --git a/mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.cc b/mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.cc index f99b271894..59b9d9e992 100644 --- 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 +#include +#include #include #include #include -#include -#include #include namespace mindspore { diff --git a/mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.h b/mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.h index 3b04703a47..e4cbdffb61 100644 --- 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 -#include #include -#include +#include #include +#include +#include #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 { diff --git a/mindspore/ccsrc/parallel/auto_parallel/operator_costmodel.h b/mindspore/ccsrc/parallel/auto_parallel/operator_costmodel.h index ad856fc910..9fb86d467e 100644 --- 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 #include -#include "parallel/tensor_layout/tensor_info.h" +#include #include "parallel/device_manager.h" +#include "parallel/tensor_layout/tensor_info.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.cc b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.cc index 45407a89e6..4591753efe 100644 --- 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 -#include -#include -#include #include +#include #include #include +#include +#include +#include #include "ir/anf.h" diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.h b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.h index 7e07ff9be3..af37b9178e 100644 --- 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 -#include +#include #include #include -#include +#include -#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 { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.cc b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.cc index 06b7bf544a..60f3003a42 100644 --- 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 #include #include +#include -#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 { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.h b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.h index 7445d3940e..4abef843a8 100644 --- 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 +#include #include #include -#include +#include #include "parallel/auto_parallel/rec_core/rec_graph.h" #include "parallel/ops_info/operator_info.h" diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_graph.h b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_graph.h index 209ce6b13e..6ab2782cb2 100644 --- 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 -#include #include +#include -#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 { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.cc b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.cc index 153ce2ea17..3ff3473298 100644 --- 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 +#include #include #include -#include -#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 { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.h b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.h index 7904d260c0..7dfca86a21 100644 --- 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 +#include +#include #include #include -#include -#include +#include #include "parallel/auto_parallel/rec_core/rec_graph.h" #include "parallel/ops_info/operator_info.h" diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.cc b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.cc index a33b861f1a..24ad8ac203 100644 --- 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 +#include #include -#include +#include #include #include -#include -#include -#include +#include #include "ir/anf.h" #include "parallel/status.h" diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.h b/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.h index 4e49305156..4f831f4f9a 100644 --- 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 #include -#include -#include #include -#include -#include #include +#include +#include +#include +#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 { diff --git a/mindspore/ccsrc/parallel/context.cc b/mindspore/ccsrc/parallel/context.cc index 64cecf1669..ab216cb22c 100644 --- a/mindspore/ccsrc/parallel/context.cc +++ b/mindspore/ccsrc/parallel/context.cc @@ -16,15 +16,15 @@ #include "parallel/context.h" -#include #include -#include -#include +#include #include #include +#include +#include -#include "parallel/device_manager.h" #include "common/utils.h" +#include "parallel/device_manager.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/context.h b/mindspore/ccsrc/parallel/context.h index 866609fbfe..265f5bac71 100644 --- a/mindspore/ccsrc/parallel/context.h +++ b/mindspore/ccsrc/parallel/context.h @@ -18,12 +18,12 @@ #define MINDSPORE_CCSRC_PARALLEL_CONTEXT_H_ #include +#include #include #include -#include -#include "parallel/status.h" #include "parallel/ops_info/ops_utils.h" +#include "parallel/status.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/costmodel_context.cc b/mindspore/ccsrc/parallel/costmodel_context.cc index 45b158bde5..0ebbd2c626 100644 --- a/mindspore/ccsrc/parallel/costmodel_context.cc +++ b/mindspore/ccsrc/parallel/costmodel_context.cc @@ -18,8 +18,8 @@ #include -#include "parallel/auto_parallel/graph_costmodel.h" #include "parallel/allreduce_fusion/allreduce_fusion.h" +#include "parallel/auto_parallel/graph_costmodel.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/costmodel_context.h b/mindspore/ccsrc/parallel/costmodel_context.h index a808fc556f..04782fa366 100644 --- a/mindspore/ccsrc/parallel/costmodel_context.h +++ b/mindspore/ccsrc/parallel/costmodel_context.h @@ -17,9 +17,9 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_COSTMODEL_CONTEXT_H_ #define MINDSPORE_CCSRC_PARALLEL_COSTMODEL_CONTEXT_H_ +#include #include #include -#include #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/parallel/device_manager.h b/mindspore/ccsrc/parallel/device_manager.h index 798d99383d..e87c1d740f 100644 --- a/mindspore/ccsrc/parallel/device_manager.h +++ b/mindspore/ccsrc/parallel/device_manager.h @@ -19,19 +19,19 @@ #include #include -#include #include #include #include #include +#include -#include "utils/convert_utils.h" #include "common/utils.h" #include "parallel/device.h" -#include "parallel/status.h" +#include "parallel/device_matrix.h" #include "parallel/group_manager.h" +#include "parallel/status.h" #include "parallel/strategy.h" -#include "parallel/device_matrix.h" +#include "utils/convert_utils.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/device_matrix.cc b/mindspore/ccsrc/parallel/device_matrix.cc index f9f314d5a3..a581dbf275 100644 --- a/mindspore/ccsrc/parallel/device_matrix.cc +++ b/mindspore/ccsrc/parallel/device_matrix.cc @@ -16,15 +16,15 @@ #include "parallel/device_matrix.h" -#include #include -#include -#include +#include #include +#include +#include #include -#include "parallel/status.h" #include "parallel/ops_info/operator_info.h" +#include "parallel/status.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/graph_util/generate_graph.h b/mindspore/ccsrc/parallel/graph_util/generate_graph.h index bb1f811f2f..c829e67b6a 100644 --- a/mindspore/ccsrc/parallel/graph_util/generate_graph.h +++ b/mindspore/ccsrc/parallel/graph_util/generate_graph.h @@ -17,12 +17,12 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_GRAPH_UTIL_GENERATE_GRAPH_H_ #define MINDSPORE_CCSRC_PARALLEL_GRAPH_UTIL_GENERATE_GRAPH_H_ -#include -#include -#include #include +#include #include +#include #include +#include #include "./common.h" #include "optimizer/opt.h" diff --git a/mindspore/ccsrc/parallel/graph_util/get_parallel_info.cc b/mindspore/ccsrc/parallel/graph_util/get_parallel_info.cc index 6619f2cc9c..3006cb7680 100644 --- a/mindspore/ccsrc/parallel/graph_util/get_parallel_info.cc +++ b/mindspore/ccsrc/parallel/graph_util/get_parallel_info.cc @@ -16,16 +16,16 @@ #include "parallel/graph_util/get_parallel_info.h" -#include #include +#include #include #include -#include "parallel/tensor_layout/tensor_layout.h" -#include "parallel/strategy.h" -#include "ir/func_graph.h" #include "common/utils.h" +#include "ir/func_graph.h" #include "parallel/graph_util/graph_info.h" +#include "parallel/strategy.h" +#include "parallel/tensor_layout/tensor_layout.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/graph_util/graph_info.cc b/mindspore/ccsrc/parallel/graph_util/graph_info.cc index be73683c57..46c9a37960 100644 --- a/mindspore/ccsrc/parallel/graph_util/graph_info.cc +++ b/mindspore/ccsrc/parallel/graph_util/graph_info.cc @@ -15,12 +15,12 @@ */ #include "parallel/graph_util/graph_info.h" -#include "ir/func_graph.h" -#include "utils/graph_utils.h" -#include "utils/context/ms_context.h" -#include "debug/draw.h" #include "debug/anf_ir_dump.h" #include "debug/anf_ir_utils.h" +#include "debug/draw.h" +#include "ir/func_graph.h" +#include "utils/context/ms_context.h" +#include "utils/graph_utils.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/group_manager.cc b/mindspore/ccsrc/parallel/group_manager.cc index cff5877f0a..1562cbc140 100644 --- a/mindspore/ccsrc/parallel/group_manager.cc +++ b/mindspore/ccsrc/parallel/group_manager.cc @@ -16,8 +16,8 @@ #include "parallel/group_manager.h" -#include #include +#include #include "parallel/device_manager.h" #include "parallel/ops_info/ops_utils.h" diff --git a/mindspore/ccsrc/parallel/group_manager.h b/mindspore/ccsrc/parallel/group_manager.h index 9e23569b15..430d2f64ed 100644 --- a/mindspore/ccsrc/parallel/group_manager.h +++ b/mindspore/ccsrc/parallel/group_manager.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_PARALLEL_GROUP_MANAGER_H_ #include -#include #include #include +#include #include "parallel/device.h" #include "parallel/status.h" diff --git a/mindspore/ccsrc/parallel/node_check.cc b/mindspore/ccsrc/parallel/node_check.cc index db53bbc59f..fc6115c3c5 100644 --- a/mindspore/ccsrc/parallel/node_check.cc +++ b/mindspore/ccsrc/parallel/node_check.cc @@ -16,8 +16,8 @@ #include "parallel/node_check.h" -#include #include +#include #include "parallel/ops_info/ops_utils.h" diff --git a/mindspore/ccsrc/parallel/ops_info/activation_info.cc b/mindspore/ccsrc/parallel/ops_info/activation_info.cc index 6e581d6280..13155ee4f1 100644 --- a/mindspore/ccsrc/parallel/ops_info/activation_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/activation_info.cc @@ -17,13 +17,13 @@ #include "parallel/ops_info/activation_info.h" #include -#include #include +#include #include "ir/value.h" +#include "parallel/auto_parallel/costmodel.h" #include "parallel/device_matrix.h" #include "parallel/strategy.h" -#include "parallel/auto_parallel/costmodel.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/activation_info.h b/mindspore/ccsrc/parallel/ops_info/activation_info.h index d05f8743b0..3cadad6b80 100644 --- a/mindspore/ccsrc/parallel/ops_info/activation_info.h +++ b/mindspore/ccsrc/parallel/ops_info/activation_info.h @@ -18,13 +18,13 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ACTIVATION_INFO_H_ #include +#include #include #include #include -#include -#include "parallel/ops_info/operator_info.h" #include "parallel/auto_parallel/operator_costmodel.h" +#include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/arithmetic_info.cc b/mindspore/ccsrc/parallel/ops_info/arithmetic_info.cc index 48741690ba..02c26ea965 100644 --- a/mindspore/ccsrc/parallel/ops_info/arithmetic_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/arithmetic_info.cc @@ -17,9 +17,9 @@ #include "parallel/ops_info/arithmetic_info.h" #include -#include -#include #include +#include +#include #include "parallel/device_matrix.h" #include "parallel/strategy.h" diff --git a/mindspore/ccsrc/parallel/ops_info/arithmetic_info.h b/mindspore/ccsrc/parallel/ops_info/arithmetic_info.h index 734368a533..7cd0d66b1b 100644 --- a/mindspore/ccsrc/parallel/ops_info/arithmetic_info.h +++ b/mindspore/ccsrc/parallel/ops_info/arithmetic_info.h @@ -17,14 +17,14 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ARITHMETIC_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ARITHMETIC_INFO_H_ +#include #include #include #include -#include #include "ir/value.h" -#include "parallel/ops_info/operator_info.h" #include "parallel/auto_parallel/operator_costmodel.h" +#include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/batch_parallel_info.h b/mindspore/ccsrc/parallel/ops_info/batch_parallel_info.h index 0ffdea97f3..57711b5298 100644 --- a/mindspore/ccsrc/parallel/ops_info/batch_parallel_info.h +++ b/mindspore/ccsrc/parallel/ops_info/batch_parallel_info.h @@ -17,10 +17,10 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_BATCH_PARALLEL_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_BATCH_PARALLEL_INFO_H_ +#include #include #include #include -#include #include "ir/value.h" #include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" diff --git a/mindspore/ccsrc/parallel/ops_info/bias_add_info.cc b/mindspore/ccsrc/parallel/ops_info/bias_add_info.cc index f07606e4d3..005edaf7c7 100644 --- a/mindspore/ccsrc/parallel/ops_info/bias_add_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/bias_add_info.cc @@ -17,9 +17,9 @@ #include "parallel/ops_info/bias_add_info.h" #include -#include -#include #include +#include +#include #include "parallel/device_matrix.h" #include "parallel/strategy.h" diff --git a/mindspore/ccsrc/parallel/ops_info/bias_add_info.h b/mindspore/ccsrc/parallel/ops_info/bias_add_info.h index e5001fc0d3..07f0bc00ff 100644 --- a/mindspore/ccsrc/parallel/ops_info/bias_add_info.h +++ b/mindspore/ccsrc/parallel/ops_info/bias_add_info.h @@ -19,13 +19,13 @@ #include +#include #include #include -#include #include "ir/value.h" -#include "parallel/ops_info/operator_info.h" #include "parallel/auto_parallel/operator_costmodel.h" +#include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/comparison_function_info.h b/mindspore/ccsrc/parallel/ops_info/comparison_function_info.h index 8760ce5666..110a9a6c38 100644 --- a/mindspore/ccsrc/parallel/ops_info/comparison_function_info.h +++ b/mindspore/ccsrc/parallel/ops_info/comparison_function_info.h @@ -21,8 +21,8 @@ #include #include #include "ir/value.h" -#include "parallel/ops_info/arithmetic_info.h" #include "parallel/auto_parallel/operator_costmodel.h" +#include "parallel/ops_info/arithmetic_info.h" #include "parallel/strategy.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.cc b/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.cc index 1b77b913da..c6cd94b7be 100644 --- a/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.cc @@ -17,15 +17,15 @@ #include "parallel/ops_info/dropout_do_mask_info.h" #include -#include -#include #include +#include +#include #include "ir/value.h" +#include "parallel/auto_parallel/costmodel.h" #include "parallel/device_matrix.h" #include "parallel/strategy.h" #include "parallel/tensor_layout/tensor_redistribution.h" -#include "parallel/auto_parallel/costmodel.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.h b/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.h index 45d4c28d8e..e43601355a 100644 --- a/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.h +++ b/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.h @@ -17,14 +17,14 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_DROPOUT_DO_MASK_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_DROPOUT_DO_MASK_INFO_H_ +#include #include #include #include -#include #include "ir/value.h" -#include "parallel/ops_info/operator_info.h" #include "parallel/auto_parallel/operator_costmodel.h" +#include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/elementary_function_info.h b/mindspore/ccsrc/parallel/ops_info/elementary_function_info.h index 33ad04023b..57b4650f26 100644 --- a/mindspore/ccsrc/parallel/ops_info/elementary_function_info.h +++ b/mindspore/ccsrc/parallel/ops_info/elementary_function_info.h @@ -22,8 +22,8 @@ #include #include "ir/value.h" #include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/strategy.h" #include "parallel/ops_info/activation_info.h" +#include "parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/generator_info.cc b/mindspore/ccsrc/parallel/ops_info/generator_info.cc index b0fd0eaa9a..a39f9faab9 100644 --- a/mindspore/ccsrc/parallel/ops_info/generator_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/generator_info.cc @@ -17,9 +17,9 @@ #include "parallel/ops_info/generator_info.h" #include -#include -#include #include +#include +#include #include "ir/value.h" #include "parallel/device_matrix.h" diff --git a/mindspore/ccsrc/parallel/ops_info/generator_info.h b/mindspore/ccsrc/parallel/ops_info/generator_info.h index 1473fead67..a280fac28e 100644 --- a/mindspore/ccsrc/parallel/ops_info/generator_info.h +++ b/mindspore/ccsrc/parallel/ops_info/generator_info.h @@ -17,13 +17,13 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_GENERATOR_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_GENERATOR_INFO_H_ +#include #include #include #include -#include -#include "parallel/ops_info/operator_info.h" #include "parallel/auto_parallel/operator_costmodel.h" +#include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/get_next_info.cc b/mindspore/ccsrc/parallel/ops_info/get_next_info.cc index f38baa1e4e..ac9acff41b 100644 --- a/mindspore/ccsrc/parallel/ops_info/get_next_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/get_next_info.cc @@ -17,9 +17,9 @@ #include "parallel/ops_info/get_next_info.h" #include -#include -#include #include +#include +#include #include "ir/value.h" #include "parallel/device_matrix.h" diff --git a/mindspore/ccsrc/parallel/ops_info/get_next_info.h b/mindspore/ccsrc/parallel/ops_info/get_next_info.h index 3dd639ba57..32adce1165 100644 --- a/mindspore/ccsrc/parallel/ops_info/get_next_info.h +++ b/mindspore/ccsrc/parallel/ops_info/get_next_info.h @@ -17,13 +17,13 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_GETNEXT_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_GETNEXT_INFO_H_ +#include #include #include #include -#include -#include "parallel/ops_info/operator_info.h" #include "parallel/auto_parallel/operator_costmodel.h" +#include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.cc b/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.cc index 183c5dec45..2955f76506 100644 --- a/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.cc @@ -17,9 +17,9 @@ #include "parallel/ops_info/l2_normalize_info.h" #include -#include -#include #include +#include +#include #include "parallel/device_matrix.h" #include "parallel/strategy.h" diff --git a/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.h b/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.h index 1a67073065..c0af9dbcb9 100644 --- a/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.h +++ b/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.h @@ -17,15 +17,15 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_L2_NORMALIZE_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_L2_NORMALIZE_INFO_H_ +#include #include #include #include -#include #include "ir/value.h" +#include "parallel/auto_parallel/operator_costmodel.h" #include "parallel/ops_info/activation_info.h" #include "parallel/strategy.h" -#include "parallel/auto_parallel/operator_costmodel.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/loss_info.cc b/mindspore/ccsrc/parallel/ops_info/loss_info.cc index 5ca383ebb5..31f80e338b 100644 --- a/mindspore/ccsrc/parallel/ops_info/loss_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/loss_info.cc @@ -17,9 +17,9 @@ #include "parallel/ops_info/loss_info.h" #include -#include -#include #include +#include +#include #include "ir/value.h" #include "parallel/device_matrix.h" diff --git a/mindspore/ccsrc/parallel/ops_info/loss_info.h b/mindspore/ccsrc/parallel/ops_info/loss_info.h index 585545302f..6a9697a447 100644 --- a/mindspore/ccsrc/parallel/ops_info/loss_info.h +++ b/mindspore/ccsrc/parallel/ops_info/loss_info.h @@ -17,14 +17,14 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_LOSS_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_LOSS_INFO_H_ +#include #include #include #include -#include #include "ir/value.h" -#include "parallel/ops_info/operator_info.h" #include "parallel/ops_info/activation_info.h" +#include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/matmul_info.cc b/mindspore/ccsrc/parallel/ops_info/matmul_info.cc index 6103087a1d..ad6409be0a 100644 --- a/mindspore/ccsrc/parallel/ops_info/matmul_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/matmul_info.cc @@ -18,16 +18,16 @@ #include #include -#include -#include #include #include +#include +#include #include "ir/value.h" +#include "parallel/auto_parallel/graph_costmodel.h" +#include "parallel/device_manager.h" #include "parallel/device_matrix.h" #include "parallel/tensor_layout/tensor_redistribution.h" -#include "parallel/device_manager.h" -#include "parallel/auto_parallel/graph_costmodel.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/matmul_info.h b/mindspore/ccsrc/parallel/ops_info/matmul_info.h index b434e4522d..7ced12b14a 100644 --- a/mindspore/ccsrc/parallel/ops_info/matmul_info.h +++ b/mindspore/ccsrc/parallel/ops_info/matmul_info.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_MATMUL_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_MATMUL_INFO_H_ +#include #include #include #include -#include +#include "common/utils.h" #include "ir/value.h" +#include "parallel/auto_parallel/operator_costmodel.h" #include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "common/utils.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/onehot_info.cc b/mindspore/ccsrc/parallel/ops_info/onehot_info.cc index 9b8e9071b0..e07609d3c4 100644 --- a/mindspore/ccsrc/parallel/ops_info/onehot_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/onehot_info.cc @@ -16,15 +16,15 @@ #include "parallel/ops_info/onehot_info.h" -#include -#include #include +#include +#include #include "ir/value.h" -#include "parallel/device_matrix.h" -#include "parallel/strategy.h" #include "parallel/auto_parallel/costmodel.h" +#include "parallel/device_matrix.h" #include "parallel/graph_util/generate_graph.h" +#include "parallel/strategy.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/onehot_info.h b/mindspore/ccsrc/parallel/ops_info/onehot_info.h index 62c66695fa..4697e201a4 100644 --- a/mindspore/ccsrc/parallel/ops_info/onehot_info.h +++ b/mindspore/ccsrc/parallel/ops_info/onehot_info.h @@ -17,14 +17,14 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ONEHOT_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_ONEHOT_INFO_H_ +#include #include #include #include -#include #include "ir/value.h" -#include "parallel/ops_info/operator_info.h" #include "parallel/auto_parallel/operator_costmodel.h" +#include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/operator_info.cc b/mindspore/ccsrc/parallel/ops_info/operator_info.cc index f187d38673..8b96425bf7 100644 --- a/mindspore/ccsrc/parallel/ops_info/operator_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/operator_info.cc @@ -17,21 +17,21 @@ #include "parallel/ops_info/operator_info.h" #include +#include #include -#include -#include #include -#include #include +#include +#include -#include "ir/value.h" #include "ir/dtype.h" #include "ir/meta_tensor.h" -#include "utils/context/ms_context.h" -#include "utils/log_adapter.h" -#include "parallel/context.h" +#include "ir/value.h" #include "parallel/auto_parallel/edge_costmodel.h" #include "parallel/auto_parallel/graph_costmodel.h" +#include "parallel/context.h" +#include "utils/context/ms_context.h" +#include "utils/log_adapter.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/operator_info.h b/mindspore/ccsrc/parallel/ops_info/operator_info.h index 89fd73564f..cc70f1b870 100644 --- a/mindspore/ccsrc/parallel/ops_info/operator_info.h +++ b/mindspore/ccsrc/parallel/ops_info/operator_info.h @@ -25,17 +25,17 @@ #include #include -#include "utils/log_adapter.h" -#include "ir/base.h" #include "common/utils.h" +#include "ir/base.h" +#include "parallel/auto_parallel/costmodel.h" +#include "parallel/auto_parallel/operator_costmodel.h" #include "parallel/device_manager.h" #include "parallel/device_matrix.h" #include "parallel/group_manager.h" +#include "parallel/ops_info/ops_utils.h" #include "parallel/strategy.h" #include "parallel/tensor_layout/tensor_info.h" -#include "parallel/auto_parallel/costmodel.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/ops_utils.h" +#include "utils/log_adapter.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/ops_info_head_files.h b/mindspore/ccsrc/parallel/ops_info/ops_info_head_files.h index 7eb24bd30a..cc13512b54 100644 --- a/mindspore/ccsrc/parallel/ops_info/ops_info_head_files.h +++ b/mindspore/ccsrc/parallel/ops_info/ops_info_head_files.h @@ -18,22 +18,22 @@ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_OPS_INFO_HEAD_FILES_H_ #include "parallel/ops_info/activation_info.h" +#include "parallel/ops_info/arithmetic_info.h" #include "parallel/ops_info/batch_parallel_info.h" +#include "parallel/ops_info/bias_add_info.h" +#include "parallel/ops_info/comparison_function_info.h" +#include "parallel/ops_info/dropout_do_mask_info.h" +#include "parallel/ops_info/elementary_function_info.h" +#include "parallel/ops_info/generator_info.h" +#include "parallel/ops_info/get_next_info.h" +#include "parallel/ops_info/l2_normalize_info.h" #include "parallel/ops_info/loss_info.h" #include "parallel/ops_info/matmul_info.h" #include "parallel/ops_info/onehot_info.h" -#include "parallel/ops_info/virtual_dataset_info.h" -#include "parallel/ops_info/arithmetic_info.h" -#include "parallel/ops_info/elementary_function_info.h" -#include "parallel/ops_info/comparison_function_info.h" -#include "parallel/ops_info/l2_normalize_info.h" -#include "parallel/ops_info/reduce_method_info.h" -#include "parallel/ops_info/transpose_info.h" #include "parallel/ops_info/prelu_info.h" +#include "parallel/ops_info/reduce_method_info.h" #include "parallel/ops_info/reshape_info.h" -#include "parallel/ops_info/generator_info.h" -#include "parallel/ops_info/dropout_do_mask_info.h" -#include "parallel/ops_info/get_next_info.h" -#include "parallel/ops_info/bias_add_info.h" +#include "parallel/ops_info/transpose_info.h" +#include "parallel/ops_info/virtual_dataset_info.h" #endif // MINDSPORE_CCSRC_PARALLEL_OPS_INFO_HEAD_FILES_H_ diff --git a/mindspore/ccsrc/parallel/ops_info/prelu_info.h b/mindspore/ccsrc/parallel/ops_info/prelu_info.h index 2e74118f80..d491ecb331 100644 --- a/mindspore/ccsrc/parallel/ops_info/prelu_info.h +++ b/mindspore/ccsrc/parallel/ops_info/prelu_info.h @@ -17,10 +17,10 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_PRELU_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_PRELU_INFO_H_ +#include #include #include #include -#include #include "ir/value.h" #include "parallel/ops_info/operator_info.h" diff --git a/mindspore/ccsrc/parallel/ops_info/reduce_method_info.cc b/mindspore/ccsrc/parallel/ops_info/reduce_method_info.cc index 5f9a67c22d..5b07f8d0a9 100644 --- a/mindspore/ccsrc/parallel/ops_info/reduce_method_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/reduce_method_info.cc @@ -17,14 +17,14 @@ #include "parallel/ops_info/reduce_method_info.h" #include -#include -#include #include +#include +#include #include "ir/value.h" +#include "parallel/device_manager.h" #include "parallel/device_matrix.h" #include "parallel/tensor_layout/tensor_redistribution.h" -#include "parallel/device_manager.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/reduce_method_info.h b/mindspore/ccsrc/parallel/ops_info/reduce_method_info.h index 6f26b99ffb..8e2e17af99 100644 --- a/mindspore/ccsrc/parallel/ops_info/reduce_method_info.h +++ b/mindspore/ccsrc/parallel/ops_info/reduce_method_info.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_REDUCE_SUM_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_REDUCE_SUM_INFO_H_ +#include #include #include #include -#include +#include "ir/meta_tensor.h" #include "ir/value.h" +#include "parallel/auto_parallel/operator_costmodel.h" #include "parallel/ops_info/activation_info.h" #include "parallel/strategy.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "ir/meta_tensor.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/reshape_info.h b/mindspore/ccsrc/parallel/ops_info/reshape_info.h index 982894a8e0..1d6a14b1f6 100644 --- a/mindspore/ccsrc/parallel/ops_info/reshape_info.h +++ b/mindspore/ccsrc/parallel/ops_info/reshape_info.h @@ -19,10 +19,10 @@ #include +#include #include #include #include -#include #include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" diff --git a/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.cc b/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.cc index 73b18ad473..772a4f83f6 100644 --- a/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.cc +++ b/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.cc @@ -1,6 +1,4 @@ /** -#include "utils/log_adapter.h" -#include "utils/log_adapter.h" #include "utils/log_adapter.h" * Copyright 2019 Huawei Technologies Co., Ltd * diff --git a/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.h b/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.h index 304e336adf..6df5856e0c 100644 --- a/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.h +++ b/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.h @@ -17,12 +17,12 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_TMP_IDENTITY_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_TMP_IDENTITY_INFO_H_ -#include #include #include +#include -#include "parallel/ops_info/operator_info.h" #include "parallel/auto_parallel/operator_costmodel.h" +#include "parallel/ops_info/operator_info.h" #include "parallel/strategy.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/transpose_info.h b/mindspore/ccsrc/parallel/ops_info/transpose_info.h index c7c1c96675..4f6f6bb695 100644 --- a/mindspore/ccsrc/parallel/ops_info/transpose_info.h +++ b/mindspore/ccsrc/parallel/ops_info/transpose_info.h @@ -17,10 +17,10 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_TRANSPOSE_INFO_H_ #define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_TRANSPOSE_INFO_H_ +#include #include #include #include -#include #include "ir/value.h" #include "parallel/ops_info/operator_info.h" diff --git a/mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.h b/mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.h index c4fdfcef04..d0278f27d9 100644 --- a/mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.h +++ b/mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.h @@ -17,10 +17,10 @@ #ifndef PARALLEL_OPS_INFO_DATASET_INFO_H_ #define PARALLEL_OPS_INFO_DATASET_INFO_H_ +#include #include #include #include -#include #include "ir/value.h" #include "parallel/ops_info/operator_info.h" diff --git a/mindspore/ccsrc/parallel/step_auto_parallel.cc b/mindspore/ccsrc/parallel/step_auto_parallel.cc index 883e0d9f15..b06ec383fa 100644 --- a/mindspore/ccsrc/parallel/step_auto_parallel.cc +++ b/mindspore/ccsrc/parallel/step_auto_parallel.cc @@ -18,30 +18,30 @@ #include #include -#include +#include +#include #include #include -#include -#include #include -#include #include +#include +#include #include "ir/anf.h" +#include "ir/meta_tensor.h" #include "optimizer/opt.h" #include "optimizer/optimizer.h" -#include "pipeline/pipeline.h" -#include "pipeline/parse/python_adapter.h" +#include "parallel/auto_parallel/dp_algo_costmodel.h" #include "parallel/auto_parallel/edge_costmodel.h" #include "parallel/auto_parallel/graph_costmodel.h" -#include "parallel/step_parallel.h" -#include "parallel/auto_parallel/dp_algo_costmodel.h" -#include "parallel/ops_info/tmp_identity_info.h" -#include "parallel/context.h" -#include "parallel/auto_parallel/rec_core/rec_partition.h" -#include "parallel/auto_parallel/rec_core/rec_parse_graph.h" #include "parallel/auto_parallel/rec_core/rec_generate_strategy.h" -#include "ir/meta_tensor.h" +#include "parallel/auto_parallel/rec_core/rec_parse_graph.h" +#include "parallel/auto_parallel/rec_core/rec_partition.h" +#include "parallel/context.h" +#include "parallel/ops_info/tmp_identity_info.h" +#include "parallel/step_parallel.h" +#include "pipeline/parse/python_adapter.h" +#include "pipeline/pipeline.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/step_auto_parallel.h b/mindspore/ccsrc/parallel/step_auto_parallel.h index d0d603a4f4..5ee75ca162 100644 --- a/mindspore/ccsrc/parallel/step_auto_parallel.h +++ b/mindspore/ccsrc/parallel/step_auto_parallel.h @@ -17,14 +17,14 @@ #ifndef PARALLEL_STEP_AUTO_PARALLEL_H_ #define PARALLEL_STEP_AUTO_PARALLEL_H_ -#include +#include #include #include -#include +#include #include "ir/anf.h" #include "optimizer/opt.h" -#include "pipeline/pipeline.h" #include "parallel/status.h" +#include "pipeline/pipeline.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/step_parallel.cc b/mindspore/ccsrc/parallel/step_parallel.cc index e2b4d55aad..886a0aebf4 100644 --- a/mindspore/ccsrc/parallel/step_parallel.cc +++ b/mindspore/ccsrc/parallel/step_parallel.cc @@ -22,26 +22,26 @@ #include #include +#include #include #include #include -#include -#include "parallel/graph_util/graph_info.h" #include "ir/meta_tensor.h" -#include "optimizer/optimizer.h" -#include "parallel/dynamic_creator.h" -#include "parallel/ops_info/matmul_info.h" -#include "utils/symbolic.h" #include "operator/ops.h" +#include "optimizer/optimizer.h" #include "parallel/auto_parallel/graph_costmodel.h" +#include "parallel/context.h" #include "parallel/device_manager.h" -#include "parallel/strategy_checkpoint/parallel_strategy_checkpoint.h" +#include "parallel/dynamic_creator.h" #include "parallel/graph_util/generate_graph.h" -#include "parallel/context.h" +#include "parallel/graph_util/graph_info.h" +#include "parallel/graph_util/node_info.h" #include "parallel/node_check.h" +#include "parallel/ops_info/matmul_info.h" +#include "parallel/strategy_checkpoint/parallel_strategy_checkpoint.h" #include "utils/comm_manager.h" -#include "parallel/graph_util/node_info.h" +#include "utils/symbolic.h" using mindspore::tensor::Tensor; diff --git a/mindspore/ccsrc/parallel/step_parallel.h b/mindspore/ccsrc/parallel/step_parallel.h index 2d1982dc9c..fd47a59bf5 100644 --- a/mindspore/ccsrc/parallel/step_parallel.h +++ b/mindspore/ccsrc/parallel/step_parallel.h @@ -19,10 +19,10 @@ #include -#include -#include #include +#include #include +#include #include #include "./common.h" diff --git a/mindspore/ccsrc/parallel/strategy.h b/mindspore/ccsrc/parallel/strategy.h index 68ba4962d7..acc6ca928f 100644 --- a/mindspore/ccsrc/parallel/strategy.h +++ b/mindspore/ccsrc/parallel/strategy.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_PARALLEL_STRATEGY_H_ #include -#include -#include #include +#include #include +#include #include "parallel/status.h" diff --git a/mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc b/mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc index 4e008feee1..9e3573eee2 100644 --- a/mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc +++ b/mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc @@ -20,10 +20,10 @@ #include #include +#include "common/utils.h" +#include "utils/convert_utils.h" #include "utils/log_adapter.h" #include "utils/node_strategy.pb.h" -#include "utils/convert_utils.h" -#include "common/utils.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h b/mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h index 3cbb116b42..b5d3626f53 100644 --- a/mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h +++ b/mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h @@ -19,8 +19,8 @@ #include #include -#include "parallel/strategy.h" #include "parallel/ops_info/ops_utils.h" +#include "parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/arrangement.cc b/mindspore/ccsrc/parallel/tensor_layout/arrangement.cc index fea7e4ba65..68acae87f3 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/arrangement.cc +++ b/mindspore/ccsrc/parallel/tensor_layout/arrangement.cc @@ -15,14 +15,14 @@ */ #include "parallel/tensor_layout/arrangement.h" -#include -#include #include +#include +#include +#include "common/utils.h" #include "parallel/status.h" -#include "utils/log_adapter.h" #include "parallel/tensor_layout/shape_util.h" #include "utils/convert_utils.h" -#include "common/utils.h" +#include "utils/log_adapter.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/arrangement.h b/mindspore/ccsrc/parallel/tensor_layout/arrangement.h index 582beeaff2..6d64e07f03 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/arrangement.h +++ b/mindspore/ccsrc/parallel/tensor_layout/arrangement.h @@ -21,8 +21,8 @@ #include #include #include -#include #include +#include #include "parallel/status.h" #include "parallel/tensor_layout/array.h" diff --git a/mindspore/ccsrc/parallel/tensor_layout/array.cc b/mindspore/ccsrc/parallel/tensor_layout/array.cc index e073c3905c..ce1b9b8ecf 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/array.cc +++ b/mindspore/ccsrc/parallel/tensor_layout/array.cc @@ -16,8 +16,8 @@ #include "parallel/tensor_layout/array.h" #include -#include "utils/log_adapter.h" #include "parallel/status.h" +#include "utils/log_adapter.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/construct_operator.h b/mindspore/ccsrc/parallel/tensor_layout/construct_operator.h index 641b0975dd..91f5236037 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/construct_operator.h +++ b/mindspore/ccsrc/parallel/tensor_layout/construct_operator.h @@ -21,9 +21,9 @@ #include #include +#include "ir/value.h" #include "parallel/ops_info/operator_info.h" #include "parallel/status.h" -#include "ir/value.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/layout_transfer.cc b/mindspore/ccsrc/parallel/tensor_layout/layout_transfer.cc index 3321d751bb..b2ee51b40b 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/layout_transfer.cc +++ b/mindspore/ccsrc/parallel/tensor_layout/layout_transfer.cc @@ -15,8 +15,8 @@ */ #include "parallel/tensor_layout/layout_transfer.h" -#include "parallel/status.h" #include "common/utils.h" +#include "parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/map.cc b/mindspore/ccsrc/parallel/tensor_layout/map.cc index 46c066b250..4f3f2369c7 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/map.cc +++ b/mindspore/ccsrc/parallel/tensor_layout/map.cc @@ -15,14 +15,14 @@ */ #include "parallel/tensor_layout/map.h" -#include -#include #include +#include +#include +#include "common/utils.h" #include "parallel/status.h" -#include "utils/log_adapter.h" #include "parallel/tensor_layout/shape_util.h" #include "utils/convert_utils.h" -#include "common/utils.h" +#include "utils/log_adapter.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/map.h b/mindspore/ccsrc/parallel/tensor_layout/map.h index 55ed3e5577..f7bc061aa1 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/map.h +++ b/mindspore/ccsrc/parallel/tensor_layout/map.h @@ -23,8 +23,8 @@ #include #include #include "parallel/status.h" -#include "parallel/tensor_layout/array.h" #include "parallel/tensor_layout/arrangement.h" +#include "parallel/tensor_layout/array.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/redistribution_layout_transfer.cc b/mindspore/ccsrc/parallel/tensor_layout/redistribution_layout_transfer.cc index dea44ee60e..2ee682fad8 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/redistribution_layout_transfer.cc +++ b/mindspore/ccsrc/parallel/tensor_layout/redistribution_layout_transfer.cc @@ -16,8 +16,8 @@ #include "parallel/tensor_layout/redistribution_layout_transfer.h" #include "parallel/status.h" -#include "parallel/tensor_layout/shape_util.h" #include "parallel/tensor_layout/reshape_layout_transfer.h" +#include "parallel/tensor_layout/shape_util.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.h b/mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.h index 3515c7383a..13f9e7af24 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.h +++ b/mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.h @@ -18,13 +18,13 @@ #define MINDSPORE_CCSRC_PARALLEL_TENSOR_LAYOUT_REDISTRIBUTION_OPERATOR_INFER_H_ #include -#include #include -#include +#include #include +#include -#include "parallel/tensor_layout/redistribution_layout_transfer.h" #include "parallel/tensor_layout/construct_operator.h" +#include "parallel/tensor_layout/redistribution_layout_transfer.h" #include "utils/convert_utils.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/shape_util.h b/mindspore/ccsrc/parallel/tensor_layout/shape_util.h index 5451af063e..85ca70969b 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/shape_util.h +++ b/mindspore/ccsrc/parallel/tensor_layout/shape_util.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_PARALLEL_TENSOR_LAYOUT_SHAPE_UTIL_H_ #include -#include -#include #include #include +#include +#include #include "parallel/status.h" diff --git a/mindspore/ccsrc/parallel/tensor_layout/tensor_info.h b/mindspore/ccsrc/parallel/tensor_layout/tensor_info.h index b24df6bbf2..9fc6a229e2 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/tensor_info.h +++ b/mindspore/ccsrc/parallel/tensor_layout/tensor_info.h @@ -19,12 +19,12 @@ #include #include -#include #include +#include +#include "parallel/device_matrix.h" #include "parallel/status.h" #include "parallel/tensor_layout/tensor_layout.h" -#include "parallel/device_matrix.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/tensor_layout.cc b/mindspore/ccsrc/parallel/tensor_layout/tensor_layout.cc index 9463b99ce6..f49b967abc 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/tensor_layout.cc +++ b/mindspore/ccsrc/parallel/tensor_layout/tensor_layout.cc @@ -15,15 +15,15 @@ */ #include "parallel/tensor_layout/tensor_layout.h" -#include #include -#include "parallel/status.h" -#include "utils/log_adapter.h" -#include "parallel/tensor_layout/shape_util.h" -#include "parallel/tensor_layout/array.h" +#include +#include "common/utils.h" #include "ir/value.h" #include "parallel/device_matrix.h" -#include "common/utils.h" +#include "parallel/status.h" +#include "parallel/tensor_layout/array.h" +#include "parallel/tensor_layout/shape_util.h" +#include "utils/log_adapter.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/tensor_layout.h b/mindspore/ccsrc/parallel/tensor_layout/tensor_layout.h index 0db356b8b1..238c9373d9 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/tensor_layout.h +++ b/mindspore/ccsrc/parallel/tensor_layout/tensor_layout.h @@ -22,11 +22,11 @@ #include #include #include +#include "parallel/device_manager.h" #include "parallel/status.h" #include "parallel/tensor_layout/arrangement.h" #include "parallel/tensor_layout/map.h" #include "utils/convert_utils.h" -#include "parallel/device_manager.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.cc b/mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.cc index 365a2be1cb..93bda5da81 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.cc +++ b/mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.cc @@ -18,9 +18,9 @@ #include #include #include +#include "common/utils.h" #include "parallel/status.h" #include "parallel/tensor_layout/shape_util.h" -#include "common/utils.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.h b/mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.h index daf474b3d7..38fb5959ad 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.h +++ b/mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.h @@ -18,18 +18,18 @@ #define MINDSPORE_CCSRC_PARALLEL_TENSOR_LAYOUT_TENSOR_REDISTRIBUTION_H_ #include -#include -#include #include #include +#include #include +#include #include "ir/value.h" -#include "parallel/status.h" -#include "parallel/tensor_layout/tensor_layout.h" #include "parallel/ops_info/operator_info.h" +#include "parallel/status.h" #include "parallel/tensor_layout/construct_operator.h" #include "parallel/tensor_layout/redistribution_operator_infer.h" +#include "parallel/tensor_layout/tensor_layout.h" namespace mindspore { namespace parallel {