Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherrypicking GH-10217 and GH-10216 to PaddlePaddle:Release/2.7 #10655

Merged
merged 2 commits into from
Aug 16, 2023
Merged

Cherrypicking GH-10217 and GH-10216 to PaddlePaddle:Release/2.7 #10655

merged 2 commits into from
Aug 16, 2023

Conversation

UserUnknownFactor
Copy link
Contributor

No description provided.

@paddle-bot
Copy link

paddle-bot bot commented Aug 16, 2023

Thanks for your contribution!

shiyutang
shiyutang approved these changes Aug 16, 2023
View reviewed changes
Copy link
Collaborator

@shiyutang shiyutang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@shiyutang shiyutang merged commit b17c2f3 into PaddlePaddle:release/2.7 Aug 16, 2023
@shiyutang shiyutang added the Code PR is needed This issue could inspire a code PR label Aug 16, 2023
@shiyutang shiyutang added Contributor PR is merged and removed Code PR is needed This issue could inspire a code PR labels Aug 16, 2023
@UserUnknownFactor UserUnknownFactor mentioned this pull request Aug 16, 2023
Merged
@UserUnknownFactor UserUnknownFactor deleted the release/2.7 branch August 16, 2023 11:15
@Gmgge
Copy link
Contributor

Gmgge commented Aug 31, 2023 •
edited
Loading

@UserUnknownFactor @shiyutang
If you need a alphacolor, please note that the image reading check_img function is used by both PaddleOCR and PPStructure. Since your alpha_to_color is only called in PaddleOCR, PPOCRLabel cannot be started.
My suggestion is that if you need a transparent color, please put its alpha_to_color call in check_img to ensure the consistency of image decoding for PaddleOCR and PPStructure.

本次修改带来问题，如果有需要，我可以进行本次问题的二次修复，因为先前有人无法运行PPOCRLabel，我根据先前paddleocr的经验，告诉他们是通道溢出的问题，当我看到本次提交的时候，才发现是增加了对透明通道的需求，不过带来了一些其他bug需要修复。

@shiyutang
Copy link
Collaborator

好的，感谢，请问可以指出哪一处代码修改带来的问题么？

@Gmgge
Copy link
Contributor

Gmgge commented Sep 5, 2023

不止一处，目前是check_img的读取逻辑出现问题，有的逻辑分支获取三通道，有的获取四通道，而这个函数又被paddleocr paddlelabel调用，今天晚上我会提个pr进行修改，目前来说该函数功能稍微复杂，会增加注释，以防后续的开发者无法理解其行为。

This was referenced Sep 5, 2023
Closed
Closed
tink2123 added a commit that referenced this pull request Sep 7, 2023
@ToddBear @tink2123
@Topdu @dyning @UserUnknownFactor @itasli @USTCKAY @dvorst @shiyutang @xu-peng-7 @ncoffman
Add new recognition method "ParseQ" (#10836)
75d1661 
* Update PP-OCRv4_introduction.md

* Update PP-OCRv4_introduction.md (#10616)

* Update PP-OCRv4_introduction.md

* Update PP-OCRv4_introduction.md

* Update PP-OCRv4_introduction.md

* Update README.md

* Cherrypicking GH-10217 and GH-10216 to PaddlePaddle:Release/2.7 (#10655)

* Don't break overall processing on a bad image

* Add preprocessing common to OCR tasks
Add preprocessing to options

* Update requirements.txt (#10656)

added missing pyyaml library

* [TIPC]update xpu tipc script (#10658)

* fix-typo (#10642)

Co-authored-by: Dennis <dvorst@users.noreply.github.com>
Co-authored-by: shiyutang <34859558+shiyutang@users.noreply.github.com>

* 修改数据增强导致的DSR报错 (#10662) (#10681)

* 修改数据增强导致的DSR报错

* 错误修改回滚

* Update algorithm_overview_en.md (#10670)

Fixed simple spelling errors.

* Implement recoginition method ParseQ

* Document update for new recognition method ParseQ

* add prediction for parseq

* Update rec_vit_parseq.yml

* Update rec_r31_sar.yml

* Update rec_r31_sar.yml

* Update rec_r50_fpn_srn.yml

* Update rec_vit_parseq.py

* Update rec_vit_parseq.yml

* Update rec_parseq_head.py

* Update rec_img_aug.py

* Update rec_vit_parseq.yml

* Update __init__.py

* Update predict_rec.py

* Update paddleocr.py

* Update requirements.txt

* Update utility.py

* Update utility.py

---------

Co-authored-by: xiaoting <31891223+tink2123@users.noreply.github.com>
Co-authored-by: topduke <784990967@qq.com>
Co-authored-by: dyning <dyning.2003@163.com>
Co-authored-by: UserUnknownFactor <63057995+UserUnknownFactor@users.noreply.github.com>
Co-authored-by: itasli <ilyas.tasli@outlook.fr>
Co-authored-by: Kai Song <50285351+USTCKAY@users.noreply.github.com>
Co-authored-by: dvorst <87502756+dvorst@users.noreply.github.com>
Co-authored-by: Dennis <dvorst@users.noreply.github.com>
Co-authored-by: shiyutang <34859558+shiyutang@users.noreply.github.com>
Co-authored-by: Dec20B <1192152456@qq.com>
Co-authored-by: ncoffman <51147417+ncoffman@users.noreply.github.com>
andyjiang1116 pushed a commit that referenced this pull request Sep 21, 2023
@Gmgge
fix:修复通道数不匹配造成的PPOCRLabel启动失败问题#10748,根据更新日志发现#10655，由于paddleocr中增加了对…
2fdac31 
…透明色的需求，由于在check_img中以及存在对单通道图像转三通道图像的处理，因此将该四通道图像处理成三通道的图像也放入该check_img，并统一三通道图像输出逻辑。 (#10847)

add:由于函数复杂度增高，增加注释。
jzhang533 pushed a commit to jzhang533/PaddleOCR that referenced this pull request Mar 28, 2024
@UserUnknownFactor @jzhang533
Cherrypicking PaddlePaddleGH-10217 and PaddlePaddleGH-10216 to Paddle…
b25111c 
…Paddle:Release/2.7 (PaddlePaddle#10655)

* Don't break overall processing on a bad image

* Add preprocessing common to OCR tasks
Add preprocessing to options
gknor-edrone pushed a commit to edrone/PaddleOCR that referenced this pull request Sep 9, 2024
@UserUnknownFactor @gknor-edrone
Cherrypicking PaddlePaddleGH-10217 and PaddlePaddleGH-10216 to Paddle…
8626089 
…Paddle:Release/2.7 (PaddlePaddle#10655)

* Don't break overall processing on a bad image

* Add preprocessing common to OCR tasks
Add preprocessing to options
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shiyutang shiyutang shiyutang approved these changes

Assignees
No one assigned
Labels
contributor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@UserUnknownFactor @Gmgge @shiyutang