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

!21162 unified runtime pclint fixed 

Merge pull request !21162 from limingqi107/bug_fix
This commit is contained in:
i-robot 2021-07-31 15:30:26 +00:00 committed by Gitee
parent 7a13a2e394 09ceb1cf5b
commit 792c19b491
12 changed files with 58 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mindspore/ccsrc/runtime/device/cpu/cpu_device_address.cc
View File

@ -23,7 +23,6 @@
namespace mindspore {
namespace device {
namespace cpu {
CPUDeviceAddress::~CPUDeviceAddress() { ClearDeviceMemory(); }
void CPUDeviceAddress::ClearDeviceMemory() {

2
mindspore/ccsrc/runtime/framework/actor/actor_common.cc
View File

@ -118,7 +118,7 @@ bool Copy(const DeviceTensor *dst_device_tensor, const DeviceTensor *src_device_
MS_EXCEPTION_IF_NULL(dst_device_tensor);
MS_EXCEPTION_IF_NULL(src_device_tensor);
if (src_device_tensor->GetSize() != dst_device_tensor->GetSize()) {
MS_LOG(WARNING) << " Copy size is not equal, input size:" << src_device_tensor->GetSize()
MS_LOG(WARNING) << "Copy size is not equal, input size:" << src_device_tensor->GetSize()
<< ", output size:" << dst_device_tensor->GetSize();
}

1
mindspore/ccsrc/runtime/framework/actor/copy_actor.cc
View File

@ -197,6 +197,5 @@ void CopyActor::EraseInput(OpContext<DeviceTensor> *const context) {
}
}
}
} // namespace runtime
} // namespace mindspore

1
mindspore/ccsrc/runtime/framework/actor/data_source_actor.cc
View File

@ -310,6 +310,5 @@ bool HostQueueDataSourceActor::IsSameDeviceType() const {
}
return true;
}
} // namespace runtime
} // namespace mindspore

1
mindspore/ccsrc/runtime/framework/actor/debug_actor.cc
View File

@ -93,6 +93,5 @@ void DebugActor::DebugOnStepEnd(OpContext<DeviceTensor> *const op_context, const
// Call back to the from actor to process after debug finished.
Async(*from_aid, &DebugAwareActor::OnDebugFinish, op_context);
}
} // namespace runtime
} // namespace mindspore

1
mindspore/ccsrc/runtime/framework/actor/kernel_actor.cc
View File

@ -472,6 +472,5 @@ void KernelActor::EraseInput(OpContext<DeviceTensor> *const context) {
}
}
}
} // namespace runtime
} // namespace mindspore

2
mindspore/ccsrc/runtime/framework/actor/switch_actor.cc
View File

@ -33,7 +33,7 @@ void SwitchActor::Init() {
for (auto &data_arrow : output_branch_arrow) {
MS_EXCEPTION_IF_NULL(data_arrow);
auto data = std::make_unique<OpData<DeviceTensor>>(data_arrow->to_op_id_, nullptr, data_arrow->to_input_index_);
output_data.emplace_back(std::move(data));
(void)output_data.emplace_back(std::move(data));
}
}
}

40
mindspore/ccsrc/runtime/framework/graph_scheduler.cc
View File

@ -445,7 +445,7 @@ void GraphScheduler::Initialize() {
thread_pool_ = ActorThreadPool::CreateThreadPool(actor_thread_num);
MS_EXCEPTION_IF_NULL(thread_pool_);
std::string OMP_env = std::to_string(OMP_thread_num);
common::SetEnv("OMP_NUM_THREADS", OMP_env.c_str(), 0);
(void)common::SetEnv("OMP_NUM_THREADS", OMP_env.c_str(), 0);
auto OMP_thread_num_used = common::GetEnv("OMP_NUM_THREADS");
MS_LOG(INFO) << "The actor thread number: " << actor_thread_num
<< ", the computed OMP thread number : " << OMP_thread_num
@ -509,7 +509,7 @@ ActorSet *GraphScheduler::Transform(const GraphCompilerInfo &graph_compiler_info
// The copy actors are built in the link, so need push into the actor set after link.
actor_set->copy_actors_ = copy_actors_;
actors_.emplace(actor_set->name_, actor_set);
(void)actors_.emplace(actor_set->name_, actor_set);
DumpActor(actor_set.get(), graph_compiler_info);
if (!CheckActorValid(actor_set.get(), strategy)) {
@ -788,7 +788,7 @@ ActorSetPtr GraphScheduler::Build(const GraphCompilerInfo &graph_compiler_info)
MS_EXCEPTION_IF_NULL(actor_set);
auto host_queue = std::make_shared<HostTensorQueue>();
actor_to_host_queue_.emplace(actor_set->name_, host_queue);
(void)actor_to_host_queue_.emplace(actor_set->name_, host_queue);
actor_set->data_source_actors_ = BuildDataSourceActor(graph_compiler_info, host_queue);
actor_set->kernel_actors_ = BuildKernelActor(graph_compiler_info);
actor_set->loop_count_actor_ = BuildLoopCountActor(graph_compiler_info);
@ -838,7 +838,7 @@ void GraphScheduler::CacheGraphOutputToActor(const GraphCompilerInfo &graph_comp
MS_LOG(INFO) << "Cache the graph " << graph->graph_id() << " output node:" << output_kernel->fullname_with_scope()
<< " with index: " << output_with_index.second << " to actor:" << actor->GetAID().Name()
<< " with index:" << actor_output_index;
graph_output_to_actor_.emplace(origin_output_with_index, GraphOutputPair(actor, actor_output_index));
(void)graph_output_to_actor_.emplace(origin_output_with_index, GraphOutputPair(actor, actor_output_index));
}
}
}
@ -941,13 +941,14 @@ std::vector<DataSourceActorPtr> GraphScheduler::BuildDataSourceActor(const Graph
// In the scenario where multiple backend nodes correspond to the same front node, only the first backend node
// is saved in the host queue data source actor.
if (front_node_position_temp_map.count(front_node) > 0) {
host_queue_ds_actor->data_node_position_map_.emplace(input_node, front_node_position_temp_map[front_node]);
(void)host_queue_ds_actor->data_node_position_map_.emplace(input_node,
front_node_position_temp_map[front_node]);
continue;
}
(void)host_queue_ds_actor->data_nodes_.emplace_back(input_node);
(void)host_queue_ds_actor->device_contexts_.emplace_back(device_context);
host_queue_ds_actor->data_node_position_map_.emplace(input_node, data_node_position);
front_node_position_temp_map.emplace(front_node, data_node_position);
(void)host_queue_ds_actor->data_node_position_map_.emplace(input_node, data_node_position);
(void)front_node_position_temp_map.emplace(front_node, data_node_position);
data_node_position++;
}
}
@ -1355,7 +1356,7 @@ void GraphScheduler::LinkDataArrow(KernelActor *to_actor, const GraphCompilerInf
void GraphScheduler::LinkDataArrowForInternalParameter(const AnfNodePtr &internal_parameter,
const std::vector<AnfNodePtr> &host_parameters,
const KernelGraphPtr &graph, KernelActor *to_actor,
KernelWithIndex to_kernel_with_input_idx) {
const KernelWithIndex &to_kernel_with_input_idx) {
MS_EXCEPTION_IF_NULL(internal_parameter);
MS_EXCEPTION_IF_NULL(graph);
MS_EXCEPTION_IF_NULL(to_actor);
@ -1411,8 +1412,8 @@ void GraphScheduler::LinkDataArrowForInternalParameter(const AnfNodePtr &interna
void GraphScheduler::LinkDataArrowForDeviceDSActor(DeviceQueueDataSourceActor *const from_actor,
KernelActor *const to_actor,
KernelWithIndex from_kernel_with_output_idx,
KernelWithIndex to_kernel_with_input_idx) {
const KernelWithIndex &from_kernel_with_output_idx,
const KernelWithIndex &to_kernel_with_input_idx) {
MS_EXCEPTION_IF_NULL(from_actor);
MS_EXCEPTION_IF_NULL(to_actor);
@ -1437,8 +1438,8 @@ void GraphScheduler::LinkDataArrowForDeviceDSActor(DeviceQueueDataSourceActor *c
void GraphScheduler::LinkDataArrowForHostDSActor(HostQueueDataSourceActor *const from_actor,
KernelActor *const to_actor,
KernelWithIndex from_kernel_with_output_idx,
KernelWithIndex to_kernel_with_input_idx) {
const KernelWithIndex &from_kernel_with_output_idx,
const KernelWithIndex &to_kernel_with_input_idx) {
MS_EXCEPTION_IF_NULL(from_actor);
MS_EXCEPTION_IF_NULL(to_actor);
@ -1449,7 +1450,6 @@ void GraphScheduler::LinkDataArrowForHostDSActor(HostQueueDataSourceActor *const
// Get the position of from kernel in the data source actor.
auto position = from_actor->FetchDataNodePosition(from_kernel);
if (IsNeedInsertCopyActor(from_actor->device_contexts_[position], to_actor->device_context_)) {
LinkDataArrowForCopyActor(from_actor, to_actor, from_kernel_with_output_idx, to_kernel_with_input_idx);
} else {
@ -1466,7 +1466,7 @@ void GraphScheduler::LinkDataArrowForHostDSActor(HostQueueDataSourceActor *const
void GraphScheduler::LinkDataArrowForKernelActor(KernelActor *from_actor, KernelActor *const to_actor,
KernelWithIndex from_kernel_with_output_idx,
KernelWithIndex to_kernel_with_input_idx) {
const KernelWithIndex &to_kernel_with_input_idx) {
MS_EXCEPTION_IF_NULL(to_actor);
if (IsSkippedKernelActor(from_kernel_with_output_idx.first)) {
auto real_kernel_with_index = AnfAlgo::GetPrevNodeOutput(from_kernel_with_output_idx.first, 0);
@ -1505,8 +1505,8 @@ void GraphScheduler::LinkDataArrowForKernelActor(KernelActor *from_actor, Kernel
}
void GraphScheduler::LinkDataArrowForCopyActor(OpActor<DeviceTensor> *const from_actor, KernelActor *const to_actor,
KernelWithIndex from_kernel_with_output_idx,
KernelWithIndex to_kernel_with_input_idx) {
const KernelWithIndex &from_kernel_with_output_idx,
const KernelWithIndex &to_kernel_with_input_idx) {
MS_EXCEPTION_IF_NULL(from_actor);
MS_EXCEPTION_IF_NULL(to_actor);
auto from_kernel = from_kernel_with_output_idx.first;
@ -1846,7 +1846,7 @@ void GraphScheduler::LinkOutputResultArrowForOutputActor(OutputActor *to_actor,
MS_LOG(INFO) << "Ignore the internal parameter node:" << output.first->DebugString();
continue;
}
unique_outputs.insert(output);
(void)unique_outputs.insert(output);
}
for (const auto &output_with_index : unique_outputs) {
MS_EXCEPTION_IF_NULL(output_with_index.first);
@ -1860,7 +1860,7 @@ void GraphScheduler::LinkOutputResultArrowForOutputActor(OutputActor *to_actor,
if (unique_output_positions.count(iter->second) > 0) {
continue;
}
unique_output_positions.insert(iter->second);
(void)unique_output_positions.insert(iter->second);
for (auto &output_position : iter->second) {
to_actor->device_contexts_[output_position] = graph_compiler_info.device_contexts_[number - 1];
// The device tensor of graph out need be taken over by host tensor, so set the max reference count.
@ -2578,7 +2578,7 @@ bool GraphScheduler::CheckActorValid(const ActorSet *actor_set, GraphExecutionSt
auto input_num = AnfAlgo::GetInputTensorNum(kernel_actor->kernel_);
auto input_data_num = kernel_actor->input_datas_num_;
auto device_tensor_store_num = kernel_actor->device_tensor_store_keys_.size();
if (input_data_num + IntToSize(device_tensor_store_num) != input_num) {
if (input_data_num + device_tensor_store_num != input_num) {
MS_LOG(ERROR) << "The input building of " << AnfAlgo::GetNodeDebugString(kernel_actor->kernel_)
<< " is wrong, input data num: " << input_data_num
<< ", device tensor store num: " << device_tensor_store_num << ", total input num: " << input_num;
@ -2596,7 +2596,7 @@ bool GraphScheduler::CheckActorValid(const ActorSet *actor_set, GraphExecutionSt
const size_t kCopyActorInputDataNum = 1;
auto input_data_num = copy_actor->input_datas_num_;
auto device_tensor_store_num = (copy_actor->device_tensor_store_key_.second == nullptr) ? 0 : 1;
size_t device_tensor_store_num = (copy_actor->device_tensor_store_key_.second == nullptr) ? 0 : 1;
if (input_data_num + device_tensor_store_num != kCopyActorInputDataNum) {
MS_LOG(ERROR) << "The input building of " << copy_actor->GetAID().Name()
<< " is wrong, input data num: " << input_data_num

15
mindspore/ccsrc/runtime/framework/graph_scheduler.h
View File

@ -200,19 +200,20 @@ class GraphScheduler {
// Link data arrows for internal parameter, convert internal parameter to actor by internal parameter cache to link.
void LinkDataArrowForInternalParameter(const AnfNodePtr &internal_parameter,
const std::vector<AnfNodePtr> &host_parameters, const KernelGraphPtr &graph,
KernelActor *to_actor, KernelWithIndex to_kernel_with_input_idx);
KernelActor *to_actor, const KernelWithIndex &to_kernel_with_input_idx);
// Link data arrows in the copy actor scene, insert the copy actor between from_actor and to_actor.
void LinkDataArrowForCopyActor(OpActor<DeviceTensor> *const from_actor, KernelActor *const to_actor,
KernelWithIndex from_kernel_with_output_idx, KernelWithIndex to_kernel_with_input_idx);
const KernelWithIndex &from_kernel_with_output_idx,
const KernelWithIndex &to_kernel_with_input_idx);
void LinkDataArrowForDeviceDSActor(DeviceQueueDataSourceActor *const from_actor, KernelActor *const to_actor,
KernelWithIndex from_kernel_with_output_idx,
KernelWithIndex to_to_kernel_with_input_idx);
const KernelWithIndex &from_kernel_with_output_idx,
const KernelWithIndex &to_to_kernel_with_input_idx);
void LinkDataArrowForHostDSActor(HostQueueDataSourceActor *const from_actor, KernelActor *const to_actor,
KernelWithIndex from_kernel_with_output_idx,
KernelWithIndex to_kernel_with_input_idx);
const KernelWithIndex &from_kernel_with_output_idx,
const KernelWithIndex &to_kernel_with_input_idx);
void LinkDataArrowForKernelActor(KernelActor *from_actor, KernelActor *const to_actor,
KernelWithIndex from_kernel_with_output_idx,
KernelWithIndex to_kernel_with_input_idx);
const KernelWithIndex &to_kernel_with_input_idx);
// 2. The processing of linking control arrows.
void LinkControlArrowForLoopCountActor(LoopCountActor *loop_count_actor, const ActorSet *actor_set,

39
mindspore/ccsrc/runtime/hardware/cpu/cpu_memory_pool.cc
View File

@ -31,30 +31,37 @@ size_t GetSystemMemorySize(const std::string &key) {
#else
FILE *file = fopen("/proc/meminfo", "r");
if (file == nullptr) {
MS_LOG(EXCEPTION) << "Get system meminfo failed.";
MS_LOG(ERROR) << "Get system meminfo failed.";
return 0;
}
size_t mem_size = 0;
std::string format = key + ": %zu kB\n";
while (true) {
auto ret = fscanf(file, format.c_str(), &mem_size);
if (feof(file)) {
MS_LOG(ERROR) << "Get system memory failed.";
char buf[kLineMaxSize] = {0};
while (fgets(buf, kLineMaxSize, file)) {
// Get mem title.
std::string line(buf);
auto title_end_pos = line.find(":");
auto title = line.substr(0, title_end_pos);
// Get mem size.
if (title == key) {
auto mem_size_end_pos = line.find_last_of(" ");
auto mem_size_begin_pos = line.find_last_of(" ", mem_size_end_pos - 1);
if ((mem_size_end_pos != std::string::npos) && (mem_size_begin_pos != std::string::npos)) {
auto mem_size_string = line.substr(mem_size_begin_pos, mem_size_end_pos - mem_size_begin_pos);
mem_size = std::atol(mem_size_string.c_str());
}
break;
}
if (ret == 1) {
MS_LOG(INFO) << "Get system memory(" << key << "): " << mem_size << " kB";
break;
} else {
// Need skip current line if fscanf does not capture the result.
char temp[kLineMaxSize];
auto temp_ret = fgets(temp, kLineMaxSize, file);
(void)temp_ret;
}
(void)memset_s(buf, kLineMaxSize, 0, kLineMaxSize);
}
(void)fclose(file);
if (mem_size == 0) {
MS_LOG(EXCEPTION) << "Get system meminfo failed: " << key;
}
MS_LOG(INFO) << "Get system memory(" << key << "): " << mem_size << " kB";
return mem_size * kKBToByte;
#endif
}

8
mindspore/ccsrc/vm/backend.cc
View File

@ -587,7 +587,7 @@ void ConvertMultiPyObjectToTensor(const py::object &input_object, std::vector<te
}
}
void RunControlOperator(const std::shared_ptr<GraphCompiler> graph_compiler, const KernelGraphPtr &graph,
void RunControlOperator(const std::shared_ptr<GraphCompiler> &graph_compiler, const KernelGraphPtr &graph,
const CNodePtr &kernel, const std::map<KernelWithIndex, tensor::TensorPtr> &op_output_map,
const std::map<AnfNodePtr, size_t> &parameter_index,
const std::vector<tensor::TensorPtr> &graph_inputs, InputTensorInfo *input_tensor_info,
@ -945,9 +945,9 @@ std::unique_ptr<GraphCompilerInfo> MindRTBackend::ConstructGraphCompilerInfo(con
std::vector<DeviceContext *> device_contexts;
std::string name = "kernel_graph";
for (const auto &graph_id_to_context : graph_id_to_device_context_) {
graphs.emplace_back(graph_compiler_->Fetch(graph_id_to_context.first));
device_contexts.emplace_back(graph_id_to_context.second);
name.append("_").append(std::to_string(graph_id_to_context.first));
(void)graphs.emplace_back(graph_compiler_->Fetch(graph_id_to_context.first));
(void)device_contexts.emplace_back(graph_id_to_context.second);
(void)name.append("_").append(std::to_string(graph_id_to_context.first));
}
auto parser = std::make_shared<ControlNodeParser>();

2
mindspore/core/utils/ms_utils.h
View File

@ -60,7 +60,7 @@ static inline void SetOMPThreadNum() {
OMP_thread_num = OMP_thread_num > kOMPThreadMaxNum ? kOMPThreadMaxNum : OMP_thread_num;
std::string OMP_env = std::to_string(OMP_thread_num);
SetEnv("OMP_NUM_THREADS", OMP_env.c_str(), 0);
(void)SetEnv("OMP_NUM_THREADS", OMP_env.c_str(), 0);
}
} // namespace common
} // namespace mindspore