From f2b9ac3d6adc6742a34cf1ff4a23789c895c7e2d Mon Sep 17 00:00:00 2001 From: lilei Date: Wed, 16 Sep 2020 14:37:03 +0800 Subject: [PATCH] clear up codedex of C++ --- .../ccsrc/pybind_api/random_normal/philox_generator.h | 2 ++ .../ccsrc/pybind_api/random_normal/random_cpu_kernel.cc | 2 +- .../ccsrc/pybind_api/random_normal/random_cpu_kernel.h | 9 ++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mindspore/ccsrc/pybind_api/random_normal/philox_generator.h b/mindspore/ccsrc/pybind_api/random_normal/philox_generator.h index c8e4e6db39a..764a2be2415 100644 --- a/mindspore/ccsrc/pybind_api/random_normal/philox_generator.h +++ b/mindspore/ccsrc/pybind_api/random_normal/philox_generator.h @@ -33,6 +33,8 @@ class PhiloxGenerator { counter_[3] = static_cast(seed_ >> 32); } + ~PhiloxGenerator() = default; + void Jump(); void JumpStep(uint64_t step); diff --git a/mindspore/ccsrc/pybind_api/random_normal/random_cpu_kernel.cc b/mindspore/ccsrc/pybind_api/random_normal/random_cpu_kernel.cc index 6ae6b8d9c0a..8443667a1b0 100644 --- a/mindspore/ccsrc/pybind_api/random_normal/random_cpu_kernel.cc +++ b/mindspore/ccsrc/pybind_api/random_normal/random_cpu_kernel.cc @@ -65,6 +65,6 @@ bool InitRandomNormal(float mean, float stddev, std::vector out_shape, } REGISTER_PYBIND_DEFINE(random_normal, - ([](py::module *m) { (void)m->def("random_normal", &InitRandomNormal, "testnormal"); })); + ([](py::module *const m) { (void)m->def("random_normal", &InitRandomNormal, "testnormal"); })); } // namespace mindspore diff --git a/mindspore/ccsrc/pybind_api/random_normal/random_cpu_kernel.h b/mindspore/ccsrc/pybind_api/random_normal/random_cpu_kernel.h index 7bbc365a4f1..87d8539aa85 100644 --- a/mindspore/ccsrc/pybind_api/random_normal/random_cpu_kernel.h +++ b/mindspore/ccsrc/pybind_api/random_normal/random_cpu_kernel.h @@ -38,7 +38,7 @@ class NormalDistribution { const uint32_t exp = static_cast(127); const uint32_t val = (exp << 23) | temp_value; errno_t mem_ret; - mem_ret = memcpy_s(output, sizeof(val), &val, sizeof(val)); + mem_ret = memcpy_s(output, sizeof(float), &val, sizeof(uint32_t)); if (mem_ret != EOK) { MS_LOG(ERROR) << "UInt32ToFloat32 memcpy is failed"; return false; @@ -71,10 +71,13 @@ bool FillRandoms(PhiloxGenerator generator, float *output, int64_t vet_size, int generator.JumpStep((vet_size * thread_Id + gResultNum - 1) / gResultNum); for (int32_t i = 0; i < vet_size; i += gResultNum) { auto outputResult = distribution(&generator); + size_t max_length = 0; if (vet_size - i >= gResultNum) { - mem_ret = memcpy_s(&output[i], gResultNum * sizeof(float), &outputResult[0], gResultNum * sizeof(float)); + max_length = gResultNum * sizeof(float); + mem_ret = memcpy_s(&output[i], max_length, &outputResult[0], max_length); } else { - mem_ret = memcpy_s(&output[i], (vet_size - i) * sizeof(float), &outputResult[0], (vet_size - i) * sizeof(float)); + max_length = (vet_size - i) * sizeof(float); + mem_ret = memcpy_s(&output[i], max_length, &outputResult[0], max_length); } if (mem_ret != EOK) { MS_LOG(ERROR) << "FillRandoms memcpy is failed";