1.4

.dockerignore

@@ -0,0 +1 @@
+models

.github/workflows/docker-publish.yml

@@ -0,0 +1,93 @@
+name: Docker
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+on:
+  schedule:
+    - cron: '31 4 * * *'
+  push:
+    branches: [ main ]
+    # Publish semver tags as releases.
+    tags: [ 'v*.*.*' ]
+  pull_request:
+    branches: [ main ]
+
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      # This is used to complete the identity challenge
+      # with sigstore/fulcio when running outside of PRs.
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Install the cosign tool except on PR
+      # https://github.com/sigstore/cosign-installer
+#      - name: Install cosign
+#        if: github.event_name != 'pull_request'
+#        uses: sigstore/cosign-installer@d6a3abf1bdea83574e28d40543793018b6035605
+#        with:
+#          cosign-release: 'v1.7.1'
+
+
+      # Workaround: https://github.com/docker/build-push-action/issues/461
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      # Sign the resulting Docker image digest except on PRs.
+      # This will only write to the public Rekor transparency log when the Docker
+      # repository is public to avoid leaking data.  If you would like to publish
+      # transparency data even for private images, pass --force to cosign below.
+      # https://github.com/sigstore/cosign
+#      - name: Sign the published Docker image
+#        if: ${{ github.event_name != 'pull_request' }}
+#        env:
+#          COSIGN_EXPERIMENTAL: "true"
+        # This step uses the identity token to provision an ephemeral certificate
+        # against the sigstore community Fulcio instance.
+#        run: cosign sign ${{ steps.meta.outputs.tags }}@${{ steps.build-and-push.outputs.digest }}

.gitignore

@@ -0,0 +1 @@
+models

Dockerfile

@@ -0,0 +1,40 @@
+FROM pytorch/pytorch:1.11.0-cuda11.3-cudnn8-runtime
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata build-essential wget git git-lfs \
+    && apt-get clean
+
+RUN mkdir -p /src
+WORKDIR /src
+
+RUN git clone https://github.com/multimodalart/latent-diffusion --branch 1.4
+RUN git clone https://github.com/CompVis/taming-transformers
+RUN git clone https://github.com/TencentARC/GFPGAN
+RUN git lfs clone https://github.com/LAION-AI/aesthetic-predictor
+
+RUN pip install tensorflow==2.9.1
+RUN pip install -e ./taming-transformers
+RUN pip install omegaconf>=2.0.0 pytorch-lightning>=1.0.8 torch-fidelity einops
+RUN pip install transformers
+RUN pip install dotmap
+RUN pip install resize-right
+RUN pip install piq
+RUN pip install lpips
+RUN pip install basicsr
+RUN pip install facexlib
+RUN pip install realesrgan
+RUN pip install ipywidgets
+
+RUN git clone https://github.com/apolinario/Multi-Modal-Comparators --branch gradient_checkpointing
+RUN pip install poetry
+WORKDIR /src/Multi-Modal-Comparators
+RUN poetry build; pip install dist/mmc*.whl
+WORKDIR /src
+RUN python Multi-Modal-Comparators/src/mmc/napm_installs/__init__.py
+
+VOLUME [ "/src/models" ]
+VOLUME [ "/root/.cache" ]
+
+COPY majesty.py .
+COPY latent.py .
+COPY latent_settings_library .
+ENTRYPOINT ["python", "latent.py"]

README.md

@@ -13,11 +13,12 @@ Current implementations:
 - [V-Majesty Diffusion](#v-majesty-diffusion-v12)
 
 
-## Latent Majesty Diffusion v1.3
+## Latent Majesty Diffusion v1.4
 ##### Formerly known as Latent Princess Generator
 [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/multimodalart/MajestyDiffusion/blob/main/latent.ipynb)
 
 A [Dango233](https://github.com/Dango233) and [apolinario (@multimodalart)](https://github.com/multimodalart) Colab notebook implementing [CompVis](https://github.com/CompVis)' Latent Diffusion, with the following changes:
+v1.2
   - Added [Dango233](https://github.com/Dango233) CLIP Guidance
   - Added [Dango233](https://github.com/Dango233) magical **new** step and upscaling scheduling
   - Added [Dango233](https://github.com/Dango233) cuts, augs and attributes scheduling
@@ -31,6 +32,13 @@ A [Dango233](https://github.com/Dango233) and [apolinario (@multimodalart)](http
   - Added [LAION-AI](https://github.com/LAION-AI/aesthetic-predictor) aesthetic predictor embeddings
   - Added [Dango233](https://github.com/Dango233) inpainting mode
   - Added [apolinario (@multimodalart)](https://github.com/multimodalart) savable settings and setting library (including `colab-free-default`, `dango233-princesses`, `the-other-zippy` and `makaitrad` shared settings. Share yours with us too with a pull request!
+v1.3
+  - Better Upscaler (learn how to use it on our [Majestic Guide](https://multimodal.art/majesty-diffusion))
+v1.4
+ - Added [Dango233](https://github.com/Dango233) Customised Dynamic Thresholding
+ - Added [open_clip](https://github.com/mlfoundations/open_clip) ViT-L/14 LAION-400M trained 
+ - Fix CLOOB perceptor from MMC
+ - Removes latent upscaler (was broken), adds RGB upscaler
 
 ## V-Majesty Diffusion v1.2
 ##### Formerly known as Princess Generator ver. Victoria