Browse Source

!3399 Fixing Bug with AutoContrast/Equalize supporting uint8 dtype/mnist

Merge pull request !3399 from islam_amin/autocontrast_bug
tags/v0.7.0-beta
mindspore-ci-bot Gitee 5 years ago
parent
commit
60feafd75e
2 changed files with 3 additions and 2 deletions
  1. +3
    -2
      mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc
  2. BIN
      tests/ut/data/dataset/golden/autcontrast_01_result_c.npz

+ 3
- 2
mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc View File

@@ -679,9 +679,10 @@ Status AutoContrast(const std::shared_ptr<Tensor> &input, std::shared_ptr<Tensor
} }
cv::Mat result; cv::Mat result;
cv::merge(image_result, result); cv::merge(image_result, result);
result.convertTo(result, input_cv->mat().type());
std::shared_ptr<CVTensor> output_cv = std::make_shared<CVTensor>(result); std::shared_ptr<CVTensor> output_cv = std::make_shared<CVTensor>(result);
if (input_cv->Rank() == 2) output_cv->Squeeze();
(*output) = std::static_pointer_cast<Tensor>(output_cv); (*output) = std::static_pointer_cast<Tensor>(output_cv);
(*output)->Reshape(input->shape());
} catch (const cv::Exception &e) { } catch (const cv::Exception &e) {
RETURN_STATUS_UNEXPECTED("Error in auto contrast"); RETURN_STATUS_UNEXPECTED("Error in auto contrast");
} }
@@ -781,8 +782,8 @@ Status Equalize(const std::shared_ptr<Tensor> &input, std::shared_ptr<Tensor> *o
cv::Mat result; cv::Mat result;
cv::merge(image_result, result); cv::merge(image_result, result);
std::shared_ptr<CVTensor> output_cv = std::make_shared<CVTensor>(result); std::shared_ptr<CVTensor> output_cv = std::make_shared<CVTensor>(result);
if (input_cv->Rank() == 2) output_cv->Squeeze();
(*output) = std::static_pointer_cast<Tensor>(output_cv); (*output) = std::static_pointer_cast<Tensor>(output_cv);
(*output)->Reshape(input->shape());
} catch (const cv::Exception &e) { } catch (const cv::Exception &e) {
RETURN_STATUS_UNEXPECTED("Error in equalize."); RETURN_STATUS_UNEXPECTED("Error in equalize.");
} }


BIN
tests/ut/data/dataset/golden/autcontrast_01_result_c.npz View File


Loading…
Cancel
Save