Merge pull request #1731 from bmaltais/dev2

v22.2.2

.github/workflows/typos.yaml

@@ -18,4 +18,4 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: typos-action
-        uses: crate-ci/[email protected].21
+        uses: crate-ci/[email protected].23

.release

@@ -1 +1 @@
-v22.2.1
+v22.2.2

Dockerfile

@@ -3,7 +3,9 @@ ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/London
 
 RUN apt update && apt-get install -y software-properties-common
-RUN add-apt-repository ppa:deadsnakes/ppa && \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    add-apt-repository ppa:deadsnakes/ppa && \
     apt update && \
     apt-get install -y git curl libgl1 libglib2.0-0 libgoogle-perftools-dev \
     python3.10-dev python3.10-tk python3-html5lib python3-apt python3-pip python3.10-distutils && \
@@ -17,22 +19,22 @@ RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 3
 RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3
 
 WORKDIR /app
-RUN python3 -m pip install wheel
+RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip install wheel
 
 # Todo: Install torch 2.1.0 for cu121 support (only available as nightly as of writing)
-## RUN python3 -m pip install --pre torch ninja setuptools --extra-index-url https://download.pytorch.org/whl/nightly/cu121
+## RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip install --pre torch ninja setuptools --extra-index-url https://download.pytorch.org/whl/nightly/cu121
 
 # Todo: Install xformers nightly for Torch 2.1.0 support
-## RUN python3 -m pip install -v -U git+https://github.com/facebookresearch/xformers.git@main#egg=xformers
+## RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip install -v -U git+https://github.com/facebookresearch/xformers.git@main#egg=xformers
 
 # Install requirements
 COPY ./requirements.txt ./requirements_linux_docker.txt ./
 COPY ./setup/docker_setup.py ./setup.py
-RUN python3 -m pip install -r ./requirements_linux_docker.txt
-RUN python3 -m pip install -r ./requirements.txt
+RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip install -r ./requirements_linux_docker.txt
+RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip install -r ./requirements.txt
 
 # Replace pillow with pillow-simd
-RUN python3 -m pip uninstall -y pillow && \
+RUN --mount=type=cache,target=/root/.cache/pip python3 -m pip uninstall -y pillow && \
     CC="cc -mavx2" python3 -m pip install -U --force-reinstall pillow-simd
 
 # Fix missing libnvinfer7

README.md

@@ -651,7 +651,15 @@ masterpiece, best quality, 1boy, in business suit, standing at street, looking b
 
 
 ## Change History
-* 2023/11/?? (v22.2.1)
+* 2023/12/03 (v22.2.2)
+- Update Lycoris module to 2.0.0 (https://github.com/KohakuBlueleaf/LyCORIS/blob/0006e2ffa05a48d8818112d9f70da74c0cd30b99/README.md)
+- Update Lycoris merge and extract tools
+- Remove anoying warning about local pip modules that is not necessary.
+- Adding support for LyCORIS presets
+- Adding Support for LyCORIS Native Fine-Tuning
+- Adding support for Lycoris Diag-OFT
+
+* 2023/11/20 (v22.2.1)
 - Fix issue with `Debiased Estimation loss` not getting properly loaded from json file. Oups.
 
 * 2023/11/15 (v22.2.0)

gui.bat

@@ -4,7 +4,7 @@
 call .\venv\Scripts\deactivate.bat
 
 :: Calling external python program to check for local modules
-python .\setup\check_local_modules.py --no_question
+:: python .\setup\check_local_modules.py --no_question
 
 :: Activate the virtual environment
 call .\venv\Scripts\activate.bat

gui.ps1

@@ -4,24 +4,24 @@ if ($env:VIRTUAL_ENV) {
     & deactivate
 }
 
-# Run pip freeze and capture the output
-$pipOutput = & pip freeze
+# # Run pip freeze and capture the output
+# $pipOutput = & pip freeze
 
-# Check if modules are found in the output
-if ($pipOutput) {
-    Write-Host " "
-    Write-Host -ForegroundColor Yellow -Object "============================================================="
-    Write-Host -ForegroundColor Yellow -Object "Modules installed outside the virtual environment were found."
-    Write-Host -ForegroundColor Yellow -Object "This can cause issues. Please review the installed modules."
-    Write-Host " "
-    Write-Host -ForegroundColor Yellow -Object "You can deinstall all the local modules with:"
-    Write-Host " "
-    Write-Host -ForegroundColor Blue -Object "deactivate"
-    Write-Host -ForegroundColor Blue -Object "pip freeze > uninstall.txt"
-    Write-Host -ForegroundColor Blue -Object "pip uninstall -y -r uninstall.txt"
-    Write-Host -ForegroundColor Yellow -Object "============================================================="
-    Write-Host " "
-} 
+# # Check if modules are found in the output
+# if ($pipOutput) {
+#     Write-Host " "
+#     Write-Host -ForegroundColor Yellow -Object "============================================================="
+#     Write-Host -ForegroundColor Yellow -Object "Modules installed outside the virtual environment were found."
+#     Write-Host -ForegroundColor Yellow -Object "This can cause issues. Please review the installed modules."
+#     Write-Host " "
+#     Write-Host -ForegroundColor Yellow -Object "You can deinstall all the local modules with:"
+#     Write-Host " "
+#     Write-Host -ForegroundColor Blue -Object "deactivate"
+#     Write-Host -ForegroundColor Blue -Object "pip freeze > uninstall.txt"
+#     Write-Host -ForegroundColor Blue -Object "pip uninstall -y -r uninstall.txt"
+#     Write-Host -ForegroundColor Yellow -Object "============================================================="
+#     Write-Host " "
+# } 
 
 # Activate the virtual environment
 # Write-Host "Activating the virtual environment..."

library/class_basic_training.py

@@ -105,6 +105,7 @@ def __init__(
                     "Lion",
                     "Lion8bit",
                     "PagedAdamW8bit",
+                    "PagedAdamW32bit",
                     "PagedLion8bit",
                     "Prodigy",
                     "SGDNesterov",