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

migrate to core v3 #117

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
+410 −432
Draft

migrate to core v3 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
83baf9c
split up prediction to avoid overly large batches (causing OOM)
bertsky Sep 12, 2024
bf755a3
adapt to ocrd>=3.0
bertsky Sep 13, 2024
1edd5e7
make test: no assumption on OCRD resource location
bertsky Sep 15, 2024
3333cab
tests: adapt to v3, overhaul and add caching+threading modes
bertsky Sep 15, 2024
7aae9bc
require ocrd 3.0 and calamari-ocr 1.0.7
bertsky Sep 16, 2024
9611e2c
aggregate all lines instead of per region to better utilise batched p…
bertsky Sep 17, 2024
fb2a680
run prediction in bg thread (shared across pages to interleave CPU/GPU)
bertsky Sep 18, 2024
b9b0e13
let GPU memory grow by demand (instead of exclusive reservation)
bertsky Sep 18, 2024
46c2ef6
no more need for model fixup
bertsky Sep 18, 2024
e68ce5f
CI: increase RAM
bertsky Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
key: v01-pydeps-<< parameters.python-image >>-{{ checksum "requirements.txt" }}-{{ checksum "requirements-dev.txt" }}
paths:
- "~/.cache/pip"
resource_class: large

workflows:
build:
Expand Down
4 changes: 1 addition & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ install:

$(MODEL):
ocrd resmgr download ocrd-calamari-recognize $@
# Workaround, see #91 https://github.com/OCR-D/ocrd_calamari/issues/91
fix-calamari1-model ~/.local/share/ocrd-resources/ocrd-calamari-recognize/$@

# Download example data (for the README)
example: $(EXAMPLE)
Expand Down Expand Up @@ -84,7 +82,7 @@ assets-clean:
# Run unit tests
test: test/assets $(MODEL)
# declare -p HTTP_PROXY
$(PYTHON) -m pytest --continue-on-collection-errors test $(PYTEST_ARGS)
$(PYTHON) -m pytest --continue-on-collection-errors --durations=0 test $(PYTEST_ARGS)

# Run unit tests and determine test coverage
coverage: test/assets $(MODEL)
Expand Down
5 changes: 0 additions & 5 deletions ocrd_calamari/config.py
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions ocrd_calamari/ocrd-tool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,8 @@
"recognition/text-recognition"
],
"description": "Recognize lines with Calamari",
"input_file_grp": [
"OCR-D-SEG-LINE"
],
"output_file_grp": [
"OCR-D-OCR-CALAMARI"
],
"input_file_grp_cardinality": 1,
"output_file_grp_cardinality": 1,
"parameters": {
"checkpoint_dir": {
"description": "The directory containing calamari model files (*.ckpt.json). Uses all checkpoints in that directory",
Expand Down
Loading