Commit Graph

47 Commits (0aa5d7be6dadfc16e0f3a39f03c02446cf4c206f)

Author SHA1 Message Date
Tong Gao a979346e35
Update demo docs (#1360)
* update

* update

* update

* update

* demo
2022-09-01 09:23:06 +08:00
Xinyu Wang 8b32ea6fa9
[Docs] Training & Testing Tutorials (#1331)
* zh-cn train & test tutorial

* add En

* fix comments

* Update docs/en/user_guides/train_test.md

Co-authored-by: Tong Gao <gaotongxiao@gmail.com>
2022-08-30 19:54:04 +08:00
Xinyu Wang 9bd5258513
[Refactor] Adapt to new dataflow (#1305)
* datasample->datasamples

* update rec data preprocessor

* rename datasamples

* update det preprocessor

* update metric

* update data_sample->data_samples in test

* update

* fix data preprocessor uts

* remove engine runner

* fix kie ut

* fix ut

* fix comments

* refactor evaluator ut

* apply comments

Co-authored-by: Tong Gao <gaotongxiao@gmail.com>

* remove useless

* apply comments

Co-authored-by: Tong Gao <gaotongxiao@gmail.com>

* apply comments

Co-authored-by: Tong Gao <gaotongxiao@gmail.com>

Co-authored-by: Tong Gao <gaotongxiao@gmail.com>
2022-08-25 11:45:42 +08:00
Tong Gao 6f30020eec
[CI] Add CI (#1176)
* [CI] Add CI

* update init

* fix lint

* fix lint

* fix linting

* fix linting

* fix linting

* fix

* fix

* fix

* fix

* fix

* fix

* disable github ci

* fix

* Update .circleci/test.yml

Co-authored-by: Qing Jiang <mountchicken@outlook.com>

* fix

* fix

Co-authored-by: Qing Jiang <mountchicken@outlook.com>
2022-07-21 14:28:57 +08:00
jiangqing.vendor dc84187311 [TODO] Replace loss_module with module_loss 2022-07-21 10:57:31 +08:00
gaotongxiao 914c8af7bf Revert "[TODO] Add LoadImageFromLMDB"
This reverts commit e716ae726f007f79effdf2d45b4955a887f3c1e3
2022-07-21 10:57:30 +08:00
liukuikun 23458f8a47 [Refactor] union to MODELS 2022-07-21 10:50:56 +08:00
liukuikun a90b9600ce [Refactor] refactor DATASETS and TRANSFORMS 2022-07-21 10:50:55 +08:00
liukuikun e1e26d3f74
[Enchance] add codespell ignore and use mdformat (#1022)
* update

* update contributing

* update ci

* fix md

* update pre-commit hook

* update mdformat

Co-authored-by: gaotongxiao <gaotongxiao@gmail.com>
2022-06-09 14:58:44 +08:00
Jianquan Ye 061d353b2a
[Model] Add MASTER (#807)
* fix #794: add MASTER

* fix conflict add MASTER

* fix conflict add MASTER

* fix conflict add MASTER

* fix conflict add MASTER

* fix conflict add MASTER

* fix conflict add MASTER

* fix conflict add MASTER

* Fix linting

* after git rebase main

* after git rebase main

* fix conflict add MASTER

* fix conflict add MASTER

* after git rebase main

* fix conflict add MASTER

* fix conflict add MASTER

* fix conflict add MASTER

* after git rebase main

* add GCAModule to plugins

* coexist master and master_old

* fix merge mmocr 0.5.0 conflict

* fix lint error

* update

* [fix] remove remains in __init__

* [update] update code in review

* update readme for master

* Add docstr to MasterDecoder, refined MasterDecoder, remove MASTERLoss

* Unify the output length of MasterDecoder in train and test mode; add test for it, remove MasterLoss

* update readme

* update

* update metafile,README,demo/README,config,ocr.py

* Update mmocr/utils/ocr.py

* update

Co-authored-by: gaotongxiao <gaotongxiao@gmail.com>
Co-authored-by: Mountchicken <mountchicken@outlook.com>
2022-05-05 16:06:15 +08:00
Xinyu Wang fbc138d2d3
[Feature] Add DBNet++ (#973)
* add dbnet++

* fix docstring

* fix some param names

* fix

* fix docstring

* add init

* add doc; remove configs

* add dbnet++ to readme

* fix readme

* update config

* update readme

* update readme

* update ocr.py

* update metafile.yml

* update readme

* update readme

* move to dbnetpp

* fix paths

* fix head level

* fix typo

* update demo.md

* Update configs/textdet/dbnetpp/README.md

Co-authored-by: Tong Gao <gaotongxiao@gmail.com>

* fix typo

* fix link
2022-05-05 14:39:20 +08:00
Y-M-Y 3179e4d6bd
[Feature] Add analyze_logs in tools and its description in docs (#899)
* Create analyze_logs.py

* Update tools.md

* fix lint and typo

* Update analyze_logs.py

* Add arg table and demo log file

* Delete line66 for lint error

* fix captial letters

* update doc

* fix markdown indentation

* Add log_analysis_demo.png to demo/resources

* Add log_analysis_demo.png and two links in table

* Improve epoch-based metric

* fix lint error

* fix lint error(tabs and spaces)

* check code lints and format

Co-authored-by: Mountchicken <mountchicken@outlook.com>
Co-authored-by: xinke-wang <wangxinyu2017@gmail.com>
2022-04-02 22:40:39 +08:00
garvan2021 c79a62487d
[Feature] Add Tesserocr Inference (#814)
* append tesserocr to requirements list, but may encounter build error at windows platform

* simply save

* 2022.3.4

* opencv-python==4.5.5 can cause cv2.error when print_result=True

* append MMOCR.tesseract_det_inference()

* argument check append

* fix lint error

* update commentary

* lint fix

* requirement remove opencv

* handle tessdata problem

* support tesseract recognition

* fix some bugs

* fix imshow bug

* support batch mode(fake)

* modify annotation

* refactor BaseRecognizer for show_result

* append pytest

* Mock tesseract

* Fix test

* remove \n from Tesseract

* normalize text score

* update docs
2022-03-28 22:50:53 +08:00
Tong Gao a851fadcb0
[Docs] Update tutorial notebook (#853) 2022-03-21 19:38:35 +08:00
DEEPBLUE 186aecbf59
[Docs] Add demo/README_zh.md (#802)
* add README_zh.md

* translate

* rough translation

* refine demo/README_zh.md

* fixes #802

* fix #802

* add README_zh.md

* fixes #802

* Update README_zh.md

* fix white-space problem

* Update demo/README_zh.md

Co-authored-by: Tong Gao <gaotongxiao@gmail.com>

* Update demo/README_zh.md

Co-authored-by: Tong Gao <gaotongxiao@gmail.com>

* fix Readthedocs' keywords @gaotongxiao

* Fix minor errors, rename the file and process this file in the scripts for redthedocs

Co-authored-by: Tong Gao <gaotongxiao@gmail.com>
2022-03-02 09:51:37 +08:00
Tong Gao 5582e17feb
[Enhancement] Automatically infer device for inference if not speicifed (#781)
* [Enhancement] Automatically infer device for inference if not speicifed

* update docs

* fix unit test
2022-02-16 20:42:47 +08:00
Tong Gao c466e6f82d
[Enhancement] Upgrade isort (#771)
* [Enhancement] Upgrade isort

* Fix files
2022-02-09 23:22:14 +08:00
Hongbin Sun f8dfbd4177
[Fix] Support both ConcatDataset and UniformConcatDataset (#675)
* support UniformConcatDataset

* update

* rm useless

* handle 2d-list datasets
2021-12-22 12:32:02 +00:00
Tong Gao 9104667112
[Model] Full ABINet Framework (#651)
Co-authored-by: liukuikun <24622904+Harold-lkk@users.noreply.github.com>
2021-12-15 11:21:54 +08:00
Tong Gao c39f1160ac
add chinese ocr to ocr.py and fix its docs (#579) 2021-11-12 11:03:29 +08:00
Tong Gao c0728c49b8
[Docs] Refactor docs (#409) 2021-08-25 16:41:07 +08:00
Tong Gao ef111b7c55
[Enhancement] Update demo/ (#454)
* update demo

* rm demo/readme.md
2021-08-25 03:45:47 +00:00
Tong Gao b8f7ead74c
[Enhancement] Add copyright info (#439)
* add copyright info
2021-08-17 17:39:30 +08:00
Omkar Manjrekar 68ec3f5519
Add kie image demo and docs. (#374)
* Add kie_image_demo.py

* Add kie demo docs

* Add brief instructions for kie image demo

* Add ann file field and return data for kie image demo

* Follow lint and import rules

* Fix bugs, reuse functions in KIEDataset, and use a new demo pic

* Add config-dir and fix indexing bug in ocr script

* [Feature] Improve ocr.py

1. Add box stitching back to ocr.py
2. Add config_dir which allows users to specify the default config path
3. Warn users when overriding parameters are set
4. Allow users to use customized checkpoint files

* Add docs for new ocr.py

* Add docs for merge

* Support kie in ocr.py

* Merged kie to ocr.py

* update docs, remove unsupported unvisual sdmgr

* Update mmocr/apis/inference.py

Co-authored-by: Hongbin Sun <hongbin306@gmail.com>

* Apply suggestions from code review

Co-authored-by: Hongbin Sun <hongbin306@gmail.com>

* fix linting

Co-authored-by: gaotongxiao <gaotongxiao@gmail.com>
Co-authored-by: Hongbin Sun <hongbin306@gmail.com>
2021-08-04 14:20:13 +08:00
SamAyala 76785e185a
User friendly API v2 + Docs ! (#371)
* major update

- Refactor code
- Support for folder and list/tuple or np.arrays or img paths
- Better export method
* feature update

- Batch size support
- More refactoring

* added docs


* Optimize docs structure, fix improper layout in readthedocs


Co-authored-by: gaotongxiao <gaotongxiao@gmail.com>
2021-07-25 00:22:27 +08:00
Tong Gao 4fcff1f613
[Docs] Add cn docs framework (#353)
* add CN demo docs

* add deployment.md to docs

* add placeholder CN docs

* Add language switching hint
2021-07-07 14:13:27 +08:00
miwojc 57e752e9b2
Update MMOCR_Tutorial.ipynb (#330)
add change directory to `mmocr` after git clone: `%cd mmocr`
"!pip install -r requirements.txt\n", was failing in colab as after git clone one needs to change dir to mmocr.
2021-06-29 17:00:47 +08:00
GT 9a2a8aa662
fix import in demo (#304) 2021-06-21 03:04:26 +00:00
GT 9582f93c70
Support ocr box stitching (#290)
* ocr box stitching

* rename a varible

* add a demo

* move functions to box_util
add test
2021-06-19 19:28:14 +08:00
AllentDan d57f279083
[Fix] Correct isort setup (#288)
* isort

* remove tools from setup.cfg
2021-06-16 19:44:01 +08:00
lizz 5121b9fd94
Support cpu for ocr demo (#227)
Signed-off-by: lizz <lizz@sensetime.com>
2021-05-22 15:51:21 +08:00
hq_wei 24c590bb04
Ner task (#148)
* update ner standard code format

* add pytest

* fix pre-commit

* Annotate the dataset section

* fix pre-commit for dataset

* rm big files and add comments in dataset

* rename configs for ner task

* minor changes if metric

* Note modification

* fix pre-commit

* detail modification

* rm transform

* rm magic number

* fix warnings in pylint

* fix pre-commit

* correct help info

* rename model files

* rename err fixed

* 428_tag

* Adjust to more general pipline

* update unit test rate

* update

* Unit test coverage over 90% and add Readme

* modify details

* fix precommit

* update

* fix pre-commit

* update

* update

* update

* update result

* update readme

* update baseline config

* update config and small minor changes

* minor changes in readme and etc.

* back to original

* update toy config

* upload model and log

* fix pytest

* Modify the notes.

* fix readme

* Delete Chinese punctuation

* add demo and fix some logic and naming problems

* add To_tensor transformer for ner and load pretrained model in config

* delete extra lines

* split ner loss to MaskedCrossEntropyLoss and MaskedFocalLoss

* update config

* fix err

* updata

* modify noqa

* update new model report

* fix err in ner demo

* Update ner_dataset.py

* Update test_ner_dataset.py

* Update ner_dataset.py

* Update ner_transforms.py

* rm toy config and data

* add comment

* add empty

* fix conflict

* fix precommit

* fix pytest

* fix pytest err

* Update ner_dataset.py

* change dataset name to cluener2020

* move the postprocess in metric to convertor

* rm __init__ etc.

* precommit

* add discription in loss

* add auto download

* add http

* update

* remove some 'issert'

* replace unsqueeze

* update config

* update doc and bert.py

* update

* update demo code

Co-authored-by: weihuaqiang <weihuaqiang@sensetime.com>
Co-authored-by: Hongbin Sun <hongbin306@gmail.com>
2021-05-18 11:33:51 +08:00
quincylin1 ed6b3b890a
modified mmocr colab (#199)
* modified mmocr colab

* modified mmocr colab

* modified mmmocr colab

* modified mmocr colab

* modified mmocr colab

* modified mmocr colab

* modified mmocr colab

* modified colab link

* rerun pre-commit

* rerun pre-commit
2021-05-18 11:13:07 +08:00
jeffreykuang 94cd52dc4a
simplify installation procedure (#188)
* postproc

* mv postproc of textdet in mmcv

* linting

* change deps mmcv 1.3.4

* update deps

* linting

* Update configs/textdet/panet/panet_r18_fpem_ffm_600e_icdar2015.py

* Update docs/changelog.md

* Update mmocr/models/textdet/postprocess/__init__.py

* Update mmocr/version.py

* resize&recompress jpg

* Update changelog.md

Co-authored-by: Hongbin Sun <hongbin306@gmail.com>
2021-05-15 10:34:37 +08:00
Hongbin Sun 05aedf11d6
update demo docs for batch inference (#181) 2021-05-13 17:58:38 +08:00
Hongbin Sun 97e2f27017
fix #173: support aug test (#178)
* fix #173: support aug test

* fix pytest

* support batch inference for both text det and recog

* update unittest

* use one img for batch infer test
2021-05-13 07:18:00 +00:00
Hongbin Sun e2643df439
move demo image to demo/resources (#171)
* move demo image to demo/resources

* update index.rst

* revert

* update github link for demo image
2021-05-12 20:35:39 +08:00
lizz 04273b325a
Update image link (#170)
Signed-off-by: lizz <lizz@sensetime.com>
2021-05-12 06:16:22 +00:00
Sergio Bugallo Enjamio 18c54afbdc
Add support for batch inference (#86)
* Add support for numpy arrays in model_inference

* Add test for numpy ndarray inference

* Fix linting problems

* Add support for batch inference

* Add batch inference demo script

* Fix comment

* Test batch inference with paths and arrays

* lint code

* Update model_inference docstring

* Refactor model inference tests

* Change inference function to make text detectors and recognizers use the same input data types

* Change single state text detector model to support batch inference

* Lint code

* simplify inference tests

* Remove psenet from batch inference test cases to prevent the pytest being killed

* Update batch_image_demo.py

* fix bug when test with dataset 

fix bug when test with dataset, for example, `./tools/dist_test.sh configs/textrecog/sar/sar_r31_parallel_decoder_academic.py <checkpoint> 1 --eval acc`

Co-authored-by: Hongbin Sun <hongbin306@gmail.com>
2021-05-12 02:04:01 +00:00
Hongbin Sun 3b9306ca79
Hbsun/demo doc (#168)
* move demo.md to demo/docs

* update link in md
2021-05-12 09:57:53 +08:00
Hongbin Sun 45d22b12c6
update demo docs (#166)
* update demo docs

* update docs
2021-05-11 21:13:19 +08:00
quincylin1 3ccec09106
add mmocr demo documentation (#151)
* add mmocr demo documentation

* Update text_det_demo.md

* Update text_recog_demo.md

* Update README.md

* Update README.md

* Update README.md

Co-authored-by: Hongbin Sun <hongbin306@gmail.com>
2021-05-11 16:38:57 +08:00
quincylin1 40f10cc996
fix issue#127: changed save_path to out_file (#141) 2021-04-29 15:46:46 +08:00
Hongbin Sun d541de77c7
use mmcv dump instead (#120) 2021-04-23 10:27:12 +08:00
Hongbin Sun 43dcb32d4f
Hbsun/end2end demo (#105)
* add end2end demo

* fix typo

* pad box

* fix bug of crnn

* fix polygon

* update docstring

* fix bug of polygon

* updare demo api

* fix except

* rename

* fix with comments
2021-04-22 20:42:42 +08:00
lizz 44ca9c2a61
Remove usage of \ (#49)
* Remove usage of \

Signed-off-by: lizz <lizz@sensetime.com>

* rebase

Signed-off-by: lizz <lizz@sensetime.com>

* typos

Signed-off-by: lizz <lizz@sensetime.com>

* Remove test dependency on tools/

Signed-off-by: lizz <lizz@sensetime.com>

* Remove usage of \

Signed-off-by: lizz <lizz@sensetime.com>

* rebase

Signed-off-by: lizz <lizz@sensetime.com>

* typos

Signed-off-by: lizz <lizz@sensetime.com>

* Remove test dependency on tools/

Signed-off-by: lizz <lizz@sensetime.com>

* typo

Signed-off-by: lizz <lizz@sensetime.com>

* KIE in keywords

Signed-off-by: lizz <lizz@sensetime.com>

* some renames

Signed-off-by: lizz <lizz@sensetime.com>

* kill isort skip

Signed-off-by: lizz <lizz@sensetime.com>

* aggregation discrimination

Signed-off-by: lizz <lizz@sensetime.com>

* aggregation discrimination

Signed-off-by: lizz <lizz@sensetime.com>

* tiny

Signed-off-by: lizz <lizz@sensetime.com>

* fix bug: model infer on cpu

Co-authored-by: Hongbin Sun <hongbin306@gmail.com>
2021-04-06 12:16:46 +00:00
jeffreykuang 31f1c007c0 [feature]: add textdet 2021-04-03 01:03:52 +08:00