From 1dbdd496079ba97a687ba6662cfb2d61b1bde2a8 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Thu, 11 Apr 2024 17:29:19 +0800 Subject: [PATCH 1/4] fix tutorial #1689 Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index d5777104c8..45673fd775 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ From fd3dea45be04bbcee2b557471790de08b476644b Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Fri, 12 Apr 2024 15:08:40 +0800 Subject: [PATCH 2/4] add opencv-python-headless requirement Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- requirements-dev.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index af1b8b89d5..d29c1dbdfd 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -57,3 +57,6 @@ zarr lpips==0.1.4 nvidia-ml-py huggingface_hub +opencv-python-headless + + From f52bfb54c3b7a48c54227cc3c2881d777a337ef8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 07:11:04 +0000 Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- requirements-dev.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index d29c1dbdfd..2855b56ad5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -58,5 +58,3 @@ lpips==0.1.4 nvidia-ml-py huggingface_hub opencv-python-headless - - From 0b46d162f57b62521a3c393c08290c83c0d8dc6b Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Fri, 12 Apr 2024 15:37:39 +0800 Subject: [PATCH 4/4] fix mypy Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- monai/data/video_dataset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monai/data/video_dataset.py b/monai/data/video_dataset.py index be3bcf5bd5..ed5c37d777 100644 --- a/monai/data/video_dataset.py +++ b/monai/data/video_dataset.py @@ -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