From 9805ee4a5641229fffbcdc0941cb6193fcbc4540 Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Sun, 26 May 2024 20:53:12 +0000 Subject: [PATCH 1/3] sub-venv TF1 recipe: no scikit-image pinning --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index b848046c..f77220f0 100644 --- a/Makefile +++ b/Makefile @@ -666,9 +666,6 @@ define pip_install_tf1nvidia = pushd $$name && for path in $$name*; do mv $$path $${path/$$name/$$newname}; done && popd && \ $(PYTHON) -m wheel pack $$name && \ $(SEMPIP) pip install --no-cache-dir $$newname*.whl && popd && rm -fr $$OLDPWD; fi -# - preempt conflict over numpy between scikit-image and tensorflow -# - preempt conflict over numpy between tifffile and tensorflow (and allow py36) -. $(ACTIVATE_VENV) && $(SEMPIP) pip install imageio==2.14.1 "tifffile<2022" # - preempt conflict over numpy between h5py and tensorflow . $(ACTIVATE_VENV) && $(SEMPIP) pip install "numpy<1.24" endef From a49b060717c88e8fc6f4d713ff530ca99b72130b Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Sun, 26 May 2024 20:53:55 +0000 Subject: [PATCH 2/3] do not disable ocrd_detectron2 on newer Python --- Makefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Makefile b/Makefile index f77220f0..85e05b33 100644 --- a/Makefile +++ b/Makefile @@ -76,17 +76,11 @@ ifneq ($(PYTHON_VERSION),3.8) DEFAULT_DISABLED_MODULES += cor-asv-ann ocrd_keraslm endif endif -ifeq ($(PYTHON_VERSION),3.11) -# Detectron2 relies on Pytorch 1 which still uses pkg_resources -DEFAULT_DISABLED_MODULES += ocrd_detectron2 -endif ifeq ($(PYTHON_VERSION),3.12) # The required tensorflow is not available for Python 3.12. DEFAULT_DISABLED_MODULES += eynollah ocrd_anybaseocr ocrd_calamari sbb_binarization # The required coremltools does not support Python 3.12. DEFAULT_DISABLED_MODULES += ocrd_kraken -# Detectron2 relies on Pytorch 1 which still uses pkg_resources -DEFAULT_DISABLED_MODULES += ocrd_detectron2 endif ifeq ($(shell uname -s),Darwin) # Disable ocrd_olena for macOS because build is broken. From dac5cb5675c57eb753008b4f3c7e020608197def Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Sun, 26 May 2024 20:56:47 +0000 Subject: [PATCH 3/3] update ocrd_tesserocr --- ocrd_tesserocr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocrd_tesserocr b/ocrd_tesserocr index 75a782da..5b724c75 160000 --- a/ocrd_tesserocr +++ b/ocrd_tesserocr @@ -1 +1 @@ -Subproject commit 75a782dacb3195313a5628ccb9eb024d43240bfc +Subproject commit 5b724c75f8af0c69ad3dc8887f7a5f2b3d96e8d7