From 22449fd2df666223c45b3ad4e6841fcda5be5549 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 7 Apr 2024 12:20:34 +0200 Subject: [PATCH 1/5] -add a function to parse a folder and install requirements. - make use of this function to install dependencies of comfyUIcustom nodes --- 05.sh | 2 ++ functions.sh | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/05.sh b/05.sh index b282209..1cc7cc0 100755 --- a/05.sh +++ b/05.sh @@ -46,6 +46,8 @@ conda install -c nvidia cuda-cudart --solver=libmamba -y pip install onnxruntime-gpu pip install insightface torch torchvision +install_requirements ${SD05_DIR}/ComfyUI/custom_nodes + #clean old venv if it still exists if [ -d ${SD05_DIR}/venv ]; then rm -rf ${SD05_DIR}/venv diff --git a/functions.sh b/functions.sh index 400f6a7..2fa2362 100644 --- a/functions.sh +++ b/functions.sh @@ -52,4 +52,23 @@ sed 's/\// /g') | cut -f1) ]; then git reset --hard HEAD git pull -X ours fi +} + +# Fonction récursive pour installer les requirements.txt +install_requirements() { + local directory="$1" + local requirements_file="$directory/requirements.txt" + + if [ -f "$requirements_file" ]; then + echo "Installation des dépendances dans $directory ..." + pip install -r "$requirements_file" + echo "Dépendances installées avec succès dans $directory." + fi + + # Parcours récursif des sous-dossiers + for subdir in "$directory"/*; do + if [ -d "$subdir" ]; then + install_requirements "$subdir" + fi + done } \ No newline at end of file From 3089e71a1276655f7d3ccdd2a389da8f2571e889 Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 20 Apr 2024 22:53:02 +0200 Subject: [PATCH 2/5] add ffmpeg --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 02edaec..0a49561 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN apt-get update -y -q=2 && \ cmake \ build-essential \ python3-opencv \ + ffmpeg \ libopencv-dev \ dotnet-sdk-8.0 \ git && \ From b68e87b8721e763a96ed4b349e54fd4ec52f45d3 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 21 Apr 2024 15:34:18 +0200 Subject: [PATCH 3/5] fix auto1111 output folder --- 02.forge.sh | 1 + 02.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/02.forge.sh b/02.forge.sh index b86037e..41f444f 100644 --- a/02.forge.sh +++ b/02.forge.sh @@ -60,6 +60,7 @@ sl_folder ${SD02_DIR}/forge/models LDSR ${BASE_DIR}/models ldsr sl_folder ${SD02_DIR}/forge/models ControlNet ${BASE_DIR}/models controlnet sl_folder ${SD02_DIR}/forge output ${BASE_DIR}/outputs 02-sd-webui +sl_folder ${SD02_DIR}/forge outputs ${BASE_DIR}/outputs 02-sd-webui # Run webUI echo "Run Stable-Diffusion-WebUI-forge" diff --git a/02.sh b/02.sh index 58d11cb..c16ee3e 100755 --- a/02.sh +++ b/02.sh @@ -62,7 +62,7 @@ sl_folder ${SD02_DIR}/webui/models GFPGAN ${BASE_DIR}/models gfpgan sl_folder ${SD02_DIR}/webui/models LDSR ${BASE_DIR}/models ldsr sl_folder ${SD02_DIR}/webui/models ControlNet ${BASE_DIR}/models controlnet -sl_folder ${SD02_DIR}/webui output ${BASE_DIR}/outputs 02-sd-webui +sl_folder ${SD02_DIR}/webui outputs ${BASE_DIR}/outputs 02-sd-webui # run webUI echo "Run Stable-Diffusion-WebUI" From 93f9551717f1070c4f3f30d463e39c6e613200ed Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 21 Apr 2024 15:42:38 +0200 Subject: [PATCH 4/5] fix 02 output folder --- 02.forge.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/02.forge.sh b/02.forge.sh index 41f444f..9f1f323 100644 --- a/02.forge.sh +++ b/02.forge.sh @@ -59,7 +59,6 @@ sl_folder ${SD02_DIR}/forge/models GFPGAN ${BASE_DIR}/models gfpgan sl_folder ${SD02_DIR}/forge/models LDSR ${BASE_DIR}/models ldsr sl_folder ${SD02_DIR}/forge/models ControlNet ${BASE_DIR}/models controlnet -sl_folder ${SD02_DIR}/forge output ${BASE_DIR}/outputs 02-sd-webui sl_folder ${SD02_DIR}/forge outputs ${BASE_DIR}/outputs 02-sd-webui # Run webUI From 611657f8fc598f1b36d2313a2538fd4f29eb9fe7 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 21 Apr 2024 16:11:06 +0200 Subject: [PATCH 5/5] fix pydantics+albumentations --- 02.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/02.sh b/02.sh index c16ee3e..b49c8fc 100755 --- a/02.sh +++ b/02.sh @@ -46,6 +46,8 @@ pip install onnxruntime-gpu --extra-index-url https://aiinfra.pkgs.visualstudio. pip install insightface pip install basicsr pip install xformers --index-url https://download.pytorch.org/whl/cu121 +pip install albumentations==1.4.3 +pip install pydantic==1.10.15 # Merge Models, vae, lora, and hypernetworks, and outputs