m53297601
/
mindspore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

!187 refactor OperatorCostPtr in OperatorInfo

Browse Source 
Merge pull request !187 from chentingting/refactor_OperatorCostPtr_in_OperatorInfo
pull/187/MERGE
mindspore-ci-bot 5 years ago committed by Gitee
parent 481ad90bed b413638f23
commit 268d358a1d
27 changed files with 62 additions and 211 deletions
Show Stats Download Patch File Download Diff File

54
mindspore/ccsrc/parallel/auto_parallel/operator_costmodel.cc
Unescape View File

@ -514,60 +514,6 @@ double ArithmeticCost::GetBackwardCommCost(const std::vector<TensorInfo>& inputs
return result;
}
double L2NormalizeCost::GetBackwardCommCost(const std::vector<TensorInfo>& inputs, const std::vector<TensorInfo>&,
const int32_t& stage_id) const {
double result = 0.0;
if (is_parameter_[0]) {
TensorInfo input_tensor_info = inputs[0];
CheckGlobalDeviceManager();
MS_EXCEPTION_IF_NULL(g_device_manager);
auto total_device_num = g_device_manager->GetDeviceListByStageId(stage_id).size();
Shape input_shape = input_tensor_info.shape();
Shape input_slice_shape = input_tensor_info.slice_shape();
int32_t used_device_num = 1;
for (size_t i = 0; i < input_shape.size(); ++i) {
used_device_num *= input_shape[i] / input_slice_shape[i];
}
if (total_device_num != IntToSize(used_device_num))
result += ListProduct(input_slice_shape) * static_cast<double>(inputs_type_lengths_[0]);
}
return result;
}
double L2NormalizeCost::GetForwardComputationCost(const std::vector<TensorInfo>& inputs, const std::vector<TensorInfo>&,
const int32_t&) const {
TensorInfo input0_info = inputs[0];
Shape input0_slice_shape = input0_info.slice_shape();
return ListProduct(input0_slice_shape) * static_cast<double>(inputs_type_lengths_[0]);
}
double L2NormalizeCost::GetBackwardComputationCost(const std::vector<TensorInfo>& inputs,
const std::vector<TensorInfo>&, const int32_t& stage_id) const {
double result = 0.0;
if (is_parameter_[0]) {
TensorInfo input_tensor_info = inputs[0];
CheckGlobalDeviceManager();
MS_EXCEPTION_IF_NULL(g_device_manager);
auto total_device_num = g_device_manager->GetDeviceListByStageId(stage_id).size();
Shape input_shape = input_tensor_info.shape();
Shape input_slice_shape = input_tensor_info.slice_shape();
int32_t used_device_num = 1;
for (size_t i = 0; i < input_shape.size(); ++i) {
used_device_num *= input_shape[i] / input_slice_shape[i];
}
if (total_device_num != IntToSize(used_device_num))
result += ListProduct(input_slice_shape) * static_cast<double>(inputs_type_lengths_[0]);
}
return result;
}
bool IsDataParallel(const Shape& shape, const Shape& slice_shape, const int32_t& stage_id) {
CheckGlobalDeviceManager();
MS_EXCEPTION_IF_NULL(g_device_manager);

30
mindspore/ccsrc/parallel/auto_parallel/operator_costmodel.h
Unescape View File

@ -132,6 +132,8 @@ class ActivationCost : public OperatorCost {
};
using ActivationCostPtr = std::shared_ptr<ActivationCost>;
using TransposeCost = ActivationCost;
using TransposeCostPtr = std::shared_ptr<TransposeCost>;
class SoftmaxCost : public OperatorCost {
public:
@ -415,32 +417,8 @@ class ArithmeticCost : public OperatorCost {
const int32_t& stage_id) const override;
};
using ArithmeticCostPtr = std::shared_ptr<ArithmeticCost>;
class L2NormalizeCost : public OperatorCost {
public:
L2NormalizeCost() = default;
~L2NormalizeCost() override = default;
double GetCommCost(const std::vector<TensorInfo>& inputs, const std::vector<TensorInfo>& outputs,
const int32_t& stage_id) const override {
return GetForwardCommCost(inputs, outputs, stage_id) + GetBackwardCommCost(inputs, outputs, stage_id);
}
double GetForwardCommCost(const std::vector<TensorInfo>&, const std::vector<TensorInfo>&,
const int32_t&) const override {
return 0.0;
}
double GetBackwardCommCost(const std::vector<TensorInfo>& inputs, const std::vector<TensorInfo>& outputs,
const int32_t& stage_id) const override;
double GetComputationCost(const std::vector<TensorInfo>& inputs, const std::vector<TensorInfo>& outputs,
const int32_t& stage_id) const override {
return GetForwardComputationCost(inputs, outputs, stage_id) + GetBackwardComputationCost(inputs, outputs, stage_id);
}
double GetForwardComputationCost(const std::vector<TensorInfo>& inputs, const std::vector<TensorInfo>& outputs,
const int32_t& stage_id) const override;
double GetBackwardComputationCost(const std::vector<TensorInfo>& inputs, const std::vector<TensorInfo>& outputs,
const int32_t& stage_id) const override;
};
using L2NormalizeCostPtr = std::shared_ptr<L2NormalizeCost>;
using BiasAddCost = ArithmeticCost;
using BiasAddCostPtr = std::shared_ptr<BiasAddCost>;
class ReduceMethodCost : public OperatorCost {
public:

18
mindspore/ccsrc/parallel/ops_info/activation_info.h
Unescape View File

@ -32,8 +32,8 @@ namespace parallel {
class ActivationBase : public OperatorInfo {
public:
ActivationBase(const std::string& operator_name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: OperatorInfo(operator_name, inputs_shape, outputs_shape, attrs) {}
const PrimitiveAttrs& attrs, OperatorCostPtr cost)
: OperatorInfo(operator_name, inputs_shape, outputs_shape, attrs, cost) {}
~ActivationBase() override = default;
Status Init(const StrategyPtr& strategy) override;
@ -51,19 +51,13 @@ class Activation : public ActivationBase {
public:
Activation(const std::string& name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: ActivationBase(name, inputs_shape, outputs_shape, attrs) {
ac_cost_ptr_ = std::make_shared<ActivationCost>();
}
: ActivationBase(name, inputs_shape, outputs_shape, attrs, std::make_shared<ActivationCost>()) {}
~Activation() override = default;
Status GenerateStrategies(int32_t stage_id) override;
Status SetCostUnderStrategy(const StrategyPtr& strategy) override;
OperatorCostPtr GetOperatorCost() const override { return ac_cost_ptr_; }
protected:
Status CheckStrategy(const StrategyPtr& strategy) override;
private:
ActivationCostPtr ac_cost_ptr_;
};
class ActivationInfo : public Activation {
@ -108,13 +102,10 @@ class Softmax : public ActivationBase {
public:
explicit Softmax(const std::string& name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: ActivationBase(name, inputs_shape, outputs_shape, attrs) {
sm_cost_ptr_ = std::make_shared<SoftmaxCost>();
}
: ActivationBase(name, inputs_shape, outputs_shape, attrs, std::make_shared<SoftmaxCost>()) {}
~Softmax() override = default;
Status GenerateStrategies(int32_t stage_id) override;
Status SetCostUnderStrategy(const StrategyPtr& strategy) override;
OperatorCostPtr GetOperatorCost() const override { return sm_cost_ptr_; }
protected:
Status CheckStrategy(const StrategyPtr& strategy) override;
@ -122,7 +113,6 @@ class Softmax : public ActivationBase {
private:
std::vector<int32_t> axis_;
SoftmaxCostPtr sm_cost_ptr_;
};
class SoftmaxInfo : public Softmax {

6
mindspore/ccsrc/parallel/ops_info/arithmetic_info.h
Unescape View File

@ -33,15 +33,12 @@ class ArithmeticBase : public OperatorInfo {
public:
ArithmeticBase(const std::string& operator_name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: OperatorInfo(operator_name, inputs_shape, outputs_shape, attrs) {
arithmeticcost_ptr_ = std::make_shared<ArithmeticCost>();
}
: OperatorInfo(operator_name, inputs_shape, outputs_shape, attrs, std::make_shared<ArithmeticCost>()) {}
~ArithmeticBase() override = default;
Status Init(const StrategyPtr& strategy) override;
Status InitForCostModel(const StrategyPtr& strategy) override;
Status GenerateStrategies(int32_t) override;
Status SetCostUnderStrategy(const StrategyPtr&) override;
OperatorCostPtr GetOperatorCost() const override { return arithmeticcost_ptr_; }
void ReComputeBatchSplitFlagList() override;
protected:
@ -54,7 +51,6 @@ class ArithmeticBase : public OperatorInfo {
Status InferTensorMap() override;
Status InferTensorLayout(TensorLayouts* inputs_layout, TensorLayouts* outputs_layout, const Shape& dev_matrix_array);
Shapes InferExpendShape();
ArithmeticCostPtr arithmeticcost_ptr_;
};
class SubInfo : public ArithmeticBase {

6
mindspore/ccsrc/parallel/ops_info/batch_parallel_info.h
Unescape View File

@ -31,16 +31,13 @@ class BatchParallelInfo : public OperatorInfo {
public:
BatchParallelInfo(const std::string& name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: OperatorInfo(name, inputs_shape, outputs_shape, attrs), dev_num_(1) {
bp_cost_ptr_ = std::make_shared<BatchParallelCost>();
}
: OperatorInfo(name, inputs_shape, outputs_shape, attrs, std::make_shared<BatchParallelCost>()), dev_num_(1) {}
~BatchParallelInfo() override = default;
Status Init(const StrategyPtr& strategy) override;
Status InitForCostModel(const StrategyPtr& strategy) override;
Status GenerateStrategies(int32_t stage_id) override;
Status SetCostUnderStrategy(const StrategyPtr& strategy) override;
OperatorCostPtr GetOperatorCost() const override { return bp_cost_ptr_; }
protected:
Status CheckStrategy(const StrategyPtr& strategy) override;
@ -55,7 +52,6 @@ class BatchParallelInfo : public OperatorInfo {
private:
int32_t dev_num_;
BatchParallelCostPtr bp_cost_ptr_;
};
class SparseSoftmaxCrossEntropyWithLogitsInfo : public BatchParallelInfo {

6
mindspore/ccsrc/parallel/ops_info/bias_add_info.h
Unescape View File

@ -34,16 +34,13 @@ class BiasAddInfo : public OperatorInfo {
public:
BiasAddInfo(const std::string& operator_name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: OperatorInfo(operator_name, inputs_shape, outputs_shape, attrs) {
biasaddcost_ptr_ = std::make_shared<ArithmeticCost>();
}
: OperatorInfo(operator_name, inputs_shape, outputs_shape, attrs, std::make_shared<BiasAddCost>()) {}
~BiasAddInfo() override = default;
Status Init(const StrategyPtr& strategy) override;
Status InitForCostModel(const StrategyPtr& strategy) override;
Status GenerateStrategies(int32_t) override;
Status SetCostUnderStrategy(const StrategyPtr&) override;
OperatorCostPtr GetOperatorCost() const override { return biasaddcost_ptr_; }
void ReComputeBatchSplitFlagList() override;
protected:
@ -55,7 +52,6 @@ class BiasAddInfo : public OperatorInfo {
Status InferDevMatrixShape() override;
Status InferTensorMap() override;
Status InferTensorLayout(TensorLayouts* inputs_layout, TensorLayouts* outputs_layout, const Shape& dev_matrix_array);
ArithmeticCostPtr biasaddcost_ptr_;
};
} // namespace parallel
} // namespace mindspore

8
mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.h
Unescape View File

@ -33,15 +33,12 @@ class DropoutDoMaskInfo : public OperatorInfo {
public:
DropoutDoMaskInfo(const std::string& name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: OperatorInfo(name, inputs_shape, outputs_shape, attrs) {
bpcost_ptr_ = std::make_shared<BatchParallelCost>();
}
: OperatorInfo(name, inputs_shape, outputs_shape, attrs, std::make_shared<BatchParallelCost>()) {}
~DropoutDoMaskInfo() override = default;
Status Init(const StrategyPtr& strategy) override;
Status GenerateStrategies(int32_t stage_id) override;
Status SetCostUnderStrategy(const StrategyPtr& strategy) override;
OperatorCostPtr GetOperatorCost() const override { return bpcost_ptr_; }
Status InitForCostModel(const StrategyPtr& strategy) override;
std::shared_ptr<std::vector<std::vector<int32_t>>> GenerateBatchStrategies() override;
@ -53,9 +50,6 @@ class DropoutDoMaskInfo : public OperatorInfo {
Status GetAttrs() override { return SUCCESS; }
Status InferTensorInfo() override;
Status InferDevMatrixShape() override;
private:
BatchParallelCostPtr bpcost_ptr_;
};
} // namespace parallel
} // namespace mindspore

6
mindspore/ccsrc/parallel/ops_info/generator_info.h
Unescape View File

@ -32,15 +32,12 @@ class GeneratorBase : public OperatorInfo {
public:
GeneratorBase(const std::string &operator_name, const Shapes &inputs_shape, const Shapes &outputs_shape,
const PrimitiveAttrs &attrs)
: OperatorInfo(operator_name, inputs_shape, outputs_shape, attrs) {
generatorbasecost_ptr_ = std::make_shared<GeneratorBaseCost>();
}
: OperatorInfo(operator_name, inputs_shape, outputs_shape, attrs, std::make_shared<GeneratorBaseCost>()) {}
~GeneratorBase() override = default;
Status Init(const StrategyPtr &strategy) override;
Status SetCostUnderStrategy(const StrategyPtr &strategy) override;
OperatorCostPtr GetOperatorCost() const override { return generatorbasecost_ptr_; }
Status InitForCostModel(const StrategyPtr &strategy) override;
protected:
@ -52,7 +49,6 @@ class GeneratorBase : public OperatorInfo {
Status InferMirrorOps() override { return SUCCESS; }
Status InferForwardCommunication() override { return SUCCESS; }
virtual Status InferReplaceOps(const StrategyPtr &strategy) = 0;
GeneratorBaseCostPtr generatorbasecost_ptr_;
};
class DropoutGenMaskInfo : public GeneratorBase {

6
mindspore/ccsrc/parallel/ops_info/get_next_info.h
Unescape View File

@ -32,14 +32,11 @@ class GetNextInfo : public OperatorInfo {
public:
GetNextInfo(const std::string &operator_name, const Shapes &inputs_shape, const Shapes &outputs_shape,
const PrimitiveAttrs &attrs)
: OperatorInfo(operator_name, inputs_shape, outputs_shape, attrs) {
getnextcost_ptr_ = std::make_shared<GetNextCost>();
}
: OperatorInfo(operator_name, inputs_shape, outputs_shape, attrs, std::make_shared<GetNextCost>()) {}
~GetNextInfo() override = default;
Status Init(const StrategyPtr &strategy) override;
Status SetCostUnderStrategy(const StrategyPtr &strategy) override;
OperatorCostPtr GetOperatorCost() const override { return getnextcost_ptr_; }
Status InitForCostModel(const StrategyPtr &strategy) override;
Status GenerateStrategies(int32_t stage_id) override;
@ -65,7 +62,6 @@ class GetNextInfo : public OperatorInfo {
Shapes shapes_;
int32_t output_num_ = 0;
std::string shared_name_;
GetNextCostPtr getnextcost_ptr_;
};
} // namespace parallel
} // namespace mindspore

6
mindspore/ccsrc/parallel/ops_info/l2_normalize_info.h
Unescape View File

@ -33,12 +33,9 @@ class L2NormalizeInfo : public Activation {
public:
L2NormalizeInfo(const std::string& name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: Activation(name, inputs_shape, outputs_shape, attrs) {
l2normalizecost_ptr_ = std::make_shared<L2NormalizeCost>();
}
: Activation(name, inputs_shape, outputs_shape, attrs) {}
~L2NormalizeInfo() override = default;
Status GenerateStrategies(int32_t stage_id) override;
OperatorCostPtr GetOperatorCost() const override { return l2normalizecost_ptr_; }
protected:
Status GetAttrs() override;
@ -47,7 +44,6 @@ class L2NormalizeInfo : public Activation {
private:
int32_t axis_ = 0; // Default value = 0
L2NormalizeCostPtr l2normalizecost_ptr_;
};
} // namespace parallel
} // namespace mindspore

6
mindspore/ccsrc/parallel/ops_info/loss_info.h
Unescape View File

@ -36,16 +36,13 @@ class SoftmaxCrossEntropyWithLogitsInfo : public OperatorInfo {
public:
SoftmaxCrossEntropyWithLogitsInfo(const std::string& name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: OperatorInfo(name, inputs_shape, outputs_shape, attrs) {
softmax_loss_cost_ptr_ = std::make_shared<SoftmaxCrossEntropyWithLogitsCost>();
}
: OperatorInfo(name, inputs_shape, outputs_shape, attrs, std::make_shared<SoftmaxCrossEntropyWithLogitsCost>()) {}
~SoftmaxCrossEntropyWithLogitsInfo() override = default;
Status Init(const StrategyPtr& strategy) override;
Status InitForCostModel(const StrategyPtr& strategy) override;
Status GenerateStrategies(int32_t stage_id) override;
Status SetCostUnderStrategy(const StrategyPtr& strategy) override;
OperatorCostPtr GetOperatorCost() const override { return softmax_loss_cost_ptr_; }
void ReComputeBatchSplitFlagList() override;
protected:
@ -59,7 +56,6 @@ class SoftmaxCrossEntropyWithLogitsInfo : public OperatorInfo {
// There are two outputs for SoftmaxCrossEntropyWithLogits, and outputs[1] is used for grad and overload
// the InferAsLossDivisor.
Status InferAsLossDivisor() override;
SoftmaxCrossEntropyWithLogitsCostPtr softmax_loss_cost_ptr_;
private:
int32_t axis_ = -1; // default -1

6
mindspore/ccsrc/parallel/ops_info/matmul_info.cc
Unescape View File

@ -593,11 +593,11 @@ Status MatMulBase::SetCostUnderStrategy(const mindspore::parallel::StrategyPtr&
// Here, we use the origin outputs_, because we only use the slice size of the output tensor.
// It does not matter whether the output tensor is transposed or not.
double computation_cost =
matmulcost_ptr->GetForwardComputationCost(relica_inputs_tensor_vector, outputs_tensor_info_, stage_id);
double communication_cost = matmulcost_ptr->GetCommCost(relica_inputs_tensor_vector, outputs_tensor_info_, stage_id);
cost()->GetForwardComputationCost(relica_inputs_tensor_vector, outputs_tensor_info_, stage_id);
double communication_cost = cost()->GetCommCost(relica_inputs_tensor_vector, outputs_tensor_info_, stage_id);
std::shared_ptr<Cost> result = std::make_shared<Cost>(computation_cost, communication_cost);
result->communication_without_parameter_ =
matmulcost_ptr->GetForwardCommCost(relica_inputs_tensor_vector, outputs_tensor_info_, stage_id);
cost()->GetForwardCommCost(relica_inputs_tensor_vector, outputs_tensor_info_, stage_id);
result->communication_with_partial_para_ =
result->communication_without_parameter_ +
COST_MODEL_GAMMA * (communication_cost - result->communication_without_parameter_);

7
mindspore/ccsrc/parallel/ops_info/matmul_info.h
Unescape View File

@ -34,9 +34,7 @@ class MatMulBase : public OperatorInfo {
public:
MatMulBase(const std::string& name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: OperatorInfo(name, inputs_shape, outputs_shape, attrs) {
matmulcost_ptr = std::make_shared<MatMulCost>();
}
: OperatorInfo(name, inputs_shape, outputs_shape, attrs, std::make_shared<MatMulCost>()) {}
~MatMulBase() override = default;
Status Init(const StrategyPtr& strategy) override;
@ -48,7 +46,6 @@ class MatMulBase : public OperatorInfo {
Status PrepareStrategy(int32_t stage_id, size_t dev_num, Dimensions combined_partitions, size_t input0_shape_size,
size_t input1_shape_size, StrategyPtr* sp);
OperatorCostPtr GetOperatorCost() const override { return matmulcost_ptr; }
Status SwapLastTwoElements(Shape* shape);
protected:
@ -66,8 +63,6 @@ class MatMulBase : public OperatorInfo {
bool transpose_b_ = false;
size_t mat_a_dimension_ = 0;
size_t mat_b_dimension_ = 0;
MatMulCostPtr matmulcost_ptr;
};
class MatMul : public MatMulBase {

6
mindspore/ccsrc/parallel/ops_info/onehot_info.h
Unescape View File

@ -33,16 +33,13 @@ class OneHotInfo : public OperatorInfo {
public:
OneHotInfo(const std::string& name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: OperatorInfo(name, inputs_shape, outputs_shape, attrs) {
onehot_cost_ptr_ = std::make_shared<OneHotCost>();
}
: OperatorInfo(name, inputs_shape, outputs_shape, attrs, std::make_shared<OneHotCost>()) {}
~OneHotInfo() override = default;
Status Init(const StrategyPtr& strategy) override;
Status InitForCostModel(const StrategyPtr& strategy) override;
Status GenerateStrategies(int32_t stage_id) override;
Status SetCostUnderStrategy(const StrategyPtr& strategy) override;
OperatorCostPtr GetOperatorCost() const override { return onehot_cost_ptr_; }
ReplaceGraphPtr replace_graph(const CNodePtr& cnode) override;
std::shared_ptr<std::vector<std::vector<int32_t>>> GenerateBatchStrategies() override;
@ -60,7 +57,6 @@ class OneHotInfo : public OperatorInfo {
Status ComputeReplaceGraph(const CNodePtr& cnode);
int axis_ = -1;
OneHotCostPtr onehot_cost_ptr_;
int32_t rank_ = 0;
int32_t total_class_number_ = 1;
int32_t classes_each_device_ = 1;

13
mindspore/ccsrc/parallel/ops_info/operator_info.cc
Unescape View File

@ -1034,12 +1034,11 @@ Status OperatorInfo::SetCostUnderStrategyBase(const StrategyPtr& strategy) {
return FAILED;
}
int32_t stage_id = strategy->GetInputStage();
double computation_cost =
GetOperatorCost()->GetForwardComputationCost(inputs_tensor_info_, outputs_tensor_info_, stage_id);
double communication_cost = GetOperatorCost()->GetCommCost(inputs_tensor_info_, outputs_tensor_info_, stage_id);
double computation_cost = cost()->GetForwardComputationCost(inputs_tensor_info_, outputs_tensor_info_, stage_id);
double communication_cost = cost()->GetCommCost(inputs_tensor_info_, outputs_tensor_info_, stage_id);
std::shared_ptr<Cost> result = std::make_shared<Cost>(computation_cost, communication_cost);
result->communication_without_parameter_ =
GetOperatorCost()->GetForwardCommCost(inputs_tensor_info_, outputs_tensor_info_, stage_id);
cost()->GetForwardCommCost(inputs_tensor_info_, outputs_tensor_info_, stage_id);
result->communication_with_partial_para_ =
result->communication_without_parameter_ +
COST_MODEL_GAMMA * (communication_cost - result->communication_without_parameter_);
@ -1096,7 +1095,7 @@ Status OperatorInfo::set_is_parameter(const std::vector<bool>& is_parameter) {
return FAILED;
}
is_parameter_ = is_parameter;
GetOperatorCost()->set_is_parameter(is_parameter);
cost()->set_is_parameter(is_parameter);
return SUCCESS;
}
@ -1193,7 +1192,7 @@ Status OperatorInfo::SetInputAndOutputTypeLength(const std::vector<size_t>& inpu
}
inputs_type_lengths_ = input_lengths;
outputs_type_lengths_ = output_lengths;
GetOperatorCost()->SetInputAndOutputTypeLength(input_lengths, output_lengths);
cost()->SetInputAndOutputTypeLength(input_lengths, output_lengths);
return SUCCESS;
}
@ -1211,7 +1210,7 @@ void OperatorInfo::BreakingTiesForPerferringDataParallel(const StrategyPtr& stra
}
double OperatorInfo::GetForwardMemoryCostFromCNode() {
return GetOperatorCost()->GetForwardComputationCost(inputs_tensor_info_, outputs_tensor_info_, 0);
return cost()->GetForwardComputationCost(inputs_tensor_info_, outputs_tensor_info_, 0);
}
} // namespace parallel

13
mindspore/ccsrc/parallel/ops_info/operator_info.h
Unescape View File

@ -53,12 +53,13 @@ class Edge;
class OperatorInfo {
public:
OperatorInfo(std::string name, Shapes inputs_shape, Shapes outputs_shape, PrimitiveAttrs attrs)
OperatorInfo(std::string name, Shapes inputs_shape, Shapes outputs_shape, PrimitiveAttrs attrs, OperatorCostPtr cost)
: name_(std::move(name)),
inputs_shape_(std::move(inputs_shape)),
outputs_shape_(std::move(outputs_shape)),
attrs_(std::move(attrs)),
is_alive_(true) {
is_alive_(true),
cost_(cost) {
std::vector<bool> not_parameteter(inputs_shape_.size(), false);
is_parameter_ = not_parameteter;
refkey_parameter_name_ = "";
@ -75,7 +76,8 @@ class OperatorInfo {
// Given the stage_id (which indicates the number of devices),
// generate all strategies for this operator
virtual Status GenerateStrategies(int32_t stage_id) = 0;
virtual OperatorCostPtr GetOperatorCost() const = 0;
const OperatorCostPtr& cost() const { return cost_; }
void set_cost(const OperatorCostPtr& cost) { cost_ = cost; }
virtual Status SetCostUnderStrategy(const StrategyPtr& strategy) = 0;
virtual std::shared_ptr<std::vector<std::vector<int32_t>>> GenerateBatchStrategies();
@ -115,7 +117,7 @@ class OperatorInfo {
void ReplaceSuccEdge(const std::shared_ptr<OperatorInfo>& op, const std::shared_ptr<Edge>& new_edge);
void ReplacePreEdges(const std::shared_ptr<OperatorInfo>& op, const std::shared_ptr<Edge>& new_edge);
void ReplaceSuccEdges(const std::shared_ptr<OperatorInfo>& op, const std::shared_ptr<Edge>& new_edge);
std::vector<size_t> GetOutputTypeLengths() const { return GetOperatorCost()->outputs_type_lengths(); }
std::vector<size_t> GetOutputTypeLengths() const { return cost()->outputs_type_lengths(); }
void SetSelectedStrategyAndCost(const StrategyPtr& s_strategy, const CostPtr& cost) {
selected_strategy_ = s_strategy;
selected_cost_ = cost;
@ -221,6 +223,9 @@ class OperatorInfo {
std::string refkey_parameter_name_;
CNodePtr cnode_;
int32_t used_devices_ = -1;
private:
OperatorCostPtr cost_;
};
Shape GetSliceShape(const Shape& tensor_shape, const Dimensions& strategy);

6
mindspore/ccsrc/parallel/ops_info/prelu_info.h
Unescape View File

@ -35,15 +35,12 @@ class PReLUInfo : public OperatorInfo {
public:
PReLUInfo(const std::string& name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: OperatorInfo(name, inputs_shape, outputs_shape, attrs) {
prelucost_ptr = std::make_shared<PReLUCost>();
}
: OperatorInfo(name, inputs_shape, outputs_shape, attrs, std::make_shared<PReLUCost>()) {}
~PReLUInfo() override = default;
Status Init(const StrategyPtr& strategy) override;
Status InitForCostModel(const StrategyPtr& strategy) override;
Status GenerateStrategies(int32_t stage_id) override;
OperatorCostPtr GetOperatorCost() const override { return prelucost_ptr; }
Status SetCostUnderStrategy(const StrategyPtr& strategy) override;
protected:
@ -59,7 +56,6 @@ class PReLUInfo : public OperatorInfo {
private:
Dimensions input_strategy_;
PReLUCostPtr prelucost_ptr;
};
} // namespace parallel
} // namespace mindspore

8
mindspore/ccsrc/parallel/ops_info/reduce_method_info.cc
Unescape View File

@ -109,8 +109,12 @@ Status ReduceMethod::GetAttrs() {
}
cross_batch_ = cross_batch_iter->second->cast<BoolImmPtr>()->value();
}
reducemethodcost_ptr_->set_cross_batch(cross_batch_);
auto reducemethodcost = std::dynamic_pointer_cast<ReduceMethodCost>(cost());
if (reducemethodcost == nullptr) {
MS_LOG(ERROR) << "Cost cast to ReduceMethodCostPtr failed!";
return FAILED;
}
reducemethodcost->set_cross_batch(cross_batch_);
return SUCCESS;
}

8
mindspore/ccsrc/parallel/ops_info/reduce_method_info.h
Unescape View File

@ -34,9 +34,7 @@ class ReduceMethod : public OperatorInfo {
public:
ReduceMethod(const std::string &name, const Shapes &inputs_shape, const Shapes &outputs_shape,
const PrimitiveAttrs &attrs)
: OperatorInfo(name, inputs_shape, outputs_shape, attrs) {
reducemethodcost_ptr_ = std::make_shared<ReduceMethodCost>();
}
: OperatorInfo(name, inputs_shape, outputs_shape, attrs, std::make_shared<ReduceMethodCost>()) {}
~ReduceMethod() override = default;
Status Init(const StrategyPtr &strategy) override;
@ -44,13 +42,11 @@ class ReduceMethod : public OperatorInfo {
Status GenerateStrategies(int32_t stage_id) override;
Status SetCostUnderStrategy(const StrategyPtr &strategy) override;
OperatorCostPtr GetOperatorCost() const override { return reducemethodcost_ptr_; }
protected:
std::string reduce_method_;
bool keepdims_ = false;
bool cross_batch_ = false;
ReduceMethodCostPtr reducemethodcost_ptr_;
Status CheckStrategy(const StrategyPtr &strategy) override;
Status GetAttrs() override;
Dimensions InferOutputStrategy();
@ -110,7 +106,7 @@ class ReduceMeanInfo : public ReduceMethod {
ReduceMeanInfo(const std::string &name, const Shapes &inputs_shape, const Shapes &outputs_shape,
const PrimitiveAttrs &attrs)
: ReduceMethod(name, inputs_shape, outputs_shape, attrs) {
reducemethodcost_ptr_ = std::make_shared<ReduceMeanCost>();
set_cost(std::make_shared<ReduceMeanCost>());
}
~ReduceMeanInfo() override = default;

8
mindspore/ccsrc/parallel/ops_info/reshape_info.h
Unescape View File

@ -36,12 +36,10 @@ class ReshapeInfo : public OperatorInfo {
public:
ReshapeInfo(const std::string& name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: OperatorInfo(name, inputs_shape, outputs_shape, attrs),
: OperatorInfo(name, inputs_shape, outputs_shape, attrs, std::make_shared<ReshapeCost>()),
dev_num_(0),
input_layout_set_flag_(false),
output_layout_set_flag_(false) {
reshape_cost_ptr_ = std::make_shared<ReshapeCost>();
}
output_layout_set_flag_(false) {}
~ReshapeInfo() override = default;
Status Init(const StrategyPtr& strategy) override;
void SetInputLayout(const TensorLayout& input_layout) {
@ -55,7 +53,6 @@ class ReshapeInfo : public OperatorInfo {
Status InitForCostModel(const StrategyPtr& strategy) override;
Status GenerateStrategies(int32_t stage_id) override;
Status SetCostUnderStrategy(const StrategyPtr& strategy) override;
OperatorCostPtr GetOperatorCost() const override { return reshape_cost_ptr_; }
protected:
Status CheckStrategy(const StrategyPtr& strategy) override;
@ -67,7 +64,6 @@ class ReshapeInfo : public OperatorInfo {
Status InferTensorLayout(TensorLayouts* inputs_layout, TensorLayouts* outputs_layout);
Status GetAttrs() override;
Strategys GetOutputsStrategy();
ReshapeCostPtr reshape_cost_ptr_;
private:
Status GetParameterInput();

8
mindspore/ccsrc/parallel/ops_info/tmp_identity_info.h
Unescape View File

@ -34,9 +34,7 @@ class TmpIdentityInfo : public OperatorInfo {
public:
TmpIdentityInfo(const Shapes& inputs_shape, const Shapes& outputs_shape, const PrimitiveAttrs& attrs,
const std::string& name = IDENTITY_INFO)
: OperatorInfo(name, inputs_shape, outputs_shape, attrs) {
id_cost_ptr_ = std::make_shared<TmpIdentityCost>();
}
: OperatorInfo(name, inputs_shape, outputs_shape, attrs, std::make_shared<TmpIdentityCost>()) {}
~TmpIdentityInfo() override = default;
Status Init(const StrategyPtr& strategy) override;
@ -44,7 +42,6 @@ class TmpIdentityInfo : public OperatorInfo {
Status GenerateStrategies(int32_t stage_id) override;
Status SetCostUnderStrategy(const StrategyPtr& strategy) override;
OperatorCostPtr GetOperatorCost() const override { return id_cost_ptr_; }
protected:
Status CheckStrategy(const StrategyPtr& strategy) override;
@ -54,9 +51,6 @@ class TmpIdentityInfo : public OperatorInfo {
Status InferTensorInfo() override;
Status InferDevMatrixShape() override;
Status InferTensorMap() override;
private:
TmpIdentityCostPtr id_cost_ptr_;
};
} // namespace parallel
} // namespace mindspore

6
mindspore/ccsrc/parallel/ops_info/transpose_info.h
Unescape View File

@ -35,15 +35,12 @@ class TransposeInfo : public OperatorInfo {
public:
TransposeInfo(const std::string& name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: OperatorInfo(name, inputs_shape, outputs_shape, attrs) {
transpose_cost_ptr_ = std::make_shared<ActivationCost>();
}
: OperatorInfo(name, inputs_shape, outputs_shape, attrs, std::make_shared<TransposeCost>()) {}
~TransposeInfo() override = default;
Status Init(const StrategyPtr& strategy) override;
Status InitForCostModel(const StrategyPtr& strategy) override;
Status GenerateStrategies(int32_t stage_id) override;
Status SetCostUnderStrategy(const StrategyPtr& strategy) override;
OperatorCostPtr GetOperatorCost() const override { return transpose_cost_ptr_; }
protected:
Status CheckStrategy(const StrategyPtr& strategy) override;
@ -60,7 +57,6 @@ class TransposeInfo : public OperatorInfo {
Status ComputeAxis();
std::vector<int32_t> axis_v_;
Dimensions input_strategy_;
ActivationCostPtr transpose_cost_ptr_;
};
} // namespace parallel
} // namespace mindspore

8
mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.h
Unescape View File

@ -32,16 +32,13 @@ class VirtualDatasetInfo : public OperatorInfo {
public:
VirtualDatasetInfo(const std::string& name, const Shapes& inputs_shape, const Shapes& outputs_shape,
const PrimitiveAttrs& attrs)
: OperatorInfo(name, inputs_shape, outputs_shape, attrs) {
vd_cost_ptr_ = std::make_shared<VirtualDatasetCost>();
}
: OperatorInfo(name, inputs_shape, outputs_shape, attrs, std::make_shared<VirtualDatasetCost>()) {}
~VirtualDatasetInfo() override = default;
Status Init(const StrategyPtr& strategy) override;
Status InitForCostModel(const StrategyPtr& strategy) override;
Status GenerateStrategies(int32_t stage_id) override;
Status SetCostUnderStrategy(const StrategyPtr& strategy) override;
OperatorCostPtr GetOperatorCost() const override { return vd_cost_ptr_; }
void ReComputeBatchSplitFlagList() override;
protected:
@ -53,9 +50,6 @@ class VirtualDatasetInfo : public OperatorInfo {
Status InferTensorMap() override;
Status GetAttrs() override;
Status InferAsLossDivisor() override;
private:
VirtualDatasetCostPtr vd_cost_ptr_;
};
} // namespace parallel

8
tests/ut/cpp/parallel/ops_info/activation_test.cc
Unescape View File

@ -84,9 +84,9 @@ TEST_F(TestActivation, test_activation_strategies) {
act_ptr_->InitForCostModel(sp);
std::vector<TensorInfo> inputs_info = act_ptr_->inputs_tensor_info();
std::vector<TensorInfo> outputs_info = act_ptr_->outputs_tensor_info();
ASSERT_DOUBLE_EQ(act_ptr_->GetOperatorCost()->GetComputationCost(inputs_info, outputs_info, sp->GetInputStage()),
ASSERT_DOUBLE_EQ(act_ptr_->cost()->GetComputationCost(inputs_info, outputs_info, sp->GetInputStage()),
cost.computation_cost_);
ASSERT_DOUBLE_EQ(act_ptr_->GetOperatorCost()->GetCommCost(inputs_info, outputs_info, sp->GetInputStage()),
ASSERT_DOUBLE_EQ(act_ptr_->cost()->GetCommCost(inputs_info, outputs_info, sp->GetInputStage()),
cost.communication_cost_);
}
}
@ -109,9 +109,9 @@ TEST_F(TestActivation, test_softmax_strategies) {
soft_ptr_->InitForCostModel(sp);
std::vector<TensorInfo> inputs_info = soft_ptr_->inputs_tensor_info();
std::vector<TensorInfo> outputs_info = soft_ptr_->outputs_tensor_info();
ASSERT_DOUBLE_EQ(soft_ptr_->GetOperatorCost()->GetComputationCost(inputs_info, outputs_info, sp->GetInputStage()),
ASSERT_DOUBLE_EQ(soft_ptr_->cost()->GetComputationCost(inputs_info, outputs_info, sp->GetInputStage()),
cost.computation_cost_);
ASSERT_DOUBLE_EQ(soft_ptr_->GetOperatorCost()->GetCommCost(inputs_info, outputs_info, sp->GetInputStage()),
ASSERT_DOUBLE_EQ(soft_ptr_->cost()->GetCommCost(inputs_info, outputs_info, sp->GetInputStage()),
cost.communication_cost_);
}
}

4
tests/ut/cpp/parallel/ops_info/matmul_info_test.cc
Unescape View File

@ -569,7 +569,7 @@ TEST_F(TestMatmulInfo, test_GenerateStrategies1) {
matmul1->InitForCostModel(sp);
std::vector<TensorInfo> inputs_info = matmul1->inputs_tensor_info();
std::vector<TensorInfo> outputs_info = matmul1->outputs_tensor_info();
ASSERT_DOUBLE_EQ(matmul1->GetOperatorCost()->GetComputationCost(inputs_info, outputs_info, sp->GetInputStage()),
ASSERT_DOUBLE_EQ(matmul1->cost()->GetComputationCost(inputs_info, outputs_info, sp->GetInputStage()),
cost.computation_cost_);
break;
}
@ -599,7 +599,7 @@ TEST_F(TestMatmulInfo, test_GenerateStrategies2) {
TensorInfo replica_input1_info(tly, input1_shape, input1_slice_shape);
replica_inputs_info.push_back(replica_input1_info);
ASSERT_DOUBLE_EQ(matmul3->GetOperatorCost()->GetComputationCost(replica_inputs_info, outputs_info, sp->GetInputStage()),
ASSERT_DOUBLE_EQ(matmul3->cost()->GetComputationCost(replica_inputs_info, outputs_info, sp->GetInputStage()),
cost.computation_cost_);
break;
}

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save