From eaa37b9a07b0c16df8f438887cd63988d291fea4 Mon Sep 17 00:00:00 2001 From: zhoufeng Date: Wed, 16 Dec 2020 10:11:58 +0800 Subject: [PATCH] fix 310 compile failed Signed-off-by: zhoufeng --- mindspore/ccsrc/minddata/dataset/CMakeLists.txt | 5 ----- .../kernels/image/dvpp/dvpp_decode_resize_crop_jpeg_op.cc | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/mindspore/ccsrc/minddata/dataset/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/CMakeLists.txt index 24501d6baf..9352e57ecb 100644 --- a/mindspore/ccsrc/minddata/dataset/CMakeLists.txt +++ b/mindspore/ccsrc/minddata/dataset/CMakeLists.txt @@ -193,11 +193,6 @@ endif () ################# Link with external libraries ######################## target_link_libraries(_c_dataengine PRIVATE mindspore mindspore_gvar) - -if (ENABLE_ACL) - target_link_libraries(_c_dataengine PRIVATE ascendcl acl_dvpp) -endif () - if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") if (ENABLE_PYTHON) target_link_libraries(_c_dataengine PRIVATE mindspore::pybind11_module ${PYTHON_LIBRARIES} ${SECUREC_LIBRARY}) diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/dvpp/dvpp_decode_resize_crop_jpeg_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/dvpp/dvpp_decode_resize_crop_jpeg_op.cc index a74f3d6479..a5c021bfd1 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/dvpp/dvpp_decode_resize_crop_jpeg_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/dvpp/dvpp_decode_resize_crop_jpeg_op.cc @@ -72,7 +72,7 @@ Status DvppDecodeResizeCropJpegOp::Compute(const std::shared_ptr &input, // Third part end where we execute the core function of dvpp auto data = std::static_pointer_cast(process.Get_Memory_Data()); unsigned char *ret_ptr = data.get(); - std::shared_ptr(DvppDataInfo) CropOut = process.Get_Device_Memory_Data(); + std::shared_ptr CropOut = process.Get_Device_Memory_Data(); dsize_t dvpp_length = CropOut->dataSize; const TensorShape dvpp_shape({dvpp_length, 1, 1}); const DataType dvpp_data_type(DataType::DE_UINT8);