Skip to content

Uninstall opencv included in base image #7626

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

Merged
KumoLiu merged 7 commits into from
Apr 12, 2024
Merged

Uninstall opencv included in base image #7626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1dbdd49
fix tutorial #1689
KumoLiu Apr 11, 2024
fd3dea4
add opencv-python-headless requirement
KumoLiu Apr 12, 2024
58ecc5f
Merge remote-tracking branch 'origin/dev' into opencv
KumoLiu Apr 12, 2024
f52bfb5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 12, 2024
2aa9bc2
Merge branch 'dev' into opencv
KumoLiu Apr 12, 2024
0b46d16
fix mypy
KumoLiu Apr 12, 2024
53c6a06
Merge branch 'opencv' of https://github.com/KumoLiu/MONAI into opencv
KumoLiu Apr 12, 2024
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
3 changes: 3 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ RUN git clone --recursive https://github.com/zarr-developers/numcodecs.git && pi

WORKDIR /opt/monai

# remove opencv-python before opencv-python-headless installation
RUN pip uninstall -y opencv && rm /usr/local/lib/python3.10/dist-packages/cv2 -r

# install full deps
COPY requirements.txt requirements-min.txt requirements-dev.txt /tmp/
RUN cp /tmp/requirements.txt /tmp/req.bak \
Expand Down
2 changes: 1 addition & 1 deletion monai/data/video_dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def get_available_codecs() -> dict[str, str]:
with tempfile.TemporaryDirectory() as tmp_dir:
for codec, ext in all_codecs.items():
fname = os.path.join(tmp_dir, f"test{ext}")
fourcc = cv2.VideoWriter_fourcc(*codec)
fourcc = cv2.VideoWriter_fourcc(*codec) # type: ignore[attr-defined]
noviderr = writer.open(fname, fourcc, 1, (10, 10))
if noviderr:
codecs[codec] = ext
Expand Down
1 change: 1 addition & 0 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,4 @@ zarr
lpips==0.1.4
nvidia-ml-py
huggingface_hub
opencv-python-headless