Merge pull request #97 from painebenjamin/ad

Version 0.3 - AnimateDiff, HotShot XL, FILM, UI Redesign
painebenjamin · Nov 9, 2023 · 711d9db · 711d9db
2 parents b204de7 + 222a485
commit 711d9db
Show file tree

Hide file tree

Showing 188 changed files with 23,182 additions and 8,272 deletions.
diff --git a/.github/workflows/compile-all.yml b/.github/workflows/compile-all.yml
@@ -31,7 +31,7 @@ jobs:
             api: mps
           - os: macos-13
             api: mps-latest
-    uses: painebenjamin/app.enfugue.ai/.github/workflows/compile.yml@main
+    uses: ./.github/workflows/compile.yml
     with:
       os: ${{ matrix.os }}
       api: ${{ matrix.api }}

diff --git a/.github/workflows/compile-macos-mps-latest.yml b/.github/workflows/compile-macos-mps-latest.yml
@@ -12,7 +12,7 @@ on:
         type: boolean
 jobs:
   compile-macos-mps:
-    uses: painebenjamin/app.enfugue.ai/.github/workflows/compile.yml@main
+    uses: ./.github/workflows/compile.yml
     with:
       os: macos-13
       api: mps-latest

diff --git a/.github/workflows/compile-macos-mps.yml b/.github/workflows/compile-macos-mps.yml
@@ -12,7 +12,7 @@ on:
         type: boolean
 jobs:
   compile-macos-mps:
-    uses: painebenjamin/app.enfugue.ai/.github/workflows/compile.yml@main
+    uses: ./.github/workflows/compile.yml
     with:
       os: macos-13
       api: mps

diff --git a/.github/workflows/compile-supported.yml b/.github/workflows/compile-supported.yml
@@ -21,7 +21,7 @@ jobs:
             api: cuda-latest
           - os: macos-13
             api: mps-latest
-    uses: painebenjamin/app.enfugue.ai/.github/workflows/compile.yml@main
+    uses: ./.github/workflows/compile.yml
     with:
       os: ${{ matrix.os }}
       api: ${{ matrix.api }}

diff --git a/.github/workflows/compile-ubuntu-cuda-latest.yml b/.github/workflows/compile-ubuntu-cuda-latest.yml
@@ -12,7 +12,7 @@ on:
         type: boolean
 jobs:
   compile-ubuntu-cuda:
-    uses: painebenjamin/app.enfugue.ai/.github/workflows/compile.yml@main
+    uses: ./.github/workflows/compile.yml
     with:
       os: ubuntu-latest
       api: cuda-latest

diff --git a/.github/workflows/compile-ubuntu-cuda.yml b/.github/workflows/compile-ubuntu-cuda.yml
@@ -12,7 +12,7 @@ on:
         type: boolean
 jobs:
   compile-ubuntu-cuda:
-    uses: painebenjamin/app.enfugue.ai/.github/workflows/compile.yml@main
+    uses: ./.github/workflows/compile.yml
     with:
       os: ubuntu-latest
       api: cuda

diff --git a/.github/workflows/compile-ubuntu-tensorrt.yml b/.github/workflows/compile-ubuntu-tensorrt.yml
@@ -12,7 +12,7 @@ on:
         type: boolean
 jobs:
   compile-ubuntu-tensorrt:
-    uses: painebenjamin/app.enfugue.ai/.github/workflows/compile.yml@main
+    uses: ./.github/workflows/compile.yml
     with:
       os: ubuntu-latest
       api: tensorrt

diff --git a/.github/workflows/compile-windows-cuda-latest.yml b/.github/workflows/compile-windows-cuda-latest.yml
@@ -12,7 +12,7 @@ on:
         type: boolean
 jobs:
   compile-windows-cuda:
-    uses: painebenjamin/app.enfugue.ai/.github/workflows/compile.yml@main
+    uses: ./.github/workflows/compile.yml
     with:
       os: windows-latest
       api: cuda-latest

diff --git a/.github/workflows/compile-windows-cuda.yml b/.github/workflows/compile-windows-cuda.yml
@@ -12,7 +12,7 @@ on:
         type: boolean
 jobs:
   compile-windows-cuda:
-    uses: painebenjamin/app.enfugue.ai/.github/workflows/compile.yml@main
+    uses: ./.github/workflows/compile.yml
     with:
       os: windows-latest
       api: cuda

