diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/soft_dvpp/soft_dvpp_decode_random_crop_resize_jpeg_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/soft_dvpp/soft_dvpp_decode_random_crop_resize_jpeg_op.cc index 0ae7195196c..93c8833d9c2 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/soft_dvpp/soft_dvpp_decode_random_crop_resize_jpeg_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/soft_dvpp/soft_dvpp_decode_random_crop_resize_jpeg_op.cc @@ -76,7 +76,8 @@ Status SoftDvppDecodeRandomCropResizeJpegOp::Compute(const std::shared_ptr(cv_tensor); } catch (const cv::Exception &e) { - RETURN_STATUS_UNEXPECTED("Error in soft dvpp image decode and resize."); + std::string error = "Error in SoftDvppDecodeRandomCropResizeJpegOp:" + std::string(e.what()); + RETURN_STATUS_UNEXPECTED(error); } return Status::OK(); } diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/soft_dvpp/soft_dvpp_decode_resize_jpeg_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/soft_dvpp/soft_dvpp_decode_resize_jpeg_op.cc index 3da38af0957..3b6944e9112 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/soft_dvpp/soft_dvpp_decode_resize_jpeg_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/soft_dvpp/soft_dvpp_decode_resize_jpeg_op.cc @@ -41,8 +41,6 @@ Status SoftDvppDecodeResizeJpegOp::Compute(const std::shared_ptr &input, int input_h = 0; RETURN_IF_NOT_OK(GetJpegImageInfo(input, &input_w, &input_h)); - SoftDpCropInfo crop_info{0, 0, 0, 0}; - if (target_width_ == 0) { if (input_h < input_w) { CHECK_FAIL_RETURN_UNEXPECTED(input_h != 0, "The input height is 0"); @@ -71,7 +69,8 @@ Status SoftDvppDecodeResizeJpegOp::Compute(const std::shared_ptr &input, RETURN_IF_NOT_OK(CVTensor::CreateFromMat(out_rgb_img, &cv_tensor)); *output = std::static_pointer_cast(cv_tensor); } catch (const cv::Exception &e) { - RETURN_STATUS_UNEXPECTED("Error in soft dvpp image decode and resize."); + std::string error = "Error in SoftDvppDecodeResizeJpegOp:" + std::string(e.what()); + RETURN_STATUS_UNEXPECTED(error); } return Status::OK(); } diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/soft_dvpp/utils/soft_jpegd.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/soft_dvpp/utils/soft_jpegd.cc index 2cfbe3e71d0..031e77ac9fd 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/soft_dvpp/utils/soft_jpegd.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/soft_dvpp/utils/soft_jpegd.cc @@ -154,13 +154,13 @@ uint32_t SoftJpegd::ConfigVpcInputData(struct VpcInfo *vpc_input_info, int32_t * if ((vpc_input_info->format == INPUT_YUV420_PLANNER || vpc_input_info->format == INPUT_YUV422_PLANNER) && (*width % num2 == 1)) { *width = reinterpret_cast(AlignUp(*width, num2)); - JPEGD_LOGW("vpc width needs align up %d, height is %d.", width, height); + JPEGD_LOGW("vpc width needs align up %d, height is %d.", *width, *height); } if ((vpc_input_info->format == INPUT_YUV420_PLANNER || vpc_input_info->format == INPUT_YUV422_PLANNER) && (*height % num2 == 1)) { *height = reinterpret_cast(AlignUp(*height, num2)); - JPEGD_LOGW("vpc height needs align up %d, height is %d.", width, height); + JPEGD_LOGW("vpc height needs align up %d, height is %d.", *width, *height); } vpc_input_info->addr = soft_decode_out_buf_; diff --git a/mindspore/dataset/transforms/vision/c_transforms.py b/mindspore/dataset/transforms/vision/c_transforms.py index fc7ad571c5f..66b055ab9f4 100644 --- a/mindspore/dataset/transforms/vision/c_transforms.py +++ b/mindspore/dataset/transforms/vision/c_transforms.py @@ -571,9 +571,9 @@ class RandomResizedCropWithBBox(cde.RandomCropAndResizeWithBBoxOp): size (Union[int, sequence]): The size of the output image. If size is an int, a square crop of size (size, size) is returned. If size is a sequence of length 2, it should be (height, width). - scale (tuple, optional): Range (min, max) of respective size of the original + scale (tuple, optional): Range [min, max) of respective size of the original size to be cropped (default=(0.08, 1.0)). - ratio (tuple, optional): Range (min, max) of aspect ratio to be cropped + ratio (tuple, optional): Range [min, max) of aspect ratio to be cropped (default=(3. / 4., 4. / 3.)). interpolation (Inter mode, optional): Image interpolation mode (default=Inter.BILINEAR). It can be any of [Inter.BILINEAR, Inter.NEAREST, Inter.BICUBIC]. @@ -610,9 +610,9 @@ class RandomResizedCrop(cde.RandomCropAndResizeOp): size (Union[int, sequence]): The size of the output image. If size is an int, a square crop of size (size, size) is returned. If size is a sequence of length 2, it should be (height, width). - scale (tuple, optional): Range (min, max) of respective size of the original + scale (tuple, optional): Range [min, max) of respective size of the original size to be cropped (default=(0.08, 1.0)). - ratio (tuple, optional): Range (min, max) of aspect ratio to be cropped + ratio (tuple, optional): Range [min, max) of aspect ratio to be cropped (default=(3. / 4., 4. / 3.)). interpolation (Inter mode, optional): Image interpolation mode (default=Inter.BILINEAR). It can be any of [Inter.BILINEAR, Inter.NEAREST, Inter.BICUBIC]. @@ -831,12 +831,12 @@ class RandomCropDecodeResize(cde.RandomCropDecodeResizeOp): Equivalent to RandomResizedCrop, but crops before decodes. Args: - size (Union[int, sequence], optional): The size of the output image. + size (Union[int, sequence]): The size of the output image. If size is an int, a square crop of size (size, size) is returned. If size is a sequence of length 2, it should be (height, width). - scale (tuple, optional): Range (min, max) of respective size of the + scale (tuple, optional): Range [min, max) of respective size of the original size to be cropped (default=(0.08, 1.0)). - ratio (tuple, optional): Range (min, max) of aspect ratio to be + ratio (tuple, optional): Range [min, max) of aspect ratio to be cropped (default=(3. / 4., 4. / 3.)). interpolation (Inter mode, optional): Image interpolation mode (default=Inter.BILINEAR). It can be any of [Inter.BILINEAR, Inter.NEAREST, Inter.BICUBIC]. @@ -986,12 +986,12 @@ class SoftDvppDecodeRandomCropResizeJpeg(cde.SoftDvppDecodeRandomCropResizeJpegO The usage scenario is consistent with SoftDvppDecodeReiszeJpeg. Args: - size (Union[int, sequence], optional): The size of the output image. + size (Union[int, sequence]): The size of the output image. If size is an int, a square crop of size (size, size) is returned. If size is a sequence of length 2, it should be (height, width). - scale (tuple, optional): Range (min, max) of respective size of the + scale (tuple, optional): Range [min, max) of respective size of the original size to be cropped (default=(0.08, 1.0)). - ratio (tuple, optional): Range (min, max) of aspect ratio to be + ratio (tuple, optional): Range [min, max) of aspect ratio to be cropped (default=(3. / 4., 4. / 3.)). max_attempts (int, optional): The maximum number of attempts to propose a valid crop_area (default=10). If exceeded, fall back to use center_crop instead.