Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

isolate pip with venv semaphores #287

Merged
merged 3 commits into from
Feb 22, 2022
Merged

isolate pip with venv semaphores #287

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25b45e3
isolate all pip calls with semaphores dependent on their venv
bertsky Feb 5, 2022
a04b9d2
replace `--no-deps --force-reinstall` re-pip with just `touch` for ta…
bertsky Feb 5, 2022
b044ab1
fix align dependency in cor-asv-ann rule
bertsky Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,14 @@ BIN = $(VIRTUAL_ENV)/bin
SHARE = $(VIRTUAL_ENV)/share
ACTIVATE_VENV = $(VIRTUAL_ENV)/bin/activate

define SEM
define SEMGIT
$(if $(shell sem --version 2>/dev/null),sem --will-cite --fg --id ocrd_all_git,$(error cannot find package GNU parallel))
endef

define SEMPIP
$(if $(shell sem --version 2>/dev/null),sem --will-cite --fg --id ocrd_all_pip$(VIRTUAL_ENV),$(error cannot find package GNU parallel))
endef

define WGET
$(if $(shell wget --version 2>/dev/null),wget -nv -O $(1) $(2),$(if $(shell curl --version 2>/dev/null),curl -L -o $(1) $(2),$(error found no cmdline downloader (wget/curl))))
endef
Expand Down Expand Up @@ -126,9 +130,9 @@ modules: $(OCRD_MODULES)
ifneq (,$(wildcard .git))
ifneq ($(NO_UPDATE),1)
$(OCRD_MODULES): always-update
$(SEM) git submodule sync $(GIT_RECURSIVE) $@
$(SEMGIT) git submodule sync $(GIT_RECURSIVE) $@
if git submodule status $(GIT_RECURSIVE) $@ | grep -qv '^ '; then \
$(SEM) git submodule update --init $(GIT_RECURSIVE) $(GIT_DEPTH) $@ && \
$(SEMGIT) git submodule update --init $(GIT_RECURSIVE) $(GIT_DEPTH) $@ && \
touch $@; fi
endif
endif
Expand All @@ -142,19 +146,19 @@ deinit:
# Get Python modules.

$(VIRTUAL_ENV)/bin/$(PIP): $(ACTIVATE_VENV)
. $(ACTIVATE_VENV) && $(SEM) $(PIP) install --upgrade pip setuptools
. $(ACTIVATE_VENV) && $(SEMPIP) $(PIP) install --upgrade pip setuptools

$(ACTIVATE_VENV) $(VIRTUAL_ENV):
$(SEM) $(PYTHON) -m venv $(VIRTUAL_ENV)
$(SEMPIP) $(PYTHON) -m venv $(VIRTUAL_ENV)

.PHONY: wheel
wheel: $(BIN)/wheel
$(BIN)/wheel: | $(ACTIVATE_VENV)
. $(ACTIVATE_VENV) && $(PIP) install --force-reinstall $(PIP_OPTIONS_E) wheel
. $(ACTIVATE_VENV) && $(SEMPIP) $(PIP) install --force-reinstall $(PIP_OPTIONS_E) wheel

# avoid making this .PHONY so it does not have to be repeated
$(SHARE)/numpy: | $(ACTIVATE_VENV) $(SHARE)
. $(ACTIVATE_VENV) && $(PIP) install $(PIP_OPTIONS_E) numpy
. $(ACTIVATE_VENV) && $(SEMPIP) $(PIP) install $(PIP_OPTIONS_E) numpy
@touch $@

# Install modules from source.
Expand All @@ -163,9 +167,7 @@ $(SHARE)/numpy: | $(ACTIVATE_VENV) $(SHARE)
ocrd: $(BIN)/ocrd
deps-ubuntu-modules: core
$(BIN)/ocrd: core
. $(ACTIVATE_VENV) && $(MAKE) -C $< install PIP_INSTALL="$(PIP) install $(PIP_OPTIONS)"
# workaround for core#351:
. $(ACTIVATE_VENV) && $(MAKE) -C $< install PIP_INSTALL="$(PIP) install --no-deps --force-reinstall $(PIP_OPTIONS)"
. $(ACTIVATE_VENV) && $(MAKE) -C $< install PIP_INSTALL="$(SEMPIP) $(PIP) install $(PIP_OPTIONS)" && touch -c $@

# Convert the executable names (1) to a pattern rule,
# so that the recipe will be used with single-recipe-
Expand All @@ -178,7 +180,7 @@ OCRD_EXECUTABLES += $(PAGE2IMG)
PAGE2IMG := $(BIN)/page2img
format-converters/page2img.py: format-converters
$(PAGE2IMG): format-converters/page2img.py
. $(ACTIVATE_VENV) && $(PIP) install validators
. $(ACTIVATE_VENV) && $(SEMPIP) $(PIP) install validators
echo "#!$(BIN)/python3" | cat - $< >$@
chmod +x $@
endif
Expand All @@ -191,7 +193,7 @@ opencv-python: GIT_RECURSIVE = --recursive
opencv-python/setup.py: opencv-python
$(SHARE)/opencv-python: opencv-python/setup.py | $(ACTIVATE_VENV) $(SHARE) $(SHARE)/numpy
. $(ACTIVATE_VENV) && cd opencv-python && ENABLE_HEADLESS=1 $(PYTHON) setup.py bdist_wheel
. $(ACTIVATE_VENV) && $(PIP) install $(<D)/dist/opencv_python_headless-*.whl
. $(ACTIVATE_VENV) && $(SEMPIP) $(PIP) install $(<D)/dist/opencv_python_headless-*.whl
@touch $@
$(BIN)/ocrd: $(SHARE)/opencv-python
endif
Expand Down Expand Up @@ -589,8 +591,7 @@ endif
# install again forcefully without depds (to ensure
# the binary itself updates):
define pip_install
. $(ACTIVATE_VENV) && cd $< && $(PIP) install $(PIP_OPTIONS_E) .
. $(ACTIVATE_VENV) && cd $< && $(PIP) install --no-deps --force-reinstall $(PIP_OPTIONS) .
. $(ACTIVATE_VENV) && cd $< && $(SEMPIP) $(PIP) install $(PIP_OPTIONS_E) . && touch -c $@
endef

# pattern for recursive make:
Expand Down Expand Up @@ -644,7 +645,7 @@ endif
# avoid making these .PHONY so they do not have to be repeated:
# clstm tesserocr
$(SHARE)/%: % | $(ACTIVATE_VENV) $(SHARE)
. $(ACTIVATE_VENV) && cd $< && $(PIP) install $(PIP_OPTIONS) .
. $(ACTIVATE_VENV) && cd $< && $(SEMPIP) $(PIP) install $(PIP_OPTIONS) .
@touch $@

$(SHARE):
Expand Down