diff --git a/.github/workflows/compile-windows-tensorrt.yml b/.github/workflows/compile-windows-tensorrt.yml
@@ -12,7 +12,7 @@ on:
         type: boolean
 jobs:
   compile-windows-tensorrt:
-    uses: painebenjamin/app.enfugue.ai/.github/workflows/compile.yml@main
+    uses: ./.github/workflows/compile.yml
     with:
       os: windows-latest
       api: tensorrt

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -85,17 +85,22 @@ jobs:
         mim install "mmcv>=2.0.1"
         mim install "mmdet>=3.1.0"
         mim install "mmpose>=1.1.0"
-    - name: Output Environment Information for Debugging
-      run: |
-        conda list
-        pip freeze
     - name: Clean space
       run: |
         conda clean -aqy
-    - name: Output Environment Information for Debugging
+    - name: Output Environment Information (Linux/MacOS)
+      if: ${{ !contains(inputs.os, 'windows') }}
       run: |
         conda list
         pip freeze
+    - name: Environment Information (Windows)
+      if: ${{ contains(inputs.os, 'windows') }}
+      shell: bash
+      run: |
+        . /c/Miniconda/etc/profile.d/conda.sh
+        conda activate base
+        conda list
+        pip freeze
     - name: Compile Linux package
       if: ${{ !contains(inputs.os, 'windows') }} 
       run: |

diff --git a/config/development/enfugue.yml b/config/development/enfugue.yml
@@ -12,6 +12,14 @@ engine:
         level: debug
         silenced:
             - sqlalchemy.pool.impl.NullPool
+            - http.client
+            - huggingface_hub.utils._http
+            - h5py._conv
+            - tensorflow
+            - diffusers
+            - urllib3.connectionpool
+            - PIL.PngImagePlugin
+            - torch.distributed.nn.jit
 downloads:
     concurrent: 2
     queue: 10
diff --git a/config/development/logging.yml b/config/development/logging.yml
@@ -4,5 +4,12 @@ handler: stream
 stream: stdout
 level: debug
 silenced:
-    - sqlalchemy.pool.impl.NullPool # This emits errors that have been handled and doesn't give us any useful information, ignore it
+    - sqlalchemy.pool.impl.NullPool
     - http.client
+    - huggingface_hub.utils._http
+    - h5py._conv
+    - tensorflow
+    - diffusers
+    - urllib3.connectionpool
+    - PIL.PngImagePlugin
+    - torch.distributed.nn.jit
diff --git a/environments/build/macos-13/mps-latest.yml b/environments/build/macos-13/mps-latest.yml
@@ -9,17 +9,18 @@ dependencies:
   - numpy=1.24.3
   - make=4.3
   - nodejs=18.16.0
+  - ffmpeg=6.0.0
+  - opencv=4.8.1
   - pip:
-    - torch==2.2.0.dev20230928
-    - torchvision==0.17.0.dev20230928
+    - torch==2.2.0.dev20231028
+    - torchvision==0.17.0.dev20231028
     - brotli>=1.0.9
     - cheroot>=9.0.0
     - nvidia-pyindex>=1.0.9
-    - pibble[cherrypy]>=0.6
+    - pibble[cherrypy]>=0.7
     - numpy>=1.24.3
     - colored>=1.4,<1.5
     - albumentations>=0.4.3,<0.5
-    - opencv-python>=4.7.0.72,<4.8
     - pudb==2019.2
     - invisible-watermark>=0.2,<0.3
     - imageio>=2.31.1,<3.0
@@ -59,6 +60,7 @@ dependencies:
     - lycoris-lora>=1.8
     - openmim>=0.3.9,<0.4
     - opensimplex>=0.4.5,<0.5
+    - tensorflow
     - git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
     - git+https://github.com/openai/CLIP.git@main#egg=clip
     - git+https://github.com/CompVis/stable-diffusion.git@main#egg=latent-diffusion

diff --git a/environments/build/macos-13/mps.yml b/environments/build/macos-13/mps.yml
@@ -9,17 +9,18 @@ dependencies:
   - numpy=1.24.3
   - make=4.3
   - nodejs=18.16.0
+  - ffmpeg=6.0.0
+  - opencv=4.6.0
   - pip:
     - brotli>=1.0.9
     - torch>=2.0.1
     - torchvision>=0.15.2
     - cheroot>=9.0.0
     - nvidia-pyindex>=1.0.9
-    - pibble[cherrypy]>=0.6
+    - pibble[cherrypy]>=0.7
     - numpy>=1.24.3
     - colored>=1.4,<1.5
     - albumentations>=0.4.3,<0.5
