Update 2022 05 03

CHANGELOG.md

@@ -2,6 +2,141 @@
 
 ## 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_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)
+
+  > * 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)

Makefile

@@ -26,12 +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
-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
@@ -65,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
@@ -90,9 +86,9 @@ 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/
+	$(RM) -r $(HOME)/.parallel/semaphores/id-ocrd_*
 
 define HELP
 cat <<"EOF"
@@ -262,12 +258,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)
@@ -451,31 +447,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
@@ -493,31 +475,17 @@ 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)
 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)
@@ -534,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
@@ -553,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)