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.

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

Update min/med/max table, ht @bertsky, OCR-D/ocrd-website#92 #86

Merged
merged 3 commits into from
Jun 10, 2020
Merged
Changes from 2 commits
Commits
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
27 changes: 16 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -295,12 +295,13 @@ docker pull ocrd/all:maximum
Usage is the same [as if you had built the image yourself](#results).

This table lists which tag contains which module:

| Module | `minimum` | `medium` | `maximum` |
| ----- | ---- | ---- | ---- |
| core | ☑ | ☑ | ☑ |
| ocrd_cis | ☑ | ☑ | ☑ |
| ocrd_fileformat | ☑ | ☑ | ☑ |
| ocrd_im6convert | ☑ | ☑ | ☑ |
| ocrd_pagetopdf | ☑ | ☑ | ☑ |
| ocrd_repair_inconsistencies | ☑ | ☑ | ☑ |
| ocrd_tesserocr | ☑ | ☑ | ☑ |
| tesserocr | ☑ | ☑ | ☑ |
Expand All @@ -314,13 +315,12 @@ This table lists which tag contains which module:
| ocrd_segment | - | ☑ | ☑ |
| tesseract | - | ☑ | ☑ |
| ocrd_anybaseocr | - | - | ☑ |
| ocrd_kraken | - | - | ☑ |
| ocrd_ocropy | - | - | ☑ |
| ocrd_pc_segmentation | - | - | ☑ |
| ocrd_typegroups_classifier | - | - | ☑ |
| sbb_textline_detector | - | - | ☑ |
| cor-asv-fst | - | - | - |
| clstm | - | - | - |
| ocrd_kraken | - | - | - |
| ocrd_ocropy | - | - | - |
| cor-asv-fst | - | - | ☑ |

**Note**: The following modules have been disabled by default and can only be
enabled by explicitly setting `OCRD_MODULES` or `DISABLED_MODULES`:
Expand Down Expand Up @@ -355,16 +355,21 @@ Modules may require mutually exclusive sets of dependent packages.
`pip` does not even stop or resolve conflicts – it merely warns!

- Tensorflow:
* `tensorflow-gpu==1.14.0` (required by ocrd_calamari and ocrd_anybaseocr)
* `tensorflow` (required by cor-asv-ann and ocrd_keraslm)
* version 2 (required by ocrd_anybaseocr for dewarping and page segmentation)
* version 1 (required by cor-asv-ann, ocrd_keraslm, ocrd_calamari and sbb_textline_detector)
bertsky marked this conversation as resolved.
Show resolved Hide resolved

The temporary solution is to require different package names:
- `tensorflow>=2`
- `tensorflow-gpu==1.15.*`

Both can be installed in parallel in different versions, but may depend on a mutually exclusive set of `tensorboard` and `tensorflow_estimator`.
Both can be installed in parallel in different versions, but may depend on a mutually exclusive set of `tensorboard` and `tensorflow_estimator`. (However, these latter conflicts are only cosmetic, as they are only needed for development.)

bertsky marked this conversation as resolved.
Show resolved Hide resolved
Moreover, in the future, some modules (but not others) may depend on `tensorflow>=2.0`, which again is incompatible.
- OpenCV:
* `opencv-python-headlesss` (required by core and others, avoids pulling in X11 libraries)
* `opencv-python` (required by ocrd_anybaseocr)
* custom build on ARM...
* `opencv-python` (probably dragged in by third party packages)

As long as we keep reinstalling the headless variant and no such package attempts GUI, we should be fine.
Custom build (as needed for ARM) under the _module_ `opencv-python` already creates the headless variant.

- ...

Expand Down