-    - opencv-python>=4.7.0.72,<4.8
     - pudb==2019.2
     - invisible-watermark>=0.2,<0.3
     - imageio>=2.31.1,<3.0

diff --git a/environments/build/ubuntu-latest/cuda-latest.yml b/environments/build/ubuntu-latest/cuda-latest.yml
@@ -12,17 +12,18 @@ dependencies:
   - numpy=1.24.3
   - make=4.3
   - nodejs=18.16.0
+  - ffmpeg=4.2.2
+  - opencv=4.6.0
   - pip:
     - torch==2.2.0.dev20230928+cu121
     - torchvision==0.17.0.dev20230928+cu121
     - brotli>=1.0.9
     - cheroot>=9.0.0
     - nvidia-pyindex>=1.0.9
-    - pibble[cherrypy]>=0.6
+    - pibble[cherrypy]>=0.7
     - numpy>=1.24.3
     - colored>=1.4,<1.5
     - albumentations>=0.4.3,<0.5
-    - opencv-python>=4.7.0.72,<4.8
     - pudb==2019.2
     - invisible-watermark>=0.2,<0.3
     - imageio>=2.31.1,<3.0
@@ -62,6 +63,7 @@ dependencies:
     - lycoris-lora>=1.8
     - openmim>=0.3.9,<0.4
     - opensimplex>=0.4.5,<0.5
+    - tensorflow[and-cuda]==2.14.0
     - git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
     - git+https://github.com/openai/CLIP.git@main#egg=clip
     - git+https://github.com/CompVis/stable-diffusion.git@main#egg=latent-diffusion

diff --git a/environments/build/ubuntu-latest/cuda.yml b/environments/build/ubuntu-latest/cuda.yml
@@ -2,27 +2,27 @@ name: enfugue
 channels:
   - pytorch
   - defaults
-  - nvidia
   - nvidia/label/cuda-11.8.0
   - conda-forge
 dependencies:
   - python=3.10.11
-  - pip=23.1.2
+  - pip
   - cuda-toolkit=11.8.0
-  - numpy=1.24.3
+  - numpy
   - make=4.3
-  - nodejs=18.16.0
+  - nodejs
+  - ffmpeg
+  - opencv=4.8.1
   - pip:
     - torch>=2.0.1+cu118
     - torchvision>=0.15.2+cu118
     - brotli>=1.0.9
     - cheroot>=9.0.0
     - nvidia-pyindex>=1.0.9
-    - pibble[cherrypy]>=0.6
+    - pibble[cherrypy]>=0.7
     - numpy>=1.24.3
     - colored>=1.4,<1.5
     - albumentations>=0.4.3,<0.5
-    - opencv-python>=4.7.0.72,<4.8
     - pudb==2019.2
     - invisible-watermark>=0.2,<0.3
     - imageio>=2.31.1,<3.0
@@ -62,6 +62,7 @@ dependencies:
     - lycoris-lora>=1.8
     - openmim>=0.3.9,<0.4
     - opensimplex>=0.4.5,<0.5
+    - tensorflow[and-cuda]
     - git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
     - git+https://github.com/openai/CLIP.git@main#egg=clip
     - git+https://github.com/CompVis/stable-diffusion.git@main#egg=latent-diffusion

diff --git a/environments/build/ubuntu-latest/tensorrt.yml b/environments/build/ubuntu-latest/tensorrt.yml
@@ -19,7 +19,7 @@ dependencies:
     - brotli>=1.0.9
     - cheroot>=9.0.0
     - nvidia-pyindex>=1.0.9
-    - pibble[cherrypy]>=0.6
+    - pibble[cherrypy]>=0.7
     - numpy>=1.24.3
     - colored>=1.4,<1.5
     - albumentations>=0.4.3,<0.5

diff --git a/environments/build/windows-latest/cuda-latest.yml b/environments/build/windows-latest/cuda-latest.yml
@@ -13,17 +13,18 @@ dependencies:
   - 7zip=19.00
   - make=4.3
   - nodejs=18.16.0
+  - ffmpeg=4.2.2
+  - opencv=4.6.0
   - pip:
-    - torch==2.2.0.dev20230928+cu121
-    - torchvision==0.17.0.dev20230928+cu121
+    - torch==2.2.0.dev20231028+cu121
+    - torchvision==0.17.0.dev20231028+cu121
     - brotli>=1.0.9
     - cheroot>=9.0.0
     - nvidia-pyindex>=1.0.9
