提交 375078cf 编写于 作者: M mindspore-ci-bot 提交者: Gitee

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

Merge pull request !3471 from guozhijian/fix_autocontrast_equalize_support_uint8
...@@ -679,9 +679,10 @@ Status AutoContrast(const std::shared_ptr<Tensor> &input, std::shared_ptr<Tensor ...@@ -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 ...@@ -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.");
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册