From babfc8bc05673e48f0a76a55b768943006401b4a Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 7 Mar 2022 22:55:26 +0100 Subject: [PATCH 01/12] Remove unneeded virtual environment headless-torch14 Move ocrd_detectron2 to headless-tf1 to avoid conflicts in the main virtual environment. Signed-off-by: Stefan Weil --- Makefile | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index e6281308..8f4b2428 100644 --- a/Makefile +++ b/Makefile @@ -27,11 +27,9 @@ ifeq (0, $(MAKELEVEL)) SUB_VENV = $(VIRTUAL_ENV)/sub-venv SUB_VENV_TF1 = $(SUB_VENV)/headless-tf1 SUB_VENV_TF2 = $(SUB_VENV)/headless-tf2 -SUB_VENV_TORCH14 = $(SUB_VENV)/headless-torch14 else SUB_VENV_TF1 = $(VIRTUAL_ENV) SUB_VENV_TF2 = $(VIRTUAL_ENV) -SUB_VENV_TORCH14 = $(VIRTUAL_ENV) endif BIN = $(VIRTUAL_ENV)/bin @@ -262,12 +260,12 @@ endif ifneq ($(findstring ocrd_detectron2, $(OCRD_MODULES)),) OCRD_EXECUTABLES += $(OCRD_DETECTRON2) OCRD_DETECTRON2 += $(BIN)/ocrd-detectron2-segment -$(call multirule,$(OCRD_DETECTRON2)): ocrd_detectron2 $(SUB_VENV_TORCH14)/bin/activate +$(call multirule,$(OCRD_DETECTRON2)): ocrd_detectron2 $(SUB_VENV_TF1)/bin/activate ifeq (0,$(MAKELEVEL)) - $(MAKE) -B -o $< $(notdir $(OCRD_DETECTRON2)) VIRTUAL_ENV=$(SUB_VENV_TORCH14) - $(call delegate_venv,$(OCRD_DETECTRON2),$(SUB_VENV_TORCH14)) + $(MAKE) -B -o $< $(notdir $(OCRD_DETECTRON2)) VIRTUAL_ENV=$(SUB_VENV_TF1) + $(call delegate_venv,$(OCRD_DETECTRON2),$(SUB_VENV_TF1)) ocrd_detectron2-check: - $(MAKE) check OCRD_MODULES=ocrd_detectron2 VIRTUAL_ENV=$(SUB_VENV_TORCH14) + $(MAKE) check OCRD_MODULES=ocrd_detectron2 VIRTUAL_ENV=$(SUB_VENV_TF1) else . $(ACTIVATE_VENV) && $(MAKE) -C $< deps $(pip_install) @@ -508,16 +506,9 @@ ifneq ($(findstring ocrd_typegroups_classifier, $(OCRD_MODULES)),) OCRD_EXECUTABLES += $(OCRD_TYPECLASS) OCRD_TYPECLASS := $(BIN)/ocrd-typegroups-classifier OCRD_TYPECLASS += $(BIN)/typegroups-classifier -$(call multirule,$(OCRD_TYPECLASS)): ocrd_typegroups_classifier $(SUB_VENV_TORCH14)/bin/activate -ifeq (0,$(MAKELEVEL)) - $(MAKE) -B -o $< $(notdir $(OCRD_TYPECLASS)) VIRTUAL_ENV=$(SUB_VENV_TORCH14) - $(call delegate_venv,$(OCRD_TYPECLASS),$(SUB_VENV_TORCH14)) -ocrd_typegroups_classifier-check: - $(MAKE) check OCRD_MODULES=ocrd_typegroups_classifier VIRTUAL_ENV=$(SUB_VENV_TORCH14) -else +$(call multirule,$(OCRD_TYPECLASS)): ocrd_typegroups_classifier $(pip_install) endif -endif ifneq ($(findstring ocrd_doxa, $(OCRD_MODULES)),) OCRD_EXECUTABLES += $(OCRD_DOXA) From df2b4604645206b9c1a0f24ab7f4d4e44ea93702 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Tue, 8 Mar 2022 07:57:21 +0100 Subject: [PATCH 02/12] Remove unneeded virtual environment headless-tf2 Move ocrd_cis to headless-tf1 to avoid a conflict with ocrd_calamari. Signed-off-by: Stefan Weil --- Makefile | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 8f4b2428..b657aa8a 100644 --- a/Makefile +++ b/Makefile @@ -26,10 +26,8 @@ export VIRTUAL_ENV ?= $(CURDIR)/venv ifeq (0, $(MAKELEVEL)) SUB_VENV = $(VIRTUAL_ENV)/sub-venv SUB_VENV_TF1 = $(SUB_VENV)/headless-tf1 -SUB_VENV_TF2 = $(SUB_VENV)/headless-tf2 else SUB_VENV_TF1 = $(VIRTUAL_ENV) -SUB_VENV_TF2 = $(VIRTUAL_ENV) endif BIN = $(VIRTUAL_ENV)/bin @@ -430,9 +428,16 @@ OCRD_CIS += $(BIN)/ocrd-cis-ocropy-resegment OCRD_CIS += $(BIN)/ocrd-cis-ocropy-segment #OCRD_CIS += $(BIN)/ocrd-cis-ocropy-train OCRD_CIS += $(BIN)/ocrd-cis-postcorrect -$(call multirule,$(OCRD_CIS)): ocrd_cis $(BIN)/ocrd +$(call multirule,$(OCRD_CIS)): ocrd_cis $(BIN)/ocrd $(SUB_VENV_TF1)/bin/activate +ifeq (0,$(MAKELEVEL)) + $(MAKE) -B -o $< $(notdir $(OCRD_CIS)) VIRTUAL_ENV=$(SUB_VENV_TF1) + $(call delegate_venv,$(OCRD_CIS),$(SUB_VENV_TF1)) +ocrd_cis-check: + $(MAKE) check OCRD_MODULES=ocrd_cis VIRTUAL_ENV=$(SUB_VENV_TF1) +else $(pip_install) endif +endif ifneq ($(findstring ocrd_pagetopdf, $(OCRD_MODULES)),) deps-ubuntu-modules: ocrd_pagetopdf @@ -449,31 +454,17 @@ install-models-calamari: $(BIN)/ocrd . $(ACTIVATE_VENV) && ocrd resmgr download ocrd-calamari-recognize '*' OCRD_EXECUTABLES += $(OCRD_CALAMARI) OCRD_CALAMARI := $(BIN)/ocrd-calamari-recognize -$(OCRD_CALAMARI): ocrd_calamari $(SUB_VENV_TF2)/bin/activate -ifeq (0,$(MAKELEVEL)) - $(MAKE) -B -o $< $(notdir $(OCRD_CALAMARI)) VIRTUAL_ENV=$(SUB_VENV_TF2) - $(call delegate_venv,$(OCRD_CALAMARI),$(SUB_VENV_TF2)) -ocrd_calamari-check: - $(MAKE) check OCRD_EXECUTABLES=$(OCRD_CALAMARI) VIRTUAL_ENV=$(SUB_VENV_TF2) -else +$(OCRD_CALAMARI): ocrd_calamari $(pip_install) endif -endif ifneq ($(findstring ocrd_pc_segmentation, $(OCRD_MODULES)),) OCRD_EXECUTABLES += $(OCRD_PC_SEGMENTATION) OCRD_PC_SEGMENTATION := $(BIN)/ocrd-pc-segmentation -$(OCRD_PC_SEGMENTATION): ocrd_pc_segmentation $(SUB_VENV_TF2)/bin/activate -ifeq (0,$(MAKELEVEL)) - $(MAKE) -B -o $< $(notdir $(OCRD_PC_SEGMENTATION)) VIRTUAL_ENV=$(SUB_VENV_TF2) - $(call delegate_venv,$(OCRD_PC_SEGMENTATION),$(SUB_VENV_TF2)) -ocrd_pc_segmentation-check: - $(MAKE) check OCRD_MODULES=ocrd_pc_segmentation VIRTUAL_ENV=$(SUB_VENV_TF2) -else +$(OCRD_PC_SEGMENTATION): ocrd_pc_segmentation . $(ACTIVATE_VENV) && $(MAKE) -C $< deps $(pip_install) endif -endif ifneq ($(findstring ocrd_anybaseocr, $(OCRD_MODULES)),) install-models: install-models-anybaseocr @@ -491,16 +482,9 @@ OCRD_ANYBASEOCR += $(BIN)/ocrd-anybaseocr-dewarp OCRD_ANYBASEOCR += $(BIN)/ocrd-anybaseocr-tiseg OCRD_ANYBASEOCR += $(BIN)/ocrd-anybaseocr-textline OCRD_ANYBASEOCR += $(BIN)/ocrd-anybaseocr-layout-analysis -$(call multirule,$(OCRD_ANYBASEOCR)): ocrd_anybaseocr $(SUB_VENV_TF2)/bin/activate -ifeq (0,$(MAKELEVEL)) - $(MAKE) -B -o $< $(notdir $(OCRD_ANYBASEOCR)) VIRTUAL_ENV=$(SUB_VENV_TF2) - $(call delegate_venv,$(OCRD_ANYBASEOCR),$(SUB_VENV_TF2)) -ocrd_anybaseocr-check: - $(MAKE) check OCRD_MODULES=ocrd_anybaseocr VIRTUAL_ENV=$(SUB_VENV_TF2) -else +$(call multirule,$(OCRD_ANYBASEOCR)): ocrd_anybaseocr $(pip_install) endif -endif ifneq ($(findstring ocrd_typegroups_classifier, $(OCRD_MODULES)),) OCRD_EXECUTABLES += $(OCRD_TYPECLASS) From b706ad5787a87f00663f0f17233bbcce7e3494c2 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Fri, 29 Apr 2022 13:34:13 +0200 Subject: [PATCH 03/12] Update clean target to remove base directory of sub venvs too Signed-off-by: Stefan Weil --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e6281308..f9f3fd93 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ endif .PHONY: all modules clean help show check always-update install-models clean: # add more prerequisites for clean below - $(RM) -r $(SUB_VENV)/* + $(RM) -r $(SUB_VENV) $(RM) -r $(CURDIR)/venv # deliberately not using VIRTUAL_ENV here $(RM) -r $(HOME)/.parallel/semaphores/id-ocrd_all_git/ From 24577681864a5678db52da93bd00fd47f3b3e516 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Fri, 29 Apr 2022 13:35:55 +0200 Subject: [PATCH 04/12] Update clean target to remove all potential OCR-D semaphore files Makefile uses GNU parallel semaphores not only for git but also for pip, but the old rule only cleaned the former ones. Signed-off-by: Stefan Weil --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f9f3fd93..45435556 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ endif clean: # add more prerequisites for clean below $(RM) -r $(SUB_VENV) $(RM) -r $(CURDIR)/venv # deliberately not using VIRTUAL_ENV here - $(RM) -r $(HOME)/.parallel/semaphores/id-ocrd_all_git/ + $(RM) -r $(HOME)/.parallel/semaphores/id-ocrd_* define HELP cat <<"EOF" From d53b5b00fc4d27ad1872e38edfbeef283e65a0b7 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Fri, 29 Apr 2022 13:43:47 +0200 Subject: [PATCH 05/12] Update ocrd_cis Signed-off-by: Stefan Weil --- ocrd_cis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocrd_cis b/ocrd_cis index 2cdfa794..ca15800f 160000 --- a/ocrd_cis +++ b/ocrd_cis @@ -1 +1 @@ -Subproject commit 2cdfa7949dbf2e965aa8f44e91cb2353994d9464 +Subproject commit ca15800f86e6ece0e390bd41a6b2d66295f5bc74 From 7fbee34aadf74d4fa3ee988b798c92434eb88120 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Tue, 3 May 2022 11:20:12 +0200 Subject: [PATCH 06/12] :memo: changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98bcfd3b..5cd666e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +Changed: + + * `make clean`: remove sub-venvs and all semaphores, #315 + ## [v2022-03-30](https://github.com/OCR-D/ocrd_all/releases/v2022-03-30) ### [core](https://github.com/OCR-D/core) [6d359e7](https://github.com/OCR-D/core/commits/6d359e7)..[f9c2b6c](https://github.com/OCR-D/core/commits/f9c2b6c) From 5c60bf695813db23e357d19b9f80d66dbb83d196 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Tue, 3 May 2022 12:27:25 +0200 Subject: [PATCH 07/12] keep ocrd_cis in main venv --- Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 9d84edf6..0922e416 100644 --- a/Makefile +++ b/Makefile @@ -428,16 +428,9 @@ OCRD_CIS += $(BIN)/ocrd-cis-ocropy-resegment OCRD_CIS += $(BIN)/ocrd-cis-ocropy-segment #OCRD_CIS += $(BIN)/ocrd-cis-ocropy-train OCRD_CIS += $(BIN)/ocrd-cis-postcorrect -$(call multirule,$(OCRD_CIS)): ocrd_cis $(BIN)/ocrd $(SUB_VENV_TF1)/bin/activate -ifeq (0,$(MAKELEVEL)) - $(MAKE) -B -o $< $(notdir $(OCRD_CIS)) VIRTUAL_ENV=$(SUB_VENV_TF1) - $(call delegate_venv,$(OCRD_CIS),$(SUB_VENV_TF1)) -ocrd_cis-check: - $(MAKE) check OCRD_MODULES=ocrd_cis VIRTUAL_ENV=$(SUB_VENV_TF1) -else +$(call multirule,$(OCRD_CIS)): ocrd_cis $(BIN)/ocrd $(pip_install) endif -endif ifneq ($(findstring ocrd_pagetopdf, $(OCRD_MODULES)),) deps-ubuntu-modules: ocrd_pagetopdf From d7f9c958283a9b6466572a192cd46b542f9d6721 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Tue, 3 May 2022 15:13:26 +0200 Subject: [PATCH 08/12] update 2022-05-03 --- CHANGELOG.md | 117 +++++++++++++++++++++++++++++++++++++++++ core | 2 +- eynollah | 2 +- ocrd_detectron2 | 2 +- ocrd_doxa | 2 +- ocrd_fileformat | 2 +- ocrd_keraslm | 2 +- ocrd_segment | 2 +- opencv-python | 2 +- sbb_binarization | 2 +- workflow-configuration | 2 +- 11 files changed, 127 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cd666e4..0f7f1120 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,127 @@ ## Unreleased +## [v2022-05-03](https://github.com/OCR-D/ocrd_all/releases/v2022-05-03) + Changed: * `make clean`: remove sub-venvs and all semaphores, #315 +### [core](https://github.com/OCR-D/core) [f9c2b6c](https://github.com/OCR-D/core/commits/f9c2b6c)..[ecdb840](https://github.com/OCR-D/core/commits/ecdb840) + +> Release: [v2.33.0](https://github.com/OCR-D/core/releases/v2.33.0) + + > * :package: v2.33.0 + > * :memo: changelog + > * Merge remote-tracking branch 'stweil/master' + > * :memo: changelog + > * Merge remote-tracking branch 'mexthecat/issues_838' + > * :memo: changelog + > * Merge remote-tracking branch 'origin/remove-assets-server' + > * :memo: changelog + > * Merge remote-tracking branch 'bertsky/workspace-altimg-retrieve-existing' + > * :memo: changelog + > * workspace bulk_add: fix automatic file_id + > * Simplify Makefile + > * Remove version restrictions for pip (no longer needed) + > * Always use apt --no-install-recommend + > * Merge branch 'master' of https://github.com/OCR-D/core + > * :memo: changelog + > * workspace.remove_file_group: pass recursive + +### [eynollah](https://github.com/qurator-spk/eynollah) [10f1ace](https://github.com/qurator-spk/eynollah/commits/10f1ace)..[ae1990a](https://github.com/qurator-spk/eynollah/commits/ae1990a) + +> Release: [v0.0.11](https://github.com/qurator-spk/eynollah/releases/v0.0.11) + + > * Merge pull request #74 from cneud/main + > * require model command line option (fix #59) (#73) + > * Update README.md + > * Merge pull request #71 from mikegerber/fix/downgrade-patch-dim-log + > * issue #55 resolved + > * updating model directory + > * Merge pull request #70 from qurator-spk/cneud-readme + +### [ocrd_detectron2](https://github.com/bertsky/ocrd_detectron2) [5bb90b1](https://github.com/bertsky/ocrd_detectron2/commits/5bb90b1)..[855fc3b](https://github.com/bertsky/ocrd_detectron2/commits/855fc3b) + +> Release: [v0.1.1](https://github.com/bertsky/ocrd_detectron2/releases/v0.1.1) + + > * update requirements + > * Fix sed command for MacOS + > * make deps: ignore CUDA 11.2 + +### [ocrd_doxa](https://github.com/bertsky/ocrd_doxa) [351eb0c](https://github.com/bertsky/ocrd_doxa/commits/351eb0c)..[a95f8e7](https://github.com/bertsky/ocrd_doxa/commits/a95f8e7) + +> Release: [v0.0.2](https://github.com/bertsky/ocrd_doxa/releases/v0.0.2) + + > * :package: v0.0.2 + > * add missing param 'dpi' + +### [ocrd_fileformat](https://github.com/OCR-D/ocrd_fileformat) [9451a99](https://github.com/OCR-D/ocrd_fileformat/commits/9451a99)..[38f4edf](https://github.com/OCR-D/ocrd_fileformat/commits/38f4edf) + +> Release: [v0.5.0](https://github.com/OCR-D/ocrd_fileformat/releases/v0.5.0) + + > * :package: v0.5.0 + > * update README + > * run pages in parallel (2 concurrent jobs) + > * make install: differentiate between install-tools (script+json) and deps (just OCRD) + > * use bulk-add and update to core 2.30 + > * simplify and update to core 2.29 + > * update ocr-fileformat + > * allow all supported transforms for from-to + +### [ocrd_keraslm](https://github.com/OCR-D/ocrd_keraslm) [b11b51d](https://github.com/OCR-D/ocrd_keraslm/commits/b11b51d)..[2101c8f](https://github.com/OCR-D/ocrd_keraslm/commits/2101c8f) + +> Release: [v0.4.1](https://github.com/OCR-D/ocrd_keraslm/releases/v0.4.1) + + > * Merge pull request #18 from OCR-D/update-ws-cli + > * Merge pull request #20 from stweil/update + +### [ocrd_segment](https://github.com/OCR-D/ocrd_segment) [f6c7f1c](https://github.com/OCR-D/ocrd_segment/commits/f6c7f1c)..[e9acc81](https://github.com/OCR-D/ocrd_segment/commits/e9acc81) + +> Release: [v0.1.20](https://github.com/OCR-D/ocrd_segment/releases/v0.1.20) + + > * :package: 0.1.20 + > * extract_pages: fix interference between plotting and JSON extraction in b024b80aa + > * alpha shape: make even more robust yet + > * alpha shape: make more robust + > * :package: 0.1.19 + > * repair (`sanitize`): rewrite… + > * repair (`plausibilize`): use true alpha shape instead of convex hull + > * project: reduce default alpha for alphashape + > * project: add level-of-operation=table + > * repair: add option 'simplify', generalize 'ensure_consistent' + > * Shapely 1.8 compatibility + > * :package: 0.1.18 + > * extract-lines: fix regression in 8bfeb9f9bf + +### [opencv-python](https://github.com/skvark/opencv-python) [0eb6c12](https://github.com/skvark/opencv-python/commits/0eb6c12)..[5de8d66](https://github.com/skvark/opencv-python/commits/5de8d66) + +> Release: [64](https://github.com/skvark/opencv-python/releases/64) + + > * Merge pull request #644 from nsait-linaro/windows-arm64 + > * Merge pull request #652 from asenyaev/asen/pinned_dependencies + > * Merge pull request #637 from orbisvicis/master + +### [sbb_binarization](https://github.com/qurator-spk/sbb_binarization) [8dd0506](https://github.com/qurator-spk/sbb_binarization/commits/8dd0506)..[0877199](https://github.com/qurator-spk/sbb_binarization/commits/0877199) + +> Release: [v0.0.9](https://github.com/qurator-spk/sbb_binarization/releases/v0.0.9) + + > * importing types from click is enough + > * Update cli.py + > * fixing #30. Directory of model(s) is needed not model file name. + > * Merge pull request #36 from qurator-spk/0.0.9 + > * improve usage instructions + > * Merge pull request #35 from cneud/upgrade_to_tf2_with_tf1.compat_session + > * Revert "Merge pull request #34 from qurator-spk/upgrade_to_tf2_with_compat_mode" + > * Merge pull request #34 from qurator-spk/upgrade_to_tf2_with_compat_mode + > * Merge pull request #31 from bertsky/factor-setup + +### [workflow-configuration](https://github.com/bertsky/workflow-configuration) [bef631c](https://github.com/bertsky/workflow-configuration/commits/bef631c)..[e50dee4](https://github.com/bertsky/workflow-configuration/commits/e50dee4) + + > * Modifiy cp statement (fix build on MacOS) + > * ocrd-import: allow running in parallel + > * ocrd-import: use bulk-add for speedup + ## [v2022-03-30](https://github.com/OCR-D/ocrd_all/releases/v2022-03-30) ### [core](https://github.com/OCR-D/core) [6d359e7](https://github.com/OCR-D/core/commits/6d359e7)..[f9c2b6c](https://github.com/OCR-D/core/commits/f9c2b6c) diff --git a/core b/core index f9c2b6c8..ecdb840d 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit f9c2b6c825186d6021d28b2deb9616f645ccfb68 +Subproject commit ecdb840dcfd972fcf1ad63c99bf724b0e89bc9fa diff --git a/eynollah b/eynollah index 10f1acef..ae1990a4 160000 --- a/eynollah +++ b/eynollah @@ -1 +1 @@ -Subproject commit 10f1acef2958649469097993a4b18c0acf0dd37b +Subproject commit ae1990a48e4a6dcd7f3a5af6603433944d38f621 diff --git a/ocrd_detectron2 b/ocrd_detectron2 index 5bb90b18..855fc3b6 160000 --- a/ocrd_detectron2 +++ b/ocrd_detectron2 @@ -1 +1 @@ -Subproject commit 5bb90b18343393eaff9ab7874ace5b5bc6dcc22d +Subproject commit 855fc3b6a8b614544ee5442a41dab87d98171f55 diff --git a/ocrd_doxa b/ocrd_doxa index 351eb0ca..a95f8e77 160000 --- a/ocrd_doxa +++ b/ocrd_doxa @@ -1 +1 @@ -Subproject commit 351eb0ca33d7a1a5784638b2d77adaee423ee3f8 +Subproject commit a95f8e77886c9860101392d088742ca0af277945 diff --git a/ocrd_fileformat b/ocrd_fileformat index 9451a99f..38f4edf9 160000 --- a/ocrd_fileformat +++ b/ocrd_fileformat @@ -1 +1 @@ -Subproject commit 9451a99f222274530c85a8d626f9c7813cf68ae6 +Subproject commit 38f4edf9c9166546a47ac8006945c07742634988 diff --git a/ocrd_keraslm b/ocrd_keraslm index b11b51d3..2101c8fa 160000 --- a/ocrd_keraslm +++ b/ocrd_keraslm @@ -1 +1 @@ -Subproject commit b11b51d307799bff5ad55ccc197093530d71389e +Subproject commit 2101c8fac85d1bab84dfd91365ec0378b5e6d914 diff --git a/ocrd_segment b/ocrd_segment index f6c7f1c8..e9acc811 160000 --- a/ocrd_segment +++ b/ocrd_segment @@ -1 +1 @@ -Subproject commit f6c7f1c8148762e85bb0857c4a65f5bcc9c7b9ff +Subproject commit e9acc81145393d516ff47d403f52c4fc532fe668 diff --git a/opencv-python b/opencv-python index 0eb6c12b..5de8d66d 160000 --- a/opencv-python +++ b/opencv-python @@ -1 +1 @@ -Subproject commit 0eb6c12bf296008f4df9155d2c73ce5b16a3958a +Subproject commit 5de8d66d454c8fd946ae17dcfcb285b16aa6049b diff --git a/sbb_binarization b/sbb_binarization index 8dd05064..0877199c 160000 --- a/sbb_binarization +++ b/sbb_binarization @@ -1 +1 @@ -Subproject commit 8dd05064b2dbdc7d4bdfb8896251302e8ec5ecb3 +Subproject commit 0877199c68a318067935d57a088f9bcf1afac8c2 diff --git a/workflow-configuration b/workflow-configuration index bef631cd..e50dee42 160000 --- a/workflow-configuration +++ b/workflow-configuration @@ -1 +1 @@ -Subproject commit bef631cd3a87f7e98a3233cceb0d3ccbca0ce85a +Subproject commit e50dee42f358d1568743a1e0f18ac3d4c527a937 From 1dd05ae40dbba521bc0a76ba9e79606a53c916ca Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Tue, 3 May 2022 15:22:56 +0200 Subject: [PATCH 09/12] :memo: changelog (ocrd_cis) --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f7f1120..75b28346 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,20 @@ Changed: > * updating model directory > * Merge pull request #70 from qurator-spk/cneud-readme +### [ocrd_cis](https://github.com/cisocrgroup/ocrd_cis) [ca15800](https://github.com/cisocrgroup/ocrd_cis/commits/ca15800)..[2cdfa79 (rewind)](https://github.com/cisocrgroup/ocrd_cis/commits/2cdfa79 (rewind)) + +> Release: [v0.1.5](https://github.com/cisocrgroup/ocrd_cis/releases/v0.1.5) + + > join_polygons (alpha shape): make more robust + > remove Calamari dependency (not used, only CLI callout) + > segment: for more robust bg separator detection, combine criteria of gradient maximum and percentile + > segment: rewrite separator detection… + > resegment: if method=lineest, then annotate baselines, too + > resegment (ccomps/baseline): propagate/spread twice to catch diacritics/punctuation, too + > re/segment: alpha shape: smaller α to avoid holes + > segment: fix lines2regions non-continguous partitions + > segment: annotate baselines, too + ### [ocrd_detectron2](https://github.com/bertsky/ocrd_detectron2) [5bb90b1](https://github.com/bertsky/ocrd_detectron2/commits/5bb90b1)..[855fc3b](https://github.com/bertsky/ocrd_detectron2/commits/855fc3b) > Release: [v0.1.1](https://github.com/bertsky/ocrd_detectron2/releases/v0.1.1) From 520f101f073d632264a69879c39abeda5403b10d Mon Sep 17 00:00:00 2001 From: Robert Sachunsky <38561704+bertsky@users.noreply.github.com> Date: Tue, 3 May 2022 19:01:19 +0200 Subject: [PATCH 10/12] move eynollah and sbb_binarization into top venv --- Makefile | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 0922e416..8608e81e 100644 --- a/Makefile +++ b/Makefile @@ -502,17 +502,9 @@ install-models-sbb-binarization: OCRD_EXECUTABLES += $(SBB_BINARIZATION) SBB_BINARIZATION := $(BIN)/ocrd-sbb-binarize -$(SBB_BINARIZATION): sbb_binarization $(SUB_VENV_TF1)/bin/activate -ifeq (0,$(MAKELEVEL)) - $(MAKE) -B -o $< $(notdir $(SBB_BINARIZATION)) VIRTUAL_ENV=$(SUB_VENV_TF1) - $(call delegate_venv,$(SBB_BINARIZATION),$(SUB_VENV_TF1)) -sbb_binarization-check: - $(MAKE) check OCRD_MODULES=sbb_binarization VIRTUAL_ENV=$(SUB_VENV_TF1) -else - $(pip_install_tf1nvidia) +$(SBB_BINARIZATION): sbb_binarization $(pip_install) endif -endif ifneq ($(findstring eynollah, $(OCRD_MODULES)),) install-models: install-models-eynollah @@ -521,17 +513,9 @@ install-models-eynollah: . $(ACTIVATE_VENV) && ocrd resmgr download ocrd-eynollah-segment '*' OCRD_EXECUTABLES += $(EYNOLLAH_SEGMENT) EYNOLLAH_SEGMENT := $(BIN)/ocrd-eynollah-segment -$(EYNOLLAH_SEGMENT): eynollah $(SUB_VENV_TF1)/bin/activate -ifeq (0,$(MAKELEVEL)) - $(MAKE) -B -o $< $(notdir $(EYNOLLAH_SEGMENT)) VIRTUAL_ENV=$(SUB_VENV_TF1) - $(call delegate_venv,$(EYNOLLAH_SEGMENT),$(SUB_VENV_TF1)) -eynollah-check: - $(MAKE) check OCRD_MODULES=eynollah VIRTUAL_ENV=$(SUB_VENV_TF1) -else - $(pip_install_tf1nvidia) +$(EYNOLLAH_SEGMENT): eynollah $(pip_install) endif -endif ifneq ($(findstring ocrd_repair_inconsistencies, $(OCRD_MODULES)),) OCRD_EXECUTABLES += $(OCRD_REPAIR_INCONSISTENCIES) From b9ba60cc5196fb95cfa94f72de55b90ade7da33a Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Tue, 3 May 2022 23:34:12 +0200 Subject: [PATCH 11/12] disable building ocrd_pc_segmentation by default --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8608e81e..5009ceda 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ SHELL = /bin/bash OCRD_EXECUTABLES = $(BIN)/ocrd # add more CLIs below CUSTOM_DEPS = unzip wget python3-venv parallel git less # add more packages for deps-ubuntu below (or modules as preqrequisites) -DEFAULT_DISABLED_MODULES = cor-asv-fst opencv-python ocrd_ocropy +DEFAULT_DISABLED_MODULES = cor-asv-fst opencv-python ocrd_ocropy ocrd_pc_segmentation ifeq ($(PYTHON_VERSION),3.10) # Python 3.10.x does not work with current kraken. DEFAULT_DISABLED_MODULES += ocrd_kraken From b61f8a102282d635ddcafdf17b3134c862d6ed74 Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Tue, 3 May 2022 23:35:24 +0200 Subject: [PATCH 12/12] update submodules (fixing TF2 dependency) --- eynollah | 2 +- sbb_binarization | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eynollah b/eynollah index ae1990a4..34a06178 160000 --- a/eynollah +++ b/eynollah @@ -1 +1 @@ -Subproject commit ae1990a48e4a6dcd7f3a5af6603433944d38f621 +Subproject commit 34a061782c0c5bcb193e3621933a4c3020b6718a diff --git a/sbb_binarization b/sbb_binarization index 0877199c..e4c1eb29 160000 --- a/sbb_binarization +++ b/sbb_binarization @@ -1 +1 @@ -Subproject commit 0877199c68a318067935d57a088f9bcf1afac8c2 +Subproject commit e4c1eb291363a164cb18160cdf6809f47ea0f316