-    - pibble[cherrypy]>=0.6
+    - pibble[cherrypy]>=0.7
     - numpy>=1.24.3
     - colored>=1.4,<1.5
     - albumentations>=0.4.3,<0.5
-    - opencv-python>=4.7.0.72,<4.8
     - pudb==2019.2
     - invisible-watermark>=0.2,<0.3
     - imageio>=2.31.1,<3.0

diff --git a/environments/build/windows-latest/cuda.yml b/environments/build/windows-latest/cuda.yml
@@ -2,28 +2,28 @@ name: enfugue
 channels:
   - pytorch
   - defaults
-  - nvidia
   - nvidia/label/cuda-11.8.0
   - conda-forge
 dependencies:
-  - python=3.10.11
-  - pip=23.1.2
   - cuda-toolkit=11.8.0
-  - numpy=1.24.3
-  - 7zip=19.00
+  - python=3.10.11
+  - opencv=4.5.5
   - make=4.3
-  - nodejs=18.16.0
+  - pip
+  - numpy
+  - 7zip
+  - nodejs
+  - ffmpeg
   - pip:
     - torch>=2.0.1+cu118
     - torchvision>=0.15.2+cu118
     - brotli>=1.0.9
     - cheroot>=9.0.0
     - nvidia-pyindex>=1.0.9
-    - pibble[cherrypy]>=0.6
+    - pibble[cherrypy]>=0.7
     - numpy>=1.24.3
     - colored>=1.4,<1.5
     - albumentations>=0.4.3,<0.5
-    - opencv-python>=4.7.0.72,<4.8
     - pudb==2019.2
     - invisible-watermark>=0.2,<0.3
     - imageio>=2.31.1,<3.0
@@ -64,6 +64,7 @@ dependencies:
     - certifi>=2023.5.7
     - openmim>=0.3.9,<0.4
     - opensimplex>=0.4.5,<0.5
+    - tensorflow[and-cuda]
     - git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
     - git+https://github.com/openai/CLIP.git@main#egg=clip
     - git+https://github.com/CompVis/stable-diffusion.git@main#egg=latent-diffusion

diff --git a/environments/build/windows-latest/tensorrt.yml b/environments/build/windows-latest/tensorrt.yml
@@ -20,7 +20,7 @@ dependencies:
     - brotli>=1.0.9
     - cheroot>=9.0.0
     - nvidia-pyindex>=1.0.9
-    - pibble[cherrypy]>=0.6
+    - pibble[cherrypy]>=0.7
     - numpy>=1.24.3
     - colored>=1.4,<1.5
     - albumentations>=0.4.3,<0.5

diff --git a/environments/cpu.yml b/environments/cpu.yml
@@ -6,19 +6,20 @@ channels:
   - conda-forge
 dependencies:
   - python=3.10.11
-  - pip=23.1.2
-  - numpy=1.24.3
+  - opencv=4.8.1
+  - pip
+  - numpy
+  - ffmpeg
   - pip:
-    - torch==2.2.0.dev20230910+cpu
-    - torchvision==0.17.0.dev20230910+cpu
+    - torch>=2.0.1
+    - torchvisio>=0.15.2
     - brotli>=1.0.9
     - cheroot>=9.0.0
     - nvidia-pyindex>=1.0.9
-    - pibble[cherrypy]>=0.6
+    - pibble[cherrypy]>=0.7
     - numpy>=1.24.3
     - colored>=1.4,<1.5
     - albumentations>=0.4.3,<0.5
-    - opencv-python>=4.7.0.72,<4.8
     - pudb==2019.2
     - invisible-watermark>=0.2,<0.3
     - imageio>=2.31.1,<3.0
@@ -49,10 +50,10 @@ dependencies:
     - certifi>=2023.5.7
     - lycoris-lora>=1.8
     - openmim>=0.3.9,<0.4
-    - enfugue==0.2.5.post0
+    - tensorflow
+    - enfugue==0.3.0.post0
     - git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
     - git+https://github.com/openai/CLIP.git@main#egg=clip
     - git+https://github.com/CompVis/stable-diffusion.git@main#egg=latent-diffusion
     - git+https://github.com/huggingface/diffusers@main#egg=diffusers
-    - --extra-index-url https://download.pytorch.org/whl/nightly/
     - --extra-index-url https://pypi.ngc.nvidia.com