From c0f0e154f57c7ebe93da6fd912e240371068c9d0 Mon Sep 17 00:00:00 2001 From: hesham Date: Fri, 22 May 2020 23:53:34 -0400 Subject: [PATCH] Clean up work for text python package --- mindspore/ccsrc/dataset/core/tensor.cc | 9 +++++---- tests/ut/python/dataset/test_tensor_string.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mindspore/ccsrc/dataset/core/tensor.cc b/mindspore/ccsrc/dataset/core/tensor.cc index 629daefc616..c986e07089d 100644 --- a/mindspore/ccsrc/dataset/core/tensor.cc +++ b/mindspore/ccsrc/dataset/core/tensor.cc @@ -702,13 +702,14 @@ Status Tensor::GetDataAsNumpyStrings(py::array *data) { uint64_t total_size = shape_.NumOfElements() * max; char *tmp_data = reinterpret_cast(data_allocator_->allocate(total_size)); if (tmp_data == nullptr) RETURN_STATUS_UNEXPECTED("Cannot create temp array."); - memset(tmp_data, 0, total_size); + int ret_code = memset_s(tmp_data, total_size, 0, total_size); + CHECK_FAIL_RETURN_UNEXPECTED(ret_code == 0, "Failed to initialize temp memory"); itr = begin(); uint64_t i = 0; - for (; itr != end(); itr++) { - (void)memcpy_s(tmp_data + i * max, total_size, (*itr).data(), (*itr).length()); - i++; + for (; itr != end(); itr++, i++) { + ret_code = memcpy_s(tmp_data + i * max, total_size, (*itr).data(), (*itr).length()); + CHECK_FAIL_RETURN_UNEXPECTED(ret_code == 0, "Failed to copy string data."); } auto strides = shape_.Strides(); std::transform(strides.begin(), strides.end(), strides.begin(), [&max](const auto &s) { return s * max; }); diff --git a/tests/ut/python/dataset/test_tensor_string.py b/tests/ut/python/dataset/test_tensor_string.py index 659bb4f153c..c32596f1f22 100644 --- a/tests/ut/python/dataset/test_tensor_string.py +++ b/tests/ut/python/dataset/test_tensor_string.py @@ -56,7 +56,7 @@ def test_batching_strings(): with pytest.raises(RuntimeError) as info: for _ in data: pass - assert "[Batch ERROR] Batch does not support" in str(info) + assert "[Batch ERROR] Batch does not support" in str(info.value) def test_map():