From 21284b43da4bf51307a038b7b877b6444c5bb992 Mon Sep 17 00:00:00 2001 From: LDOUBLEV Date: Wed, 11 May 2022 19:18:05 +0800 Subject: [PATCH 1/5] add DB-R50 --- doc/doc_ch/PP-OCRv3_introduction.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/doc_ch/PP-OCRv3_introduction.md b/doc/doc_ch/PP-OCRv3_introduction.md index b8a6ad1245..5d7a522217 100644 --- a/doc/doc_ch/PP-OCRv3_introduction.md +++ b/doc/doc_ch/PP-OCRv3_introduction.md @@ -54,6 +54,7 @@ PP-OCRv3检测模型是对PP-OCRv2中的[CML](https://arxiv.org/pdf/2109.03144.p |序号|策略|模型大小|hmean|速度（cpu + mkldnn)| |-|-|-|-|-| |baseline teacher|PP-OCR server|49M|83.2%|171ms| +|baseline teacher|DB-R50|99M|83.5%|260ms| |teacher1|DB-R50-LK-PAN|124M|85.0%|396ms| |teacher2|DB-R50-LK-PAN-DML|124M|86.0%|396ms| |baseline student|PP-OCRv2|3M|83.2%|117ms| From 37302052a63f7e99230a22d709229c667840c2f4 Mon Sep 17 00:00:00 2001 From: LDOUBLEV Date: Wed, 11 May 2022 19:19:59 +0800 Subject: [PATCH 2/5] add en --- doc/doc_en/PP-OCRv3_introduction_en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/doc_en/PP-OCRv3_introduction_en.md b/doc/doc_en/PP-OCRv3_introduction_en.md index 9ab25653e2..9ed07f7252 100644 --- a/doc/doc_en/PP-OCRv3_introduction_en.md +++ b/doc/doc_en/PP-OCRv3_introduction_en.md @@ -56,6 +56,7 @@ The ablation experiments are as follows: |ID|Strategy|Model Size|Hmean|The Inference Time（cpu + mkldnn)| |-|-|-|-|-| |baseline teacher|PP-OCR server|49M|83.2%|171ms| +|baseline teacher|DB-R50|99M|83.5%|260ms| |teacher1|DB-R50-LK-PAN|124M|85.0%|396ms| |teacher2|DB-R50-LK-PAN-DML|124M|86.0%|396ms| |baseline student|PP-OCRv2|3M|83.2%|117ms| From 35541e83c713ca912e317709ff9f580b9b4c27b9 Mon Sep 17 00:00:00 2001 From: LDOUBLEV Date: Wed, 11 May 2022 19:23:56 +0800 Subject: [PATCH 3/5] fix --- doc/doc_ch/PP-OCRv3_introduction.md | 1 - doc/doc_en/PP-OCRv3_introduction_en.md | 1 - 2 files changed, 2 deletions(-) diff --git a/doc/doc_ch/PP-OCRv3_introduction.md b/doc/doc_ch/PP-OCRv3_introduction.md index 5d7a522217..5d14b695b1 100644 --- a/doc/doc_ch/PP-OCRv3_introduction.md +++ b/doc/doc_ch/PP-OCRv3_introduction.md @@ -53,7 +53,6 @@ PP-OCRv3检测模型是对PP-OCRv2中的[CML](https://arxiv.org/pdf/2109.03144.p |序号|策略|模型大小|hmean|速度（cpu + mkldnn)| |-|-|-|-|-| -|baseline teacher|PP-OCR server|49M|83.2%|171ms| |baseline teacher|DB-R50|99M|83.5%|260ms| |teacher1|DB-R50-LK-PAN|124M|85.0%|396ms| |teacher2|DB-R50-LK-PAN-DML|124M|86.0%|396ms| diff --git a/doc/doc_en/PP-OCRv3_introduction_en.md b/doc/doc_en/PP-OCRv3_introduction_en.md index 9ed07f7252..6a787eb03d 100644 --- a/doc/doc_en/PP-OCRv3_introduction_en.md +++ b/doc/doc_en/PP-OCRv3_introduction_en.md @@ -55,7 +55,6 @@ The ablation experiments are as follows: |ID|Strategy|Model Size|Hmean|The Inference Time（cpu + mkldnn)| |-|-|-|-|-| -|baseline teacher|PP-OCR server|49M|83.2%|171ms| |baseline teacher|DB-R50|99M|83.5%|260ms| |teacher1|DB-R50-LK-PAN|124M|85.0%|396ms| |teacher2|DB-R50-LK-PAN-DML|124M|86.0%|396ms| From f5666b1387c52a7a1ab74000c38c61520da151c0 Mon Sep 17 00:00:00 2001 From: LDOUBLEV Date: Wed, 11 May 2022 19:26:11 +0800 Subject: [PATCH 4/5] fix --- doc/doc_ch/PP-OCRv3_introduction.md | 1 - doc/doc_en/PP-OCRv3_introduction_en.md | 1 - 2 files changed, 2 deletions(-) diff --git a/doc/doc_ch/PP-OCRv3_introduction.md b/doc/doc_ch/PP-OCRv3_introduction.md index 5d14b695b1..3c17921a24 100644 --- a/doc/doc_ch/PP-OCRv3_introduction.md +++ b/doc/doc_ch/PP-OCRv3_introduction.md @@ -57,7 +57,6 @@ PP-OCRv3检测模型是对PP-OCRv2中的[CML](https://arxiv.org/pdf/2109.03144.p |teacher1|DB-R50-LK-PAN|124M|85.0%|396ms| |teacher2|DB-R50-LK-PAN-DML|124M|86.0%|396ms| |baseline student|PP-OCRv2|3M|83.2%|117ms| -|student0|DB-MV3-RSE-FPN|3.6M|84.5%|124ms| |student1|DB-MV3-CML（teacher2）|3M|84.3%|117ms| |student2|DB-MV3-RSE-FPN-CML（teacher2）|3.6M|85.4%|124ms| diff --git a/doc/doc_en/PP-OCRv3_introduction_en.md b/doc/doc_en/PP-OCRv3_introduction_en.md index 6a787eb03d..07894340c2 100644 --- a/doc/doc_en/PP-OCRv3_introduction_en.md +++ b/doc/doc_en/PP-OCRv3_introduction_en.md @@ -59,7 +59,6 @@ The ablation experiments are as follows: |teacher1|DB-R50-LK-PAN|124M|85.0%|396ms| |teacher2|DB-R50-LK-PAN-DML|124M|86.0%|396ms| |baseline student|PP-OCRv2|3M|83.2%|117ms| -|student0|DB-MV3-RSE-FPN|3.6M|84.5%|124ms| |student1|DB-MV3-CML（teacher2）|3M|84.3%|117ms| |student2|DB-MV3-RSE-FPN-CML（teacher2）|3.6M|85.4%|124ms| From e94d674623579a37d8121109b692f02055479ad3 Mon Sep 17 00:00:00 2001 From: LDOUBLEV Date: Thu, 12 May 2022 16:12:09 +0800 Subject: [PATCH 5/5] fix --- ppocr/data/imaug/label_ops.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ppocr/data/imaug/label_ops.py b/ppocr/data/imaug/label_ops.py index c9bc2e7722..02a5187dad 100644 --- a/ppocr/data/imaug/label_ops.py +++ b/ppocr/data/imaug/label_ops.py @@ -438,7 +438,12 @@ class KieLabelEncode(object): texts.append(ann['transcription']) text_ind = [self.dict[c] for c in text if c in self.dict] text_inds.append(text_ind) - labels.append(ann['label']) + if 'label' in anno.keys(): + labels.append(ann['label']) + elif 'key_cls' in anno.keys(): + labels.append(anno['key_cls']) + else: + raise ValueError("Cannot found 'key_cls' in ann.keys(), please check your training annotation.") edges.append(ann.get('edge', 0)) ann_infos = dict( image=data['image'],