From 800b65459a0a53c566d347b463f9fd530f239aca Mon Sep 17 00:00:00 2001 From: Liu_Xuu Date: Mon, 11 Oct 2021 11:42:11 +0800 Subject: [PATCH] [MSLITE] rm duplicate func, using nnacl --- .../lite/src/delegate/tensorrt/CMakeLists.txt | 1 + .../delegate/tensorrt/op/resize_tensorrt.cc | 1 + .../src/delegate/tensorrt/tensorrt_utils.cc | 19 ------------------- .../src/delegate/tensorrt/tensorrt_utils.h | 2 -- 4 files changed, 2 insertions(+), 21 deletions(-) diff --git a/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt b/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt index 8c5d337405e..15b1d3812d4 100644 --- a/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt +++ b/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt @@ -1,5 +1,6 @@ include_directories(${TENSORRT_PATH}/include) include_directories(${CUDA_PATH}/include) +include_directories($(CCSRC_DIR)/backend/kernel_compiler/cpu) file(GLOB_RECURSE TENSORRT_RUNTIME_SRC ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ${CMAKE_CURRENT_SOURCE_DIR}/op/*.cc diff --git a/mindspore/lite/src/delegate/tensorrt/op/resize_tensorrt.cc b/mindspore/lite/src/delegate/tensorrt/op/resize_tensorrt.cc index f3257762f02..e7dcd7e505b 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/resize_tensorrt.cc +++ b/mindspore/lite/src/delegate/tensorrt/op/resize_tensorrt.cc @@ -16,6 +16,7 @@ #include #include "src/delegate/tensorrt/op/resize_tensorrt.h" +#include "nnacl/nnacl_common.h" namespace mindspore::lite { int ResizeTensorRT::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_utils.cc b/mindspore/lite/src/delegate/tensorrt/tensorrt_utils.cc index c8a4f681be4..1d9671f3d21 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_utils.cc +++ b/mindspore/lite/src/delegate/tensorrt/tensorrt_utils.cc @@ -388,23 +388,4 @@ std::string GetTensorFormat(nvinfer1::ITensor *trt_tensor, mindspore::Format for out_string += dim_string; return out_string; } -float ShortToFloat32(uint16_t src_value) { - const float32_bits magic = {113 << 23}; - const unsigned int shifted_exp = 0x7c00 << 13; - float32_bits o; - - o.u = (src_value & 0x7fff) << 13; - unsigned int exp = shifted_exp & o.u; - o.u += (127 - 15) << 23; - - if (exp == shifted_exp) { - o.u += (128 - 16) << 23; - } else if (exp == 0) { - o.u += 1 << 23; - o.f -= magic.f; - } - - o.u |= (src_value & 0x8000) << 16; - return o.f; -} } // namespace mindspore::lite diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_utils.h b/mindspore/lite/src/delegate/tensorrt/tensorrt_utils.h index 48980c2206e..6680227b984 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_utils.h +++ b/mindspore/lite/src/delegate/tensorrt/tensorrt_utils.h @@ -84,8 +84,6 @@ void PackNHWCToNCHWFp16(const void *src, void *dst, size_t batch, size_t plane, std::string GetTensorFormat(nvinfer1::ITensor *trt_tensor, mindspore::Format format); -float ShortToFloat32(uint16_t src_value); - template bool SameDims(const std::vector &shape1, const std::vector &shape2) { if (shape1.size() != shape2.size()) {