From e0368bf4d0ce319171596600f0bdae3b4a7be045 Mon Sep 17 00:00:00 2001 From: Dustin Franklin Date: Wed, 29 May 2024 01:19:09 -0400 Subject: [PATCH] fixed OpenCV in stable-diffusion-webui and TAM containers --- packages/diffusion/stable-diffusion-webui/Dockerfile | 4 ++-- .../diffusion/stable-diffusion-webui/install_extensions.sh | 0 packages/vit/tam/Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 packages/diffusion/stable-diffusion-webui/install_extensions.sh diff --git a/packages/diffusion/stable-diffusion-webui/Dockerfile b/packages/diffusion/stable-diffusion-webui/Dockerfile index 80f20407f..c19b542a3 100644 --- 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 old mode 100644 new mode 100755 diff --git a/packages/vit/tam/Dockerfile b/packages/vit/tam/Dockerfile index 300490c06..6495505a5 100644 --- 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 \ No newline at end of file +CMD cd /opt/Track-Anything && python3 app.py