[no ci] [RFC] Rework build process by stweil · Pull Request #295 · OCR-D/ocrd_all

stweil · 2022-03-10T11:07:33Z

I currently try to rework the build process to support more modern Linux distributions and Python versions. Ideally the full test matrix of Ubuntu LTS versions and Python versions ranging from 3.6 to 3.10 should build fine.

My changes address several issues:

Check early whether the required Tensorflow versions are available and skip those submodules which cannot be built because of missing Tensorflow.
Use different rules for Python 3.6 and 3.10 when building ocrd_kraken.
Disable ocrd_cis unconditionally because it requires an old calamari_ocr causing version conflicts.
Address potential version conflicts for Python modules which are required by different OCR-D processors by using constraints.
Reduce the number of sub_venvs by installing all modules which work with a recent Tensorflow in the main venv.
Install Python module wheel early in all virtual environments, so it is no longer needed as a dependency.
... and other changes.

This PR is not for merging, but for discussion of the different aspects with the goal to find a consensus on the right solution.

stweil · 2022-03-10T11:38:42Z

I wonder whether we really need export PIP ?= pip3 and would prefer to replace $(PIP) by a simple pip. @bertsky, you added that macro in commit 7807ae6. Are there use cases where it is helpful? It is also exported. Are there submodules which need it? I found core and cor-asv-ann which use PIP, but it looks like they also don't need it.

kba · 2022-03-16T09:35:21Z

I wonder whether we really need export PIP ?= pip3 and would prefer to replace $(PIP) by a simple pip

We don't need it any more, we did need it when we still had to support 2.7 under certain circumstances. In fact, using anything but pip/pip3 for $(PIP) could cause inconsistencies if people override it with a pip for a different minor version of python than the venv.

stweil · 2022-03-16T19:05:24Z

Now 3 of 5 Python versions complete the build: https://github.com/stweil/ocrd_all/actions/runs/1993530591.

The remaining failures occur when building ocrd_kraken (see pull request #288 which I included here) and might be fixed in the CI running now.

stweil · 2022-03-16T19:23:01Z

 ACTIVATE_VENV = $(VIRTUAL_ENV)/bin/activate

+ifeq (0, $(MAKELEVEL))
+ifeq ($(MAKECMDGOALS), all)


TODO: support also builds with several targets, for example make all check.

stweil · 2022-03-16T19:23:12Z

+ifeq ($(MAKECMDGOALS), all)
+CHECK_SUBENVS := true
+endif
+ifeq ($(MAKECMDGOALS), check)


TODO: support also builds with several targets, for example make all check.

stweil · 2022-03-16T19:24:31Z

+create_venv := $(shell $(PYTHON) -m venv $(SUB_VENV)/headless-tf21 && bash -c "source $(SUB_VENV)/headless-tf21/bin/activate && pip install -U pip setuptools wheel")
+endif
+
+# Try to install different versions of Tensorflow.


TODO: This takes some time when the installation is really done (or tried), so a log message would be useful.

stweil · 2022-03-19T09:10:11Z

Now all builds pass.

stweil · 2022-03-23T12:06:41Z

The updated branch still passes for all builds: https://github.com/stweil/ocrd_all/actions/runs/2027885009.

stweil · 2022-03-23T15:54:34Z

-else
 	cd $< ; $(MAKE) patch-pix2pixhd
+	# Hack for Python 3.10 which fails to install ocrd-fork-pylsd 0.0.4 from PyPI.
+	. $(ACTIVATE_VENV) && pip install git+https://github.com/kba/pylsd.git


@kba, @bertsky, could you have a look why pip3.10 install ocrd-fork-pylsd fails while pip3.10 install git+https://github.com/kba/pylsd.git works fine? I get this build error:

gcc -pthread -Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -fPIC -Isource/include -I/home/stweil/src/github/OCR-D/venv3.10-20220323/include -I/usr/local/include/python3.10 -c source/src/lsd.cpp -o build/temp.linux-x86_64-3.10/source/src/lsd.o source/src/lsd.cpp:77:10: fatal error: lsd.h: No such file or directory 77 | #include <lsd.h> | ^~~~~~~ compilation terminated.

I tried to build a manylinux binary wheel for 3.10. Can you try

pip install --only-binary :all: ocrd-fork-pylsd

and see if that works for you?

That works, and pip3.10 install ocrd-fork-pylsd works now, too.

stweil · 2022-03-24T14:40:21Z

Latest run passes all builds: https://github.com/stweil/ocrd_all/actions/runs/2029562843.

Signed-off-by: Stefan Weil <sw@weilnetz.de>

…f missing tensorflow Signed-off-by: Stefan Weil <sw@weilnetz.de>

Signed-off-by: Stefan Weil <sw@weilnetz.de>

They are required because of new package conflicts for Python < 3.10. Signed-off-by: Stefan Weil <sw@weilnetz.de>

stweil · 2022-03-31T20:24:16Z

@bertsky, @kba, I compared the build rules here with those from git master and wrote the complete make all results in two separate virtual environments. The result shows that my build rules reduce the disk usage significantly, especially by reducing the total number of required virtual environments from four to two (one main venv, one sub venv). That would also result in faster builds and smaller docker images and so fix the time problems in CircleCI where the image uploads contribute a significant part.

stweil@ocr-02:~/src/github/OCR-D$ du -msc venv3.7-20220331-*
11605	venv3.7-20220331-master
6876	venv3.7-20220331-tensor
18480	total
stweil@ocr-02:~/src/github/OCR-D$ du -msc venv3.7-20220331-*/*
74	venv3.7-20220331-master/bin
594	venv3.7-20220331-master/build
2	venv3.7-20220331-master/build.log
11	venv3.7-20220331-master/include
2985	venv3.7-20220331-master/lib
1	venv3.7-20220331-master/lib64
3	venv3.7-20220331-master/libexec
1	venv3.7-20220331-master/locale
1	venv3.7-20220331-master/pyvenv.cfg
1	venv3.7-20220331-master/requirements.txt
103	venv3.7-20220331-master/share
7837	venv3.7-20220331-master/sub-venv
74	venv3.7-20220331-tensor/bin
594	venv3.7-20220331-tensor/build
1	venv3.7-20220331-tensor/build.log
11	venv3.7-20220331-tensor/include
4006	venv3.7-20220331-tensor/lib
1	venv3.7-20220331-tensor/lib64
3	venv3.7-20220331-tensor/libexec
1	venv3.7-20220331-tensor/locale
1	venv3.7-20220331-tensor/pyvenv.cfg
1	venv3.7-20220331-tensor/requirements.txt
103	venv3.7-20220331-tensor/share
2087	venv3.7-20220331-tensor/sub-venv
18480	total

stweil · 2022-04-02T21:25:24Z

Now I also have timing and size results for a local make docker-maximum-cuda-git (single-threaded):

OCR-D:master
0.60user 0.55system 56:52.93elapsed 0%CPU (0avgtext+0avgdata 64456maxresident)k
3848inputs+3024outputs (39major+10597minor)pagefaults 0swaps
ocrd/all                  maximum-cuda-git   d737c47c1285   2 hours ago     32.8GB

stweil:tensorflow
0.71user 0.58system 45:54.85elapsed 0%CPU (0avgtext+0avgdata 67572maxresident)k
2280inputs+2712outputs (5major+11208minor)pagefaults 0swaps
ocrd/all                  maximum-cuda-git   a8fc92d9f811   2 minutes ago   23.7GB

stweil · 2023-06-16T20:38:31Z

This proof of concept is no longer up to date, so it can be closed.

stweil marked this pull request as draft March 10, 2022 11:08

stweil force-pushed the tensorflow branch from df72ee6 to 2f3ff15 Compare March 16, 2022 12:58

stweil commented Mar 16, 2022

View reviewed changes

stweil mentioned this pull request Mar 16, 2022

Add new macro PYTHON_VERSION #297

Merged

stweil force-pushed the tensorflow branch from 6635444 to b597dae Compare March 18, 2022 14:42

stweil force-pushed the tensorflow branch from 62f7ed5 to ec3acd2 Compare March 19, 2022 09:44

This was referenced Mar 19, 2022

Replace PIP macro by simple pip #299

Merged

Shorten path for SUB_VENV and define it only on the first make level #300

Merged

stweil force-pushed the tensorflow branch 2 times, most recently from 31335e4 to 3d2605a Compare March 23, 2022 15:47

stweil commented Mar 23, 2022

View reviewed changes

This was referenced Mar 24, 2022

Builds without TensorFlow #147

Open

ocrd_all native installation fails due to tensorflow #235

Closed

stweil force-pushed the tensorflow branch 7 times, most recently from e5db111 to dcdcfb2 Compare March 30, 2022 16:56

kba force-pushed the master branch from 331f2b6 to b8dd7bb Compare March 30, 2022 17:39

Replace libcurl4-nss-dev by libcurl4-openssl-dev

a3ddd3e

Signed-off-by: Stefan Weil <sw@weilnetz.de>

stweil added 20 commits March 31, 2022 15:56

Remove unneeded virtual environment headless-torch14

f5fa25f

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Remove unneeded virtual environment headless-tf2

1e3375c

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Clean rule for ocrd_detectron2

7c97239

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Build modules which depend on Tensorflow only if that is available

5902e3f

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Disable ocrd_cis

2ee8f6e

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Check for tensorflow also when running make check

3471de5

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Check the subenvs only on the first make level

cfed4b1

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Add constraints for subenv headless-tf1

655b958

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Fix ocrd_anybaseocr

e7686ae

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Fix ocrd_pc_segmentation with Python 3.10

d764d1a

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Fix kraken with Python 3.10.2

3d6962e

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Add special handling for several versions of Python

ea6fc25

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Hack to fix ocrd_detectron2

60cac0f

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Reactivate ocrd_cis and remove unneeded sub-venv

90bbb28

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Show the built OCR-D modules and executables in GitHub action

0e1e7ae

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Fix build for Python 3.10

c767f7b

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Fix Makefile

c199301

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Use DEFAULT_DISABLED_MODULES for modules which are disabled because o…

47be2c3

…f missing tensorflow Signed-off-by: Stefan Weil <sw@weilnetz.de>

Add semaphore for more pip executions

5883f45

Signed-off-by: Stefan Weil <sw@weilnetz.de>

Add pip constraints for main virtual environment

36d109d

They are required because of new package conflicts for Python < 3.10. Signed-off-by: Stefan Weil <sw@weilnetz.de>

stweil force-pushed the tensorflow branch from dcdcfb2 to 36d109d Compare March 31, 2022 20:24

stweil closed this Jun 16, 2023

stweil deleted the tensorflow branch June 16, 2023 20:38

Uh oh!

Conversation

stweil commented Mar 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

stweil commented Mar 10, 2022

Uh oh!

kba commented Mar 16, 2022

Uh oh!

stweil commented Mar 16, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

stweil Mar 16, 2022

Choose a reason for hiding this comment

Uh oh!

stweil Mar 16, 2022

Choose a reason for hiding this comment

Uh oh!

stweil Mar 16, 2022

Choose a reason for hiding this comment

Uh oh!

stweil commented Mar 19, 2022

Uh oh!

stweil commented Mar 23, 2022

Uh oh!

stweil Mar 23, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kba Mar 23, 2022

Choose a reason for hiding this comment

Uh oh!

stweil Mar 23, 2022

Choose a reason for hiding this comment

Uh oh!

stweil commented Mar 24, 2022

Uh oh!

stweil commented Mar 31, 2022

Uh oh!

stweil commented Apr 2, 2022

Uh oh!

stweil commented Jun 16, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

stweil commented Mar 10, 2022 •

edited

Loading

stweil commented Mar 16, 2022 •

edited

Loading

stweil Mar 23, 2022 •

edited

Loading