Browse Source

Clean up work for text python package

tags/v0.3.0-alpha
hesham 5 years ago
parent
commit
c0f0e154f5
2 changed files with 6 additions and 5 deletions
  1. +5
    -4
      mindspore/ccsrc/dataset/core/tensor.cc
  2. +1
    -1
      tests/ut/python/dataset/test_tensor_string.py

+ 5
- 4
mindspore/ccsrc/dataset/core/tensor.cc View File

@@ -702,13 +702,14 @@ Status Tensor::GetDataAsNumpyStrings(py::array *data) {
uint64_t total_size = shape_.NumOfElements() * max;
char *tmp_data = reinterpret_cast<char *>(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<std::string_view>();
uint64_t i = 0;
for (; itr != end<std::string_view>(); itr++) {
(void)memcpy_s(tmp_data + i * max, total_size, (*itr).data(), (*itr).length());
i++;
for (; itr != end<std::string_view>(); 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; });


+ 1
- 1
tests/ut/python/dataset/test_tensor_string.py View File

@@ -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():


Loading…
Cancel
Save