From b9706189a7d1b462b80b084da405654e80470825 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Thu, 30 Apr 2020 14:58:19 +0200 Subject: [PATCH 1/3] Update min/med/max table, ht @bertsky, OCR-D/ocrd-website#92 --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c424072f..7933a60c 100644 --- a/README.md +++ b/README.md @@ -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 | ☑ | ☑ | ☑ | @@ -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`: From ba0bcbcb68e42a6802f78722bd8a64855484b970 Mon Sep 17 00:00:00 2001 From: Robert Sachunsky <38561704+bertsky@users.noreply.github.com> Date: Thu, 30 Apr 2020 20:29:19 +0200 Subject: [PATCH 2/3] README: update _conflicting requirements_ section --- README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7933a60c..dfeb32c8 100644 --- a/README.md +++ b/README.md @@ -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) - Both can be installed in parallel in different versions, but may depend on a mutually exclusive set of `tensorboard` and `tensorflow_estimator`. + 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`. (However, these latter conflicts are only cosmetic, as they are only needed for development.) - 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. - ... From 5eb12bfa3a3d31e2e1d8ecb3f8ed45e119dd81ad Mon Sep 17 00:00:00 2001 From: Robert Sachunsky <38561704+bertsky@users.noreply.github.com> Date: Wed, 10 Jun 2020 11:46:05 +0200 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dfeb32c8..ce5013b9 100644 --- a/README.md +++ b/README.md @@ -355,7 +355,7 @@ Modules may require mutually exclusive sets of dependent packages. `pip` does not even stop or resolve conflicts – it merely warns! - Tensorflow: - * version 2 (required by ocrd_anybaseocr for dewarping and page segmentation) + * version 2 (required by ocrd_anybaseocr and ocrd_pc_segmentation) * version 1 (required by cor-asv-ann, ocrd_keraslm, ocrd_calamari and sbb_textline_detector) The temporary solution is to require different package names: