Browse Source

fix 310 compile failed

Signed-off-by: zhoufeng <zhoufeng54@huawei.com>
tags/v1.1.0
zhoufeng 5 years ago
parent
commit
eaa37b9a07
2 changed files with 1 additions and 6 deletions
  1. +0
    -5
      mindspore/ccsrc/minddata/dataset/CMakeLists.txt
  2. +1
    -1
      mindspore/ccsrc/minddata/dataset/kernels/image/dvpp/dvpp_decode_resize_crop_jpeg_op.cc

+ 0
- 5
mindspore/ccsrc/minddata/dataset/CMakeLists.txt View File

@@ -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})


+ 1
- 1
mindspore/ccsrc/minddata/dataset/kernels/image/dvpp/dvpp_decode_resize_crop_jpeg_op.cc View File

@@ -72,7 +72,7 @@ Status DvppDecodeResizeCropJpegOp::Compute(const std::shared_ptr<Tensor> &input,
// Third part end where we execute the core function of dvpp
auto data = std::static_pointer_cast<unsigned char>(process.Get_Memory_Data());
unsigned char *ret_ptr = data.get();
std::shared_ptr(DvppDataInfo) CropOut = process.Get_Device_Memory_Data();
std::shared_ptr<DvppDataInfo> 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);


Loading…
Cancel
Save