p60975123
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!23582 Clean pclint warning && opt some error log 

Merge pull request !23582 from liangzelang/opt_error_log
This commit is contained in:
i-robot 2021-09-16 06:55:57 +00:00 committed by Gitee
parent 09dd495070 8bb30fa029
commit 22aebf4678
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mindspore/ccsrc/backend/session/ascend_session.cc
View File

@ -97,6 +97,7 @@ const size_t kLoopSinkTensorNum = 3;
const size_t kLoopSinkCurLoopIndex = 0;
const size_t kLoopSinkNextLoopIndex = 1;
const size_t kLoopSinkEpochIndex = 2;
const size_t kLabelNumsThreshold = 1023;
constexpr char SR_TAG[] = "sr_tag";
constexpr char BACKWARD[] = "backward";
constexpr auto kUnknowErrorString = "Unknown error occurred";
@ -540,7 +541,7 @@ GraphId AscendSession::CompileGraphImpl(NotNull<FuncGraphPtr> func_graph) {
// add make_tuple to the output graph
AnfAlgo::InsertMakeTupleForOutput(NOT_NULL(root_graph));
// root root_graph valiate,include genearte execute order and so on
RootGraphExecutorValidate(NOT_NULL(root_graph));
RootGraphExecutorValidate(NOT_NULL(root_graph), all_graphs);
#ifdef ENABLE_DUMP_IR
// dump graph before remove nop nodes
auto context_ptr = MsContext::GetInstance();
@ -1697,9 +1698,15 @@ void AscendSession::SyncInitialTenosrToDevice() {
}
}
void AscendSession::RootGraphExecutorValidate(NotNull<KernelGraphPtr> graph) {
void AscendSession::RootGraphExecutorValidate(NotNull<KernelGraphPtr> graph,
const std::vector<KernelGraphPtr> &all_graphs) {
AscendAutoMonad auto_monad(graph);
auto_monad.GenerateExecuteOrder();
if (graph->label_num() > kLabelNumsThreshold) {
MS_LOG(EXCEPTION) << "This model with " << all_graphs.size() << " graphs needs " << graph->label_num()
<< " labels, which out of range of [0, 1024).\n1. Check if front-end composition is correct.\n"
<< "2. Optimize model expression and reduce the number of graphs and labels.";
}
}
void AscendSession::IrFusionPass(const NotNull<KernelGraphPtr> graph, NotNull<std::set<KernelGraphPtr> *> memo) {
@ -1960,7 +1967,7 @@ void AscendSession::UpdateOutputTensors(const VectorRef *outputs,
const auto &iter = tensor_to_node.find(tensor);
if (iter != tensor_to_node.end()) {
const auto &node = iter->second.first;
const auto &output_index = iter->second.second;
size_t output_index = iter->second.second;
if (!AnfAlgo::OutputAddrExist(node, output_index, true)) {
continue;
}
@ -1994,7 +2001,7 @@ void AscendSession::UpdateOutputTensors(const VectorRef *outputs,
}
}
DeviceAddressPtr AscendSession::AssignExtraMemForGraphOutput(const tensor::TensorPtr &tensor, const AnfNodePtr &node,
int index) const {
size_t index) const {
MS_EXCEPTION_IF_NULL(tensor);
MS_EXCEPTION_IF_NULL(node);
auto runtime_instance = device::KernelRuntimeManager::Instance().GetKernelRuntime(kAscendDevice, device_id_);

4
mindspore/ccsrc/backend/session/ascend_session.h
View File

@ -84,7 +84,7 @@ class AscendSession : public SessionBasic {
const std::map<tensor::TensorPtr, session::KernelWithIndex> &tensor_to_node,
std::map<DeviceAddressPtr, DeviceAddressPtr> *) override;
DeviceAddressPtr AssignExtraMemForGraphOutput(const tensor::TensorPtr &tensor, const AnfNodePtr &node,
int index) const;
size_t index) const;
private:
// compile child graph when session have multiple child graphs
@ -119,7 +119,7 @@ class AscendSession : public SessionBasic {
// below functions are used for run op
void RunOpHardwareOptimize(const std::shared_ptr<session::KernelGraph> &kernel_graph) const;
void RootGraphExecutorValidate(NotNull<KernelGraphPtr> graph);
void RootGraphExecutorValidate(NotNull<KernelGraphPtr> graph, const std::vector<KernelGraphPtr> &all_graphs);
// merge execution order list of child graphs
void MergeGraphExecOrder();
// get graph order vector by graph id

7
mindspore/ccsrc/runtime/device/kernel_runtime.cc
View File

@ -871,17 +871,16 @@ void KernelRuntime::AssignNodeOutputMem(MemType type, const AnfNodePtr &node, in
}
}
DeviceAddressPtr KernelRuntime::AssignExtraStaticMem(const TensorPtr &tensor, const AnfNodePtr &node, int index) {
DeviceAddressPtr KernelRuntime::AssignExtraStaticMem(const TensorPtr &tensor, const AnfNodePtr &node, size_t index) {
MS_EXCEPTION_IF_NULL(node);
MS_EXCEPTION_IF_NULL(mem_manager_);
auto i = SizeToInt(index);
auto tensor_address = std::dynamic_pointer_cast<device::DeviceAddress>(tensor->device_address());
MS_LOG(DEBUG) << "Assign Node:" << node->fullname_with_scope()
<< "Assign Static Memory for Output node, size:" << tensor_address->size();
auto device_address = CreateDeviceAddress(nullptr, tensor_address->size(), tensor_address->format(),
tensor_address->type_id(), {node, i});
tensor_address->type_id(), {node, index});
MS_EXCEPTION_IF_NULL(device_address);
uint8_t *ptr = mem_manager_->MallocOutputMem(node, i, kStaticMem, tensor_address->size(), device_address, false);
uint8_t *ptr = mem_manager_->MallocOutputMem(node, index, kStaticMem, tensor_address->size(), device_address, false);
MS_EXCEPTION_IF_NULL(ptr);
return device_address;
}

2
mindspore/ccsrc/runtime/device/kernel_runtime.h
View File

@ -114,7 +114,7 @@ class KernelRuntime {
virtual void *compute_stream() const { return nullptr; }
virtual void *communication_stream() const { return nullptr; }
void UpdateRefNodeOutputMem(const session::KernelGraph *graph);
virtual DeviceAddressPtr AssignExtraStaticMem(const TensorPtr &tensor, const AnfNodePtr &node, int index);
virtual DeviceAddressPtr AssignExtraStaticMem(const TensorPtr &tensor, const AnfNodePtr &node, size_t index);
virtual void *GetModelStream(uint32_t graph_id) const { return nullptr; }
protected: