change: custom opencv to opencv-python

minostauros · May 24, 2024 · 089a631 · 089a631
1 parent f8de00e
commit 089a631
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 12 deletions.
diff --git a/...g-6.1/opencv-4.7.0/python-3.10/Dockerfile → ...g-6.1/opencv-4.9.0/python-3.10/Dockerfile b/...g-6.1/opencv-4.7.0/python-3.10/Dockerfile → ...g-6.1/opencv-4.9.0/python-3.10/Dockerfile
@@ -9,9 +9,11 @@
 
 # Associated pytorch version will not be set automatically. Scroll down and set appropriate versions.
 
-FROM    ghcr.io/minostauros/cuda-ffmpeg-opencv-docker:4.7.0-cu118-py310
+# opencv is not built well with cuda 11.8, we use opencv-python instead
+FROM    ghcr.io/minostauros/cuda-ffmpeg-docker:6.1-cu118
 
 ARG PYTHON_VERSION=3.10
+ARG OPENCV_VERSION=4.9.0.80
 ARG PYTORCH_VERSION=2.1.2
 ARG TORCHVISION_VERSION=0.16.2
 ARG TORCHAUDIO_VERSION=2.1.2
@@ -45,7 +47,7 @@ RUN echo "Asia/Seoul" > /etc/timezone && \
         net-tools \
         curl \
         openssh-server \
-        #libpng-dev \ # included in base image
+        libpng-dev \
         swig \
         locales \
         tzdata \
@@ -54,7 +56,9 @@ RUN echo "Asia/Seoul" > /etc/timezone && \
         ninja-build \
         rclone \
         libdrm-dev libsystemd-dev \
-        python${PYTHON_VERSION}-dev && \
+        python${PYTHON_VERSION} \
+        python${PYTHON_VERSION}-dev \
+        $( [ ${PYTHON_VERSION%%.*} -ge 3 ] && echo "python${PYTHON_VERSION%%.*}-distutils" ) \
         apt-get clean -y && \
 # Language & Timezone setting
     echo "Asia/Seoul" > /etc/timezone && \
@@ -64,8 +68,13 @@ RUN echo "Asia/Seoul" > /etc/timezone && \
     echo 'LANG="en_US.UTF-8"'>/etc/default/locale && \
     DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true dpkg-reconfigure --frontend=noninteractive locales && \
     update-locale LANG=en_US.UTF-8 && \
-# PyTorch (Mind cuda version and associated torch and torchvision versions)
+# OpenCV
+    wget https://bootstrap.pypa.io/get-pip.py --progress=bar:force:noscroll --no-check-certificate && \
+    python${PYTHON_VERSION} get-pip.py && \
+    rm get-pip.py && \
     python${PYTHON_VERSION} -m pip install --upgrade pip && \
+    pip${PYTHON_VERSION} install opencv-python==${OPENCV_VERSION} && \
+# PyTorch (Mind cuda version and associated torch and torchvision versions)
     pip${PYTHON_VERSION} install torch==${PYTORCH_VERSION}+${TARGET_CUDA_VERSION} torchvision==${TORCHVISION_VERSION}+${TARGET_CUDA_VERSION} torchaudio==${TORCHAUDIO_VERSION}+${TARGET_CUDA_VERSION} --index-url https://download.pytorch.org/whl/${TARGET_CUDA_VERSION} && \
 # CMake higher version than apt-get
     pip${PYTHON_VERSION} install cmake packaging && \

diff --git a/...g-6.1/opencv-4.7.0/python-3.10/Dockerfile → ...g-6.1/opencv-4.9.0/python-3.10/Dockerfile b/...g-6.1/opencv-4.7.0/python-3.10/Dockerfile → ...g-6.1/opencv-4.9.0/python-3.10/Dockerfile
@@ -9,9 +9,11 @@
 
 # Associated pytorch version will not be set automatically. Scroll down and set appropriate versions.
 
-FROM    ghcr.io/minostauros/cuda-ffmpeg-opencv-docker:4.7.0-cu118-py310
+# opencv is not built well with cuda 11.8, we use opencv-python instead
+FROM    ghcr.io/minostauros/cuda-ffmpeg-docker:6.1-cu118
 
 ARG PYTHON_VERSION=3.10
+ARG OPENCV_VERSION=4.9.0.80
 ARG PYTORCH_VERSION=2.2.1
 ARG TORCHVISION_VERSION=0.17.1
 ARG TORCHAUDIO_VERSION=2.2.1
@@ -45,7 +47,7 @@ RUN echo "Asia/Seoul" > /etc/timezone && \
         net-tools \
         curl \
         openssh-server \
-        #libpng-dev \ # included in base image
+        libpng-dev \
         swig \
         locales \
         tzdata \
@@ -54,7 +56,9 @@ RUN echo "Asia/Seoul" > /etc/timezone && \
         ninja-build \
         rclone \
         libdrm-dev libsystemd-dev \
-        python${PYTHON_VERSION}-dev && \
+        python${PYTHON_VERSION} \
+        python${PYTHON_VERSION}-dev \
+        $( [ ${PYTHON_VERSION%%.*} -ge 3 ] && echo "python${PYTHON_VERSION%%.*}-distutils" ) \
         apt-get clean -y && \
 # Language & Timezone setting
     echo "Asia/Seoul" > /etc/timezone && \
@@ -64,8 +68,13 @@ RUN echo "Asia/Seoul" > /etc/timezone && \
     echo 'LANG="en_US.UTF-8"'>/etc/default/locale && \
     DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true dpkg-reconfigure --frontend=noninteractive locales && \
     update-locale LANG=en_US.UTF-8 && \
-# PyTorch (Mind cuda version and associated torch and torchvision versions)
+# OpenCV
+    wget https://bootstrap.pypa.io/get-pip.py --progress=bar:force:noscroll --no-check-certificate && \
+    python${PYTHON_VERSION} get-pip.py && \
+    rm get-pip.py && \
     python${PYTHON_VERSION} -m pip install --upgrade pip && \
+    pip${PYTHON_VERSION} install opencv-python==${OPENCV_VERSION} && \
+# PyTorch (Mind cuda version and associated torch and torchvision versions)
     pip${PYTHON_VERSION} install torch==${PYTORCH_VERSION}+${TARGET_CUDA_VERSION} torchvision==${TORCHVISION_VERSION}+${TARGET_CUDA_VERSION} torchaudio==${TORCHAUDIO_VERSION}+${TARGET_CUDA_VERSION} --index-url https://download.pytorch.org/whl/${TARGET_CUDA_VERSION} && \
 # CMake higher version than apt-get
     pip${PYTHON_VERSION} install cmake packaging && \

diff --git a/...g-6.1/opencv-4.7.0/python-3.10/Dockerfile → ...g-6.1/opencv-4.9.0/python-3.10/Dockerfile b/...g-6.1/opencv-4.7.0/python-3.10/Dockerfile → ...g-6.1/opencv-4.9.0/python-3.10/Dockerfile
@@ -9,9 +9,11 @@
 
 # Associated pytorch version will not be set automatically. Scroll down and set appropriate versions.
 
-FROM    ghcr.io/minostauros/cuda-ffmpeg-opencv-docker:4.9.0-cu118-py310
+# opencv is not built well with cuda 11.8, we use opencv-python instead
+FROM    ghcr.io/minostauros/cuda-ffmpeg-docker:6.1-cu118
 
 ARG PYTHON_VERSION=3.10
+ARG OPENCV_VERSION=4.9.0.80
 ARG PYTORCH_VERSION=2.2.2
 ARG TORCHVISION_VERSION=0.17.2
 ARG TORCHAUDIO_VERSION=2.2.2
@@ -45,7 +47,7 @@ RUN echo "Asia/Seoul" > /etc/timezone && \
         net-tools \
         curl \
         openssh-server \
-        #libpng-dev \ # included in base image
+        libpng-dev \
         swig \
         locales \
         tzdata \
@@ -54,7 +56,9 @@ RUN echo "Asia/Seoul" > /etc/timezone && \
         ninja-build \
         rclone \
         libdrm-dev libsystemd-dev \
-        python${PYTHON_VERSION}-dev && \
+        python${PYTHON_VERSION} \
+        python${PYTHON_VERSION}-dev \
+        $( [ ${PYTHON_VERSION%%.*} -ge 3 ] && echo "python${PYTHON_VERSION%%.*}-distutils" ) \
         apt-get clean -y && \
 # Language & Timezone setting
     echo "Asia/Seoul" > /etc/timezone && \
@@ -64,8 +68,13 @@ RUN echo "Asia/Seoul" > /etc/timezone && \
     echo 'LANG="en_US.UTF-8"'>/etc/default/locale && \
     DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true dpkg-reconfigure --frontend=noninteractive locales && \
     update-locale LANG=en_US.UTF-8 && \
-# PyTorch (Mind cuda version and associated torch and torchvision versions)
+# OpenCV
+    wget https://bootstrap.pypa.io/get-pip.py --progress=bar:force:noscroll --no-check-certificate && \
+    python${PYTHON_VERSION} get-pip.py && \
+    rm get-pip.py && \
     python${PYTHON_VERSION} -m pip install --upgrade pip && \
+    pip${PYTHON_VERSION} install opencv-python==${OPENCV_VERSION} && \
+# PyTorch (Mind cuda version and associated torch and torchvision versions)
     pip${PYTHON_VERSION} install torch==${PYTORCH_VERSION}+${TARGET_CUDA_VERSION} torchvision==${TORCHVISION_VERSION}+${TARGET_CUDA_VERSION} torchaudio==${TORCHAUDIO_VERSION}+${TARGET_CUDA_VERSION} --index-url https://download.pytorch.org/whl/${TARGET_CUDA_VERSION} && \
 # CMake higher version than apt-get
     pip${PYTHON_VERSION} install cmake packaging && \