fixed OpenCV in stable-diffusion-webui and TAM containers

dusty-nv · May 29, 2024 · e0368bf · e0368bf
1 parent 1c15449
commit e0368bf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/diffusion/stable-diffusion-webui/Dockerfile b/packages/diffusion/stable-diffusion-webui/Dockerfile
@@ -1,7 +1,7 @@
 #---
 # name: stable-diffusion-webui
 # group: diffusion
-# depends: [pytorch, torchvision, transformers, xformers, pycuda, opencv, onnxruntime]
+# depends: [pytorch, torchvision, transformers, xformers, pycuda, opencv:deb, onnxruntime]
 # requires: '>=34.1.0'
 # docs: docs.md
 # notes: disabled on JetPack 4
@@ -33,7 +33,7 @@ RUN set -ex \
         https://github.com/BlafKing/sd-civitai-browser-plus \
     && PYTHONPATH="$AUTOMATIC1111_ROOT_DIR" python3 -c 'from modules import launch_utils; launch_utils.args.skip_python_version_check=True; launch_utils.prepare_environment()' \
     # partially initialized module 'cv2' has no attribute 'gapi_wip_gst_GStreamerPipeline' \
-    && /opt/opencv_install.sh \
+    && /tmp/opencv/install.sh \
     # TypeError: 'type' object is not subscriptable \
     && sed 's|dict\[str, OptionInfo\]|dict|g' -i $AUTOMATIC1111_ROOT_DIR/modules/options.py \
     && sed 's|dict\[.*\]|dict|g' -i $AUTOMATIC1111_ROOT_DIR/modules/processing.py \

diff --git a/packages/diffusion/stable-diffusion-webui/install_extensions.sh b/packages/diffusion/stable-diffusion-webui/install_extensions.sh
diff --git a/packages/vit/tam/Dockerfile b/packages/vit/tam/Dockerfile
@@ -30,7 +30,7 @@ ENV LD_PRELOAD=/usr/lib/aarch64-linux-gnu/libgomp.so.1
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/python3.8/dist-packages/opencv_python.libs/
 
 RUN mim install mmcv --verbose --no-cache-dir
-RUN cd /opt && ./opencv_install.sh
+RUN /tmp/opencv/install.sh
 
 # https://github.com/dusty-nv/jetson-containers/issues/326
 RUN pip3 install --no-cache-dir --verbose gradio==3.38.0
@@ -42,4 +42,4 @@ RUN mkdir -p /data/models/tam && \
 WORKDIR /
 
 RUN cd /opt/Track-Anything && python3 app.py --help
-CMD cd /opt/Track-Anything && python3 app.py
+CMD cd /opt/Track-Anything && python3 app.py