From 849d8f9a3b3e8d132ec38445828a94068e6d1983 Mon Sep 17 00:00:00 2001 From: yaolun Date: Wed, 7 Jun 2023 17:32:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=A4=84=E7=90=86=E7=A9=BAte?= =?UTF-8?q?nsor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tf_adapter/util/util.cc | 3 +++ tf_adapter_2.x/npu_device/core/npu_utils.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/tf_adapter/util/util.cc b/tf_adapter/util/util.cc index 4fcc26321..4825486d4 100644 --- a/tf_adapter/util/util.cc +++ b/tf_adapter/util/util.cc @@ -98,6 +98,9 @@ Status MappingDtStringTensor2AclDataItem(const Tensor &tensor, acltdtDataItem *& } Status LoopCopy(char *dst_ptr, size_t dst_size, char *src_ptr, size_t src_size) { + // For empty tensor : dst_size equals 0 and src_size equals 0 + if ((dst_size == src_size) && (dst_size == 0UL)) { return tensorflow::Status::OK(); } + if (dst_size < src_size) { return tensorflow::errors::Internal("Loop memory copy failed. dst_size:", dst_size, ", src_size:", src_size); } diff --git a/tf_adapter_2.x/npu_device/core/npu_utils.cpp b/tf_adapter_2.x/npu_device/core/npu_utils.cpp index 37834619e..ad883ab72 100644 --- a/tf_adapter_2.x/npu_device/core/npu_utils.cpp +++ b/tf_adapter_2.x/npu_device/core/npu_utils.cpp @@ -539,6 +539,9 @@ tensorflow::Status SeparateGraphDef(tensorflow::GraphDef *def, } tensorflow::Status LoopCopy(char *dst_ptr, size_t dst_size, char *src_ptr, size_t src_size) { + // For empty tensor : dst_size equals 0 and src_size equals 0 + if ((dst_size == src_size) && (dst_size == 0UL)) { return tensorflow::Status::OK(); } + NPU_REQUIRES((dst_size >= src_size), tensorflow::errors::Internal("Loop memory copy failed. dst_size:", dst_size, ", src_size:", src_size)); -- Gitee