From 12eff0dd42bc5905a9e3b7d2ba2bb77bc2f50738 Mon Sep 17 00:00:00 2001 From: Matthias Wild <40327258+mauwii@users.noreply.github.com> Date: Sun, 27 Nov 2022 03:43:04 +0100 Subject: [PATCH 1/2] Update-requirements and test-invoke-pip workflow (#1574) * update requirements files * update test-invoke-pip workflow --- .github/workflows/test-invoke-pip.yml | 4 +--- environments-and-requirements/requirements-base.txt | 3 +-- environments-and-requirements/requirements-lin-amd.txt | 2 ++ environments-and-requirements/requirements-lin-arm64.txt | 3 +++ environments-and-requirements/requirements-lin-cuda.txt | 3 ++- environments-and-requirements/requirements-mac-mps-cpu.txt | 4 ++-- environments-and-requirements/requirements-win-colab-cuda.txt | 4 ++-- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-invoke-pip.yml b/.github/workflows/test-invoke-pip.yml index a333e73bb6..ce1d1ad6d7 100644 --- a/.github/workflows/test-invoke-pip.yml +++ b/.github/workflows/test-invoke-pip.yml @@ -79,9 +79,7 @@ jobs: # run: ${{ env.pythonLocation }}/bin/pip install --upgrade pip setuptools wheel - name: install requirements - run: | - ${{ env.pythonLocation }}/bin/pip install --upgrade -r '${{ matrix.requirements-file }}' - ${{ env.pythonLocation }}/bin/pip install -e . + run: ${{ env.pythonLocation }}/bin/pip install -r '${{ matrix.requirements-file }}' - name: Use Cached Stable Diffusion Model id: cache-sd-model diff --git a/environments-and-requirements/requirements-base.txt b/environments-and-requirements/requirements-base.txt index 19aa0ab66b..e1b605db97 100644 --- a/environments-and-requirements/requirements-base.txt +++ b/environments-and-requirements/requirements-base.txt @@ -35,5 +35,4 @@ picklescan git+https://github.com/openai/CLIP.git@main#egg=clip git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k-diffusion git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg -git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan -git+https://github.com/invoke-ai/PyPatchMatch@0.1.1#egg=pypatchmatch \ No newline at end of file +git+https://github.com/invoke-ai/PyPatchMatch@0.1.1#egg=pypatchmatch diff --git a/environments-and-requirements/requirements-lin-amd.txt b/environments-and-requirements/requirements-lin-amd.txt index d627f99861..2cf1835dbf 100644 --- a/environments-and-requirements/requirements-lin-amd.txt +++ b/environments-and-requirements/requirements-lin-amd.txt @@ -1,5 +1,7 @@ -r environments-and-requirements/requirements-base.txt +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan + # Get hardware-appropriate torch/torchvision --extra-index-url https://download.pytorch.org/whl/rocm5.1.1 --trusted-host https://download.pytorch.org torch diff --git a/environments-and-requirements/requirements-lin-arm64.txt b/environments-and-requirements/requirements-lin-arm64.txt index 304432e4c7..1e1b408238 100644 --- a/environments-and-requirements/requirements-lin-arm64.txt +++ b/environments-and-requirements/requirements-lin-arm64.txt @@ -1,3 +1,6 @@ --pre torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/nightly/cpu + +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan + -r environments-and-requirements/requirements-base.txt -e . diff --git a/environments-and-requirements/requirements-lin-cuda.txt b/environments-and-requirements/requirements-lin-cuda.txt index 06e6e73366..56c7d971c4 100644 --- a/environments-and-requirements/requirements-lin-cuda.txt +++ b/environments-and-requirements/requirements-lin-cuda.txt @@ -1,2 +1,3 @@ -r environments-and-requirements/requirements-base.txt -# -e . +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan +-e . diff --git a/environments-and-requirements/requirements-mac-mps-cpu.txt b/environments-and-requirements/requirements-mac-mps-cpu.txt index 54071e73c7..143ef5356e 100644 --- a/environments-and-requirements/requirements-mac-mps-cpu.txt +++ b/environments-and-requirements/requirements-mac-mps-cpu.txt @@ -1,7 +1,7 @@ -r environments-and-requirements/requirements-base.txt - +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.2#egg=gfpgan grpcio<1.51.0 protobuf==3.19.6 torch<1.13.0 torchvision<0.14.0 -# -e . +-e . diff --git a/environments-and-requirements/requirements-win-colab-cuda.txt b/environments-and-requirements/requirements-win-colab-cuda.txt index b00f1487fb..854fe394f1 100644 --- a/environments-and-requirements/requirements-win-colab-cuda.txt +++ b/environments-and-requirements/requirements-win-colab-cuda.txt @@ -1,6 +1,6 @@ -r environments-and-requirements/requirements-base.txt - -# Get hardware-appropriate torch/torchvision +git+https://github.com/invoke-ai/GFPGAN@basicsr-1.4.1#egg=gfpgan +# Get hardware-appropriate torch/torchvision --extra-index-url https://download.pytorch.org/whl/cu116 --trusted-host https://download.pytorch.org basicsr==1.4.1 torch==1.12.1 From 0608d259dd12c5af74b8488d0ac5620f76b539ce Mon Sep 17 00:00:00 2001 From: Matthias Wild <40327258+mauwii@users.noreply.github.com> Date: Sun, 27 Nov 2022 07:59:56 +0100 Subject: [PATCH 2/2] move requirements-mkdocs.txt to docs folder (#1575) * move requirements-mkdocs.txt to docs folder * update copyright --- .github/workflows/mkdocs-material.yml | 2 +- requirements-mkdocs.txt => docs/requirements-mkdocs.txt | 0 mkdocs.yml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename requirements-mkdocs.txt => docs/requirements-mkdocs.txt (100%) diff --git a/.github/workflows/mkdocs-material.yml b/.github/workflows/mkdocs-material.yml index 8d3c262e47..b07c310d3e 100644 --- a/.github/workflows/mkdocs-material.yml +++ b/.github/workflows/mkdocs-material.yml @@ -22,7 +22,7 @@ jobs: - name: install requirements run: | python -m \ - pip install -r requirements-mkdocs.txt + pip install -r docs/requirements-mkdocs.txt - name: confirm buildability run: | diff --git a/requirements-mkdocs.txt b/docs/requirements-mkdocs.txt similarity index 100% rename from requirements-mkdocs.txt rename to docs/requirements-mkdocs.txt diff --git a/mkdocs.yml b/mkdocs.yml index 2cb956055a..3779b0523e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -12,7 +12,7 @@ repo_url: 'https://github.com/invoke-ai/InvokeAI' edit_uri: edit/main/docs/ # Copyright -copyright: Copyright © 2022 Lincoln D. Stein +copyright: Copyright © 2022 InvokeAI Team # Configuration theme: