From 74187f9722d91cdeec5ff9f31ef90b3c10e429f6 Mon Sep 17 00:00:00 2001
From: Yifan Zhao <yifanz16@illinois.edu>
Date: Tue, 5 Nov 2019 16:36:07 -0600
Subject: [PATCH] Fixed memcpy bug
---
.../hpvm-tensor-rt/tensor_runtime/src/img_tensor_utils.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/llvm/projects/hpvm-tensor-rt/tensor_runtime/src/img_tensor_utils.cpp b/llvm/projects/hpvm-tensor-rt/tensor_runtime/src/img_tensor_utils.cpp
index fb973006e9..6d2477ab46 100644
--- a/llvm/projects/hpvm-tensor-rt/tensor_runtime/src/img_tensor_utils.cpp
+++ b/llvm/projects/hpvm-tensor-rt/tensor_runtime/src/img_tensor_utils.cpp
@@ -157,7 +157,7 @@ Tensor *readDataSet(const char *path, size_t n_color) {
throw std::runtime_error("Image load failed");
float *converted = uint8_to_float(data, n_floats);
stbi_image_free(data);
- memcpy(base_data, converted, n_floats * sizeof(float));
+ std::memcpy(base_data, converted, n_floats * sizeof(float));
delete[] converted;
base_data += n_floats;
}
@@ -208,7 +208,7 @@ void *loadAsImage(const char *filename, size_t n_color) {
float *converted = uint8_to_float(data, x * y * n);
auto *image =
(Tensor *)create4DTensor(CUDNN_DATA_FLOAT, CUDNN_TENSOR_NHWC, 1, n, y, x);
- memcpy(image, converted, x * y * n * sizeof(float));
+ std::memcpy(image->host_data, converted, x * y * n * sizeof(float));
auto *nchw_image = to_nchw(image);
stbi_image_free(data);
delete image;
@@ -269,7 +269,7 @@ std::vector<float> PSNR(void *gold_ptr, void *approx_ptr) {
auto *image_size_tensor = (Tensor *)create4DTensor(
CUDNN_DATA_FLOAT, CUDNN_TENSOR_NCHW, 1, 1, 1, 1
);
- memcpy(image_size_tensor->host_data, &image_size_f, sizeof(float));
+ std::memcpy(image_size_tensor->host_data, &image_size_f, sizeof(float));
auto *diff = tensorMap2(device::fsub_ptrptr, gold_tensor, approx_tensor);
auto *diffsqr = tensorMap2(device::fmul_ptrptr, diff, diff);
--
GitLab