mindspore-Ecosystem
/
mindspore
21
0
Fork 27
Code Issues Pull Requests 6 Projects Releases Wiki Activity

!29109 Fix Core Dump after RuntimeError 

Merge pull request !29109 from hwjiaorui/segmentation-fault
This commit is contained in:
i-robot 2022-01-17 01:21:50 +00:00 committed by Gitee
parent 6c7f342633 d8c3146b87
commit 68189870e4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mindspore/ccsrc/runtime/device/ascend/executor/tiling/op_tiling_adapter.cc
View File

@ -71,7 +71,7 @@ std::string OpTilingCalculateAdapter::GetOutputName(const CNodePtr &node, size_t
std::string OpTilingCalculateAdapter::GetInputName(const CNodePtr &node, size_t index) { std::string OpTilingCalculateAdapter::GetInputName(const CNodePtr &node, size_t index) {
MS_EXCEPTION_IF_NULL(node); MS_EXCEPTION_IF_NULL(node);
if (input_names_.size() < index) { if (input_names_.size() <= index) {
return "unknown_name"; return "unknown_name";
} }
return input_names_[index]; return input_names_[index];

8
mindspore/ccsrc/runtime/hardware/ascend/ascend_device_context.cc
View File

@ -319,16 +319,16 @@ std::vector<GraphSegmentPtr> AscendDeviceContext::PartitionGraph(
void AscendDeviceContext::UnifyMindIR(const KernelGraphPtr &graph) const { void AscendDeviceContext::UnifyMindIR(const KernelGraphPtr &graph) const {
MS_EXCEPTION_IF_NULL(graph); MS_EXCEPTION_IF_NULL(graph);
AscendGraphOptimization::GetInstance().UnifyMindIR(graph); GetAscendGraphOptimization().UnifyMindIR(graph);
} }
void AscendDeviceContext::OptimizeGraph(const KernelGraphPtr &graph) const { void AscendDeviceContext::OptimizeGraph(const KernelGraphPtr &graph) const {
MS_EXCEPTION_IF_NULL(graph); MS_EXCEPTION_IF_NULL(graph);
AscendGraphOptimization::GetInstance().OptimizeGraph(graph); GetAscendGraphOptimization().OptimizeGraph(graph);
} }
void AscendDeviceContext::SetOperatorInfo(const std::vector<CNodePtr> &nodes) const { void AscendDeviceContext::SetOperatorInfo(const std::vector<CNodePtr> &nodes) const {
AscendGraphOptimization::GetInstance().SetOperatorInfo(nodes); GetAscendGraphOptimization().SetOperatorInfo(nodes);
} }
void AscendDeviceContext::CreateKernel(const std::vector<CNodePtr> &nodes) const { void AscendDeviceContext::CreateKernel(const std::vector<CNodePtr> &nodes) const {
@ -618,7 +618,7 @@ bool AscendDeviceContext::IsLoopCountSink(const KernelGraphPtr &graph) const {
// kernel by kernel mode interface // kernel by kernel mode interface
void AscendDeviceContext::OptimizeSingleOpGraph(const KernelGraphPtr &graph) const { void AscendDeviceContext::OptimizeSingleOpGraph(const KernelGraphPtr &graph) const {
AscendGraphOptimization::GetInstance().OptimizeSingleOpGraph(graph); GetAscendGraphOptimization().OptimizeSingleOpGraph(graph);
} }
void AscendDeviceContext::PreprocessBeforeRunSingleOpGraph(const KernelGraphPtr &graph) const { void AscendDeviceContext::PreprocessBeforeRunSingleOpGraph(const KernelGraphPtr &graph) const {

2
mindspore/ccsrc/runtime/hardware/ascend/ascend_graph_optimization.cc
View File

@ -34,7 +34,7 @@ namespace mindspore {
namespace device { namespace device {
namespace ascend { namespace ascend {
using AscendAutoMonad = mindspore::session::AscendAutoMonad; using AscendAutoMonad = mindspore::session::AscendAutoMonad;
AscendGraphOptimization GetAscendGraphOptimization() { return AscendGraphOptimization(); }
void AscendGraphOptimization::OptimizeGraph(const KernelGraphPtr &graph) { void AscendGraphOptimization::OptimizeGraph(const KernelGraphPtr &graph) {
MS_EXCEPTION_IF_NULL(graph); MS_EXCEPTION_IF_NULL(graph);
MS_LOG(INFO) << "Status record: start optimize graph. graph id: " << graph->graph_id(); MS_LOG(INFO) << "Status record: start optimize graph. graph id: " << graph->graph_id();

11
mindspore/ccsrc/runtime/hardware/ascend/ascend_graph_optimization.h
View File

@ -26,19 +26,14 @@ namespace device {
namespace ascend { namespace ascend {
class AscendGraphOptimization { class AscendGraphOptimization {
public: public:
static AscendGraphOptimization &GetInstance() {
static AscendGraphOptimization instance;
return instance;
}
void OptimizeGraph(const KernelGraphPtr &graph); void OptimizeGraph(const KernelGraphPtr &graph);
void OptimizeSingleOpGraph(const KernelGraphPtr &graph); void OptimizeSingleOpGraph(const KernelGraphPtr &graph);
void SetOperatorInfo(const std::vector<CNodePtr> &nodes); void SetOperatorInfo(const std::vector<CNodePtr> &nodes);
void UnifyMindIR(const KernelGraphPtr &graph); void UnifyMindIR(const KernelGraphPtr &graph);
private:
AscendGraphOptimization() { graph_manager_ = MakeManager(); } AscendGraphOptimization() { graph_manager_ = MakeManager(); }
~AscendGraphOptimization() = default; ~AscendGraphOptimization() = default;
private:
AscendGraphOptimization(const AscendGraphOptimization &) = delete; AscendGraphOptimization(const AscendGraphOptimization &) = delete;
AscendGraphOptimization &operator=(const AscendGraphOptimization &) = delete; AscendGraphOptimization &operator=(const AscendGraphOptimization &) = delete;
// Graph Optimized level-2 interface // Graph Optimized level-2 interface
@ -70,6 +65,8 @@ class AscendGraphOptimization {
// Note: Please clean the set before each use. // Note: Please clean the set before each use.
std::set<KernelGraphPtr> memo_; std::set<KernelGraphPtr> memo_;
}; };
AscendGraphOptimization GetAscendGraphOptimization();
} // namespace ascend } // namespace ascend
} // namespace device } // namespace device
} // namespace mindspore } // namespace mindspore