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

!15366 Fix bug of memory access error when using input mask 

From: @joylvliang
Reviewed-by: @chujinjin,@kisnwang
Signed-off-by: @kisnwang
This commit is contained in:
mindspore-ci-bot 2021-04-20 10:18:19 +08:00 committed by Gitee
parent 78469f6083 b67987d718
commit 23973aa830
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mindspore/ccsrc/pipeline/pynative/pynative_execute.cc
View File

@ -269,9 +269,13 @@ void PynativeInfer(const PrimitivePyPtr &prim, const py::list &py_args, OpExecIn
MS_LOG(DEBUG) << "Prim " << prim->name() << " infer result " << op_exec_info->abstract->ToString();
}
std::string GetSingleOpGraphInfo(const OpExecInfoPtr &op_exec_info,
const std::vector<tensor::TensorPtr> &input_tensors) {
std::string GetSingleOpGraphInfo(const OpExecInfoPtr &op_exec_info, const std::vector<tensor::TensorPtr> &input_tensors,
const std::vector<int64_t> &tensors_mask) {
MS_EXCEPTION_IF_NULL(op_exec_info);
if (input_tensors.size() != tensors_mask.size()) {
MS_LOG(EXCEPTION) << "Input tensors size " << input_tensors.size() << " should be equal to tensors mask size "
<< tensors_mask.size();
}
std::string graph_info;
// get input tensor info
for (size_t index = 0; index < input_tensors.size(); ++index) {
@ -292,7 +296,7 @@ std::string GetSingleOpGraphInfo(const OpExecInfoPtr &op_exec_info,
(void)graph_info.append(std::dynamic_pointer_cast<device::DeviceAddress>(tensor_addr)->format());
graph_info += "_";
}
if (static_cast<int64_t>(op_exec_info->inputs_mask[index]) == kValueNodeTensorMask) {
if (tensors_mask[index] == kValueNodeTensorMask) {
if (input_tensors[index]->Dtype()->type_id() == kNumberTypeInt64) {
(void)graph_info.append(std::to_string(*reinterpret_cast<int *>(input_tensors[index]->data_c())));
graph_info += "_";
@ -1503,7 +1507,7 @@ py::object ForwardExecutor::RunOpInMs(const OpExecInfoPtr &op_exec_info, Pynativ
ConstructInputTensor(op_exec_info, &tensors_mask, &input_tensors);
ConvertAttrToUnifyMindIR(op_exec_info);
// get graph info for checking it whether existing in the cache
std::string graph_info = GetSingleOpGraphInfo(op_exec_info, input_tensors);
std::string graph_info = GetSingleOpGraphInfo(op_exec_info, input_tensors, tensors_mask);
#if defined(__APPLE__)
session::OpRunInfo op_run_info = {op_exec_info->op_name,
op_exec_info->py_primitive,

2
tests/st/networks/test_gpu_lenet.py
View File

@ -230,5 +230,5 @@ def test_train_lenet_with_new_interface(num_classes=10, epoch=20, batch_size=32)
grads = F.identity(grads)
optimizer(grads)
losses.append(loss)
assert losses[-1].asnumpy() < 0.008
assert losses[-1].asnumpy() < 0.01
assert losses[-1].asnumpy() > 0.001