diff --git a/installer/install.bat b/installer/install.bat index 7d6c7c43de..131b14e06e 100644 --- a/installer/install.bat +++ b/installer/install.bat @@ -12,8 +12,6 @@ echo ***** Installing InvokeAI.. ***** -set PATH=c:\windows\system32 - @rem Config set INSTALL_ENV_DIR=%cd%\installer_files\env @rem https://mamba.readthedocs.io/en/latest/installation.html @@ -103,11 +101,8 @@ echo ***** Unpacked python-build-standalone ***** @rem create venv set err_msg=----- problem creating venv ----- .\python\python -E -s -m venv .venv -@rem In reality, the following is ALL that 'activate.bat' does, -@rem aside from setting the prompt, which we don't care about -set PYTHONPATH= -set PATH=.venv\Scripts;%PATH% if %errorlevel% neq 0 goto err_exit +call .venv\Scripts\activate.bat echo ***** Created Python virtual environment ***** @@ -131,10 +126,6 @@ set err_msg=----- main pip install failed ----- .venv\Scripts\python -m pip install --no-cache-dir --no-warn-script-location -r requirements.txt if %errorlevel% neq 0 goto err_exit -set err_msg=----- clipseg install failed ----- -.venv\Scripts\python -m pip install --no-cache-dir --no-warn-script-location git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg -if %errorlevel% neq 0 goto err_exit - set err_msg=----- InvokeAI setup failed ----- .venv\Scripts\python -m pip install --no-cache-dir --no-warn-script-location -e . if %errorlevel% neq 0 goto err_exit @@ -155,6 +146,8 @@ echo All done! Execute the file invoke.bat in this directory to start InvokeAI @rem more cleanup rd /s /q installer installer_files +deactivate + pause exit diff --git a/installer/install.sh b/installer/install.sh index fe6c38fcd1..a6fa268b95 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -29,7 +29,7 @@ OS_NAME=$(uname -s) case "${OS_NAME}" in Linux*) OS_NAME="linux";; Darwin*) OS_NAME="darwin";; - *) echo -e "\n----- Unknown OS: $OS_NAME! This script runs only on Linux or MacOS -----\n" && exit + *) echo -e "\n----- Unknown OS: $OS_NAME! This script runs only on Linux or macOS -----\n" && exit esac OS_ARCH=$(uname -m) @@ -154,12 +154,22 @@ echo -e "\n***** Unpacked python-build-standalone *****\n" # create venv _err_msg="\n----- problem creating venv -----\n" + +if [ "$OS_NAME" == "darwin" ]; then + # patch sysconfig so that extensions can build properly + # adapted from https://github.com/cashapp/hermit-packages/commit/fcba384663892f4d9cfb35e8639ff7a28166ee43 + PYTHON_INSTALL_DIR="$(pwd)/python" + SYSCONFIG="$(echo python/lib/python*/_sysconfigdata_*.py)" + TMPFILE="$(mktemp)" + chmod +w "${SYSCONFIG}" + cp "${SYSCONFIG}" "${TMPFILE}" + sed "s,'/install,'${PYTHON_INSTALL_DIR},g" "${TMPFILE}" > "${SYSCONFIG}" + rm -f ${TMPFILE} +fi + ./python/bin/python3 -E -s -m venv .venv _err_exit $? _err_msg -# In reality, the following is ALL that 'activate.bat' does, -# aside from setting the prompt, which we don't care about -export PYTHONPATH= -export PATH=.venv/bin:$PATH +source .venv/bin/activate echo -e "\n***** Created Python virtual environment *****\n" @@ -183,10 +193,6 @@ _err_msg="\n----- main pip install failed -----\n" .venv/bin/python3 -m pip install --no-cache-dir --no-warn-script-location -r requirements.txt _err_exit $? _err_msg -_err_msg="\n----- clipseg install failed -----\n" -.venv/bin/python3 -m pip install --no-cache-dir --no-warn-script-location git+https://github.com/invoke-ai/clipseg.git@relaxed-python-requirement#egg=clipseg -_err_exit $? _err_msg - _err_msg="\n----- InvokeAI setup failed -----\n" .venv/bin/python3 -m pip install --no-cache-dir --no-warn-script-location -e . _err_exit $? _err_msg @@ -206,6 +212,8 @@ cp installer/invoke.sh . # more cleanup rm -rf installer/ installer_files/ +deactivate + echo "All done! Run the command './invoke.sh' to start InvokeAI." read -p "Press any key to exit..." exit diff --git a/installer/invoke.bat b/installer/invoke.bat index c00975fd3b..2d01c73b0b 100644 --- a/installer/invoke.bat +++ b/installer/invoke.bat @@ -1,7 +1,6 @@ @echo off -set PATH=c:\windows\system32 -set PATH=.venv\Scripts;%PATH% +call .venv\Scripts\activate.bat echo Do you want to generate images using the echo 1. command-line @@ -16,12 +15,16 @@ IF /I "%restore%" == "1" ( .venv\Scripts\python scripts\invoke.py --web ) ELSE IF /I "%restore%" == "3" ( echo Developer Console - call where python - call python --version - - cmd /k + echo 'python' command is: + where python + echo 'python' version is: + python --version + echo Type 'exit' to quit this shell + call cmd ) ELSE ( echo Invalid selection pause exit /b ) + +deactivate diff --git a/installer/invoke.sh b/installer/invoke.sh index 58f342d471..32606f28bc 100755 --- a/installer/invoke.sh +++ b/installer/invoke.sh @@ -3,7 +3,7 @@ set -euo pipefail IFS=$'\n\t' -PATH=.venv/scripts:$PATH +source .venv/bin/activate if [ "$0" != "bash" ]; then echo "Do you want to generate images using the" @@ -18,7 +18,9 @@ if [ "$0" != "bash" ]; then * ) echo "Invalid selection"; exit;; esac else # in developer console + echo "'python' command is:" + which python + echo "'python' version is:" python --version - echo "Press ^D to exit" - export PS1="(InvokeAI) \u@\h \w> " + echo "Type 'exit' to quit this shell" fi diff --git a/installer/py3.10-darwin-arm64-mps-reqs.txt b/installer/py3.10-darwin-arm64-mps-reqs.txt index 116f67ded1..fd4f9dc2cf 100644 --- a/installer/py3.10-darwin-arm64-mps-reqs.txt +++ b/installer/py3.10-darwin-arm64-mps-reqs.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with python 3.10 # To update, run: # -# pip-compile --allow-unsafe --generate-hashes --output-file=installer/py3.10-darwin-arm64-mps-reqs.txt requirements.in +# pip-compile --allow-unsafe --generate-hashes --output-file=installer/py3.10-darwin-arm64-mps-reqs.txt installer/requirements.in # --extra-index-url https://download.pytorch.org/whl/cu116 --trusted-host https @@ -13,10 +13,12 @@ absl-py==1.3.0 \ # via # tb-nightly # tensorboard -accelerate==0.13.2 \ - --hash=sha256:dd6f08b010077f252dda5a7699d87b02885335c456770939c536e65ff07ed760 \ - --hash=sha256:e22180d7094e4c1bfb05a2b078297c222f6b4fa595fde8916946c3f377cdf019 - # via k-diffusion +accelerate==0.14.0 \ + --hash=sha256:31c5bcc40564ef849b5bc1c4424a43ccaf9e26413b7df89c2e36bf81f070fd44 \ + --hash=sha256:b15d562c0889d0cf441b01faa025dfc29b163d061b6cc7d489c2c83b0a55ffab + # via + # -r installer/requirements.in + # k-diffusion addict==2.4.0 \ --hash=sha256:249bb56bbfd3cdc2a004ea0ff4c2b6ddc84d53bc2194761636eb314d5cfa5dfc \ --hash=sha256:b3b2210e0e067a281f5646c8c5db92e99b7231ea8b0eb5f74dbdf9e259d4e494 @@ -117,7 +119,7 @@ aiosignal==1.2.0 \ albumentations==1.3.0 \ --hash=sha256:294165d87d03bc8323e484927f0a5c1a3c64b0e7b9c32a979582a6c93c363bdf \ --hash=sha256:be1af36832c8893314f2a5550e8ac19801e04770734c1b70fa3c996b41f37bed - # via -r requirements.in + # via -r installer/requirements.in altair==4.2.0 \ --hash=sha256:0c724848ae53410c13fa28be2b3b9a9dcb7b5caa1a70f7f217bd663bb419935a \ --hash=sha256:d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026 @@ -180,13 +182,12 @@ click==8.1.3 \ # wandb clip @ https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip \ --hash=sha256:b5842c25da441d6c581b53a5c60e0c2127ebafe0f746f8e15561a006c6c3be6a - # via -r requirements.in -colorama==0.4.6 \ - --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \ - --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6 # via - # click - # tqdm + # -r installer/requirements.in + # clipseg +clipseg @ https://github.com/invoke-ai/clipseg/archive/1f754751c85d7d4255fa681f4491ff5711c1c288.zip \ + --hash=sha256:14f43ed42f90be3fe57f06de483cb8be0f67f87a6f62a011339d45a39f4b4189 + # via -r installer/requirements.in commonmark==0.9.1 \ --hash=sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60 \ --hash=sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9 @@ -273,7 +274,7 @@ decorator==5.1.1 \ diffusers==0.7.2 \ --hash=sha256:4a5f8b3a5fbd936bba7d459611cb35ec62875030367be32b232f9e19543e25a9 \ --hash=sha256:fb814ffd150cc6f470380b8c6a521181a77beb2f44134d2aad2e4cd8aa2ced0e - # via -r requirements.in + # via -r installer/requirements.in dnspython==2.2.1 \ --hash=sha256:0f7569a4a6ff151958b64304071d370daa3243d15941a7beedf0c9fe5105603e \ --hash=sha256:a851e51367fb93e9e1361732c1d60dab63eff98712e503ea7d92e6eccb109b4f @@ -293,7 +294,7 @@ entrypoints==0.4 \ eventlet==0.33.1 \ --hash=sha256:a085922698e5029f820cf311a648ac324d73cec0e4792877609d978a4b5bbf31 \ --hash=sha256:afbe17f06a58491e9aebd7a4a03e70b0b63fd4cf76d8307bae07f280479b1515 - # via -r requirements.in + # via -r installer/requirements.in facexlib==0.2.5 \ --hash=sha256:31e20cc4ed5d63562d380e4564bae14ac0d5d1899a079bad87621e13564567e4 \ --hash=sha256:cc7ceb56c5424319c47223cf75eef6828c34c66082707c6eb35b95d39779f02d @@ -319,15 +320,15 @@ flask==2.2.2 \ flask-cors==3.0.10 \ --hash=sha256:74efc975af1194fc7891ff5cd85b0f7478be4f7f59fe158102e91abb72bb4438 \ --hash=sha256:b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de - # via -r requirements.in + # via -r installer/requirements.in flask-socketio==5.3.1 \ --hash=sha256:fd0ed0fc1341671d92d5f5b2f5503916deb7aa7e2940e6636cfa2c087c828bf9 \ --hash=sha256:ff0c721f20bff1e2cfba77948727a8db48f187e89a72fe50c34478ce6efb3353 - # via -r requirements.in + # via -r installer/requirements.in flaskwebgui==0.3.7 \ --hash=sha256:4a69955308eaa8bb256ba04a994dc8f58a48dcd6f9599694ab1bcd9f43d88a5d \ --hash=sha256:535974ce2672dcc74787c254de24cceed4101be75d96952dae82014dd57f061e - # via -r requirements.in + # via -r installer/requirements.in fonttools==4.38.0 \ --hash=sha256:2bb244009f9bf3fa100fc3ead6aeb99febe5985fa20afbfbaa2f8946c2fbdaf1 \ --hash=sha256:820466f43c8be8c3009aef8b87e785014133508f0de64ec469e4efb643ae54fb @@ -411,11 +412,11 @@ future==0.18.2 \ getpass-asterisk==1.0.1 \ --hash=sha256:20d45cafda0066d761961e0919728526baf7bb5151fbf48a7d5ea4034127d857 \ --hash=sha256:7cc357a924cf62fa4e15b73cb4e5e30685c9084e464ffdc3fd9000a2b54ea9e9 - # via -r requirements.in + # via -r installer/requirements.in gfpgan @ https://github.com/TencentARC/GFPGAN/archive/2eac2033893ca7f427f4035d80fe95b92649ac56.zip \ --hash=sha256:79e6d71c8f1df7c7ccb0ac6b9a2ccb615ad5cde818c8b6f285a8711c05aebf85 # via - # -r requirements.in + # -r installer/requirements.in # realesrgan gitdb==4.0.9 \ --hash=sha256:8033ad4e853066ba6ca92050b9df2f89301b8fc8bf7e9324d412a63f8bf1a8fd \ @@ -576,7 +577,7 @@ imageio-ffmpeg==0.4.7 \ --hash=sha256:7a08838f97f363e37ca41821b864fd3fdc99ab1fe2421040c78eb5f56a9e723e \ --hash=sha256:8e724d12dfe83e2a6eb39619e820243ca96c81c47c2648e66e05f7ee24e14312 \ --hash=sha256:fc60686ef03c2d0f842901b206223c30051a6a120384458761390104470846fd - # via -r requirements.in + # via -r installer/requirements.in importlib-metadata==5.0.0 \ --hash=sha256:da31db32b304314d044d3c12c79bd59e307889b287ad12ff387b3500835fc2ab \ --hash=sha256:ddb0e35065e8938f867ed4928d0ae5bf2a53b7773871bfe6bcc7e4fcdc7dea43 @@ -609,7 +610,7 @@ jsonschema==4.17.0 \ # jsonmerge k-diffusion @ https://github.com/invoke-ai/k-diffusion/archive/7f16b2c33411f26b3eae78d10648d625cb0c1095.zip \ --hash=sha256:c3f2c84036aa98c3abf4552fafab04df5ca472aa639982795e05bb1db43ce5e4 - # via -r requirements.in + # via -r installer/requirements.in kiwisolver==1.4.4 \ --hash=sha256:02f79693ec433cb4b5f51694e8477ae83b3205768a6fb48ffba60549080e295b \ --hash=sha256:03baab2d6b4a54ddbb43bba1a3a2d1627e82d205c5cf8f4c924dc49284b87166 \ @@ -837,7 +838,9 @@ matplotlib==3.6.2 \ --hash=sha256:ec9be0f4826cdb3a3a517509dcc5f87f370251b76362051ab59e42b6b765f8c4 \ --hash=sha256:f04f97797df35e442ed09f529ad1235d1f1c0f30878e2fe09a2676b71a8801e0 \ --hash=sha256:f41e57ad63d336fe50d3a67bb8eaa26c09f6dda6a59f76777a99b8ccd8e26aec - # via filterpy + # via + # clipseg + # filterpy multidict==6.0.2 \ --hash=sha256:0327292e745a880459ef71be14e709aaea2f783f3537588fb4ed09b6c01bca60 \ --hash=sha256:041b81a5f6b38244b34dc18c7b6aba91f9cdaf854d9a39e5ff0b58e2b5773b9c \ @@ -970,6 +973,7 @@ numpy==1.23.4 \ # altair # basicsr # clean-fid + # clipseg # contourpy # diffusers # facexlib @@ -1018,6 +1022,7 @@ opencv-python==4.6.0.66 \ --hash=sha256:f482e78de6e7b0b060ff994ffd859bddc3f7f382bb2019ef157b0ea8ca8712f5 # via # basicsr + # clipseg # facexlib # gfpgan # realesrgan @@ -1288,7 +1293,7 @@ pyparsing==3.0.9 \ pyreadline3==3.4.1 \ --hash=sha256:6f3d1f7b8a31ba32b73917cefc1f28cc660562f39aea8646d30bd6eff21f7bae \ --hash=sha256:b0efb6516fd4fb07b45949053826a62fa4cb353db5be2bbb4a7aa1fdd1e345fb - # via -r requirements.in + # via -r installer/requirements.in pyrsistent==0.19.2 \ --hash=sha256:055ab45d5911d7cae397dc418808d8802fb95262751872c841c170b0dbf51eed \ --hash=sha256:111156137b2e71f3a9936baf27cb322e8024dac3dc54ec7fb9f0bcf3249e68bb \ @@ -1425,7 +1430,7 @@ qudida==0.0.4 \ realesrgan==0.3.0 \ --hash=sha256:0d36da96ab9f447071606e91f502ccdfb08f80cc82ee4f8caf720c7745ccec7e \ --hash=sha256:59336c16c30dd5130eff350dd27424acb9b7281d18a6810130e265606c9a6088 - # via -r requirements.in + # via -r installer/requirements.in regex==2022.10.31 \ --hash=sha256:052b670fafbe30966bbe5d025e90b2a491f85dfe5b2583a163b5e60a85a321ad \ --hash=sha256:0653d012b3bf45f194e5e6a41df9258811ac8fc395579fa82958a8b76286bea4 \ @@ -1631,6 +1636,7 @@ scipy==1.9.3 \ # albumentations # basicsr # clean-fid + # clipseg # facexlib # filterpy # gfpgan @@ -1646,7 +1652,7 @@ semver==2.13.0 \ send2trash==1.8.0 \ --hash=sha256:d2c24762fd3759860a0aff155e45871447ea58d2be6bdd39b5c8f966a0c99c2d \ --hash=sha256:f20eaadfdb517eaca5ce077640cb261c7d2698385a6a0f072a4a5447fd49fa08 - # via -r requirements.in + # via -r installer/requirements.in sentry-sdk==1.10.1 \ --hash=sha256:06c0fa9ccfdc80d7e3b5d2021978d6eb9351fa49db9b5847cf4d1f2a473414ad \ --hash=sha256:105faf7bd7b7fa25653404619ee261527266b14103fe1389e0ce077bd23a9691 @@ -1737,11 +1743,11 @@ smmap==5.0.0 \ streamlit==1.14.0 \ --hash=sha256:62556d873567e1b3427bcd118a57ee6946619f363bd6bba38df2d1f8225ecba0 \ --hash=sha256:e078b8143d150ba721bdb9194218e311c5fe1d6d4156473a2dea6cc848a6c9fc - # via -r requirements.in + # via -r installer/requirements.in taming-transformers-rom1504==0.0.6 \ --hash=sha256:051b5804c58caa247bcd51d17ddb525b4d5f892a29d42dc460f40e3e9e34e5d8 \ --hash=sha256:73fe5fc1108accee4236ee6976e0987ab236afad0af06cb9f037641a908d2c32 - # via -r requirements.in + # via -r installer/requirements.in tb-nightly==2.11.0a20221106 \ --hash=sha256:8940457ee42db92f01da8bcdbbea1a476735eda559dde5976f5728919960af4a # via @@ -1766,7 +1772,7 @@ tensorboard-plugin-wit==1.8.1 \ # tensorboard test-tube==0.7.5 \ --hash=sha256:1379c33eb8cde3e9b36610f87da0f16c2e06496b1cfebac473df4e7be2faa124 - # via -r requirements.in + # via -r installer/requirements.in threadpoolctl==3.1.0 \ --hash=sha256:8b99adda265feb6773280df41eece7b2e6561b772d21ffd52e372f999024907b \ --hash=sha256:a335baacfaa4400ae1f0d8e3a58d6674d2f8828e3716bb2802c44955ad391380 @@ -1816,7 +1822,7 @@ toolz==0.12.0 \ --hash=sha256:2059bd4148deb1884bb0eb770a3cde70e7f954cfbbdc2285f1f2de01fd21eb6f \ --hash=sha256:88c570861c440ee3f2f6037c4654613228ff40c93a6c25e0eba70d17282c6194 # via altair -torch==1.13.0 \ +torch==1.13.0 ; platform_system == "Darwin" \ --hash=sha256:0fdd38c96230947b1ed870fed4a560252f8d23c3a2bf4dab9d2d42b18f2e67c8 \ --hash=sha256:220325d0f4e69ee9edf00c04208244ef7cf22ebce083815ce272c7491f0603f5 \ --hash=sha256:43db0723fc66ad6486f86dc4890c497937f7cd27429f28f73fb7e4d74b7482e2 \ @@ -1839,6 +1845,7 @@ torch==1.13.0 \ --hash=sha256:f68edfea71ade3862039ba66bcedf954190a2db03b0c41a9b79afd72210abd97 \ --hash=sha256:fa768432ce4b8ffa29184c79a3376ab3de4a57b302cdf3c026a6be4c5a8ab75b # via + # -r installer/requirements.in # accelerate # basicsr # clean-fid @@ -1858,7 +1865,7 @@ torch==1.13.0 \ torch-fidelity==0.3.0 \ --hash=sha256:3d3e33db98919759cc4f3f24cb27e1e74bdc7c905d90a780630e4e1c18492b66 \ --hash=sha256:d01284825595feb7dc3eae3dc9a0d8ced02be764813a3483f109bc142b52a1d3 - # via -r requirements.in + # via -r installer/requirements.in torchdiffeq==0.2.3 \ --hash=sha256:b5b01ec1294a2d8d5f77e567bf17c5de1237c0573cb94deefa88326f0e18c338 \ --hash=sha256:fe75f434b9090ac0c27702e02bed21472b0f87035be6581f51edc5d4013ea31a @@ -1888,7 +1895,7 @@ torchvision==0.13.1 ; platform_system == "Darwin" \ --hash=sha256:ef5fe3ec1848123cd0ec74c07658192b3147dcd38e507308c790d5943e87b88c \ --hash=sha256:f230a1a40ed70d51e463ce43df243ec520902f8725de2502e485efc5eea9d864 # via - # -r requirements.in + # -r installer/requirements.in # basicsr # clean-fid # clip @@ -1930,7 +1937,7 @@ tqdm==4.64.1 \ transformers==4.24.0 \ --hash=sha256:486f353a8e594002e48be0e2aba723d96eda839e63bfe274702a4b5eda85559b \ --hash=sha256:b7ab50039ef9bf817eff14ab974f306fd20a72350bdc9df3a858fd009419322e - # via -r requirements.in + # via -r installer/requirements.in typing-extensions==4.4.0 \ --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \ --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e @@ -1944,9 +1951,7 @@ typing-extensions==4.4.0 \ tzdata==2022.6 \ --hash=sha256:04a680bdc5b15750c39c12a448885a51134a27ec9af83667663f0b3a1bf3f342 \ --hash=sha256:91f11db4503385928c15598c98573e3af07e7229181bee5375bd30f1695ddcae - # via - # pytz-deprecation-shim - # tzlocal + # via pytz-deprecation-shim tzlocal==4.2 \ --hash=sha256:89885494684c929d9191c57aa27502afc87a579be5cdd3225c77c463ea043745 \ --hash=sha256:ee5842fa3a795f023514ac2d801c4a81d1743bbe642e3940143326b3a00addd7 diff --git a/installer/py3.10-darwin-x86_64-cpu-reqs.txt b/installer/py3.10-darwin-x86_64-cpu-reqs.txt index 2b3d061213..7e54555502 100644 --- a/installer/py3.10-darwin-x86_64-cpu-reqs.txt +++ b/installer/py3.10-darwin-x86_64-cpu-reqs.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with python 3.10 # To update, run: # -# pip-compile --allow-unsafe --generate-hashes --output-file=installer/py3.10-darwin-x86_64-cpu-reqs.txt requirements.in +# pip-compile --allow-unsafe --generate-hashes --output-file=installer/py3.10-darwin-x86_64-cpu-reqs.txt installer/requirements.in # --extra-index-url https://download.pytorch.org/whl/cu116 --trusted-host https @@ -13,10 +13,12 @@ absl-py==1.3.0 \ # via # tb-nightly # tensorboard -accelerate==0.13.2 \ - --hash=sha256:dd6f08b010077f252dda5a7699d87b02885335c456770939c536e65ff07ed760 \ - --hash=sha256:e22180d7094e4c1bfb05a2b078297c222f6b4fa595fde8916946c3f377cdf019 - # via k-diffusion +accelerate==0.14.0 \ + --hash=sha256:31c5bcc40564ef849b5bc1c4424a43ccaf9e26413b7df89c2e36bf81f070fd44 \ + --hash=sha256:b15d562c0889d0cf441b01faa025dfc29b163d061b6cc7d489c2c83b0a55ffab + # via + # -r installer/requirements.in + # k-diffusion addict==2.4.0 \ --hash=sha256:249bb56bbfd3cdc2a004ea0ff4c2b6ddc84d53bc2194761636eb314d5cfa5dfc \ --hash=sha256:b3b2210e0e067a281f5646c8c5db92e99b7231ea8b0eb5f74dbdf9e259d4e494 @@ -117,7 +119,7 @@ aiosignal==1.2.0 \ albumentations==1.3.0 \ --hash=sha256:294165d87d03bc8323e484927f0a5c1a3c64b0e7b9c32a979582a6c93c363bdf \ --hash=sha256:be1af36832c8893314f2a5550e8ac19801e04770734c1b70fa3c996b41f37bed - # via -r requirements.in + # via -r installer/requirements.in altair==4.2.0 \ --hash=sha256:0c724848ae53410c13fa28be2b3b9a9dcb7b5caa1a70f7f217bd663bb419935a \ --hash=sha256:d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026 @@ -180,7 +182,7 @@ click==8.1.3 \ # wandb clip @ https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip \ --hash=sha256:b5842c25da441d6c581b53a5c60e0c2127ebafe0f746f8e15561a006c6c3be6a - # via -r requirements.in + # via -r installer/requirements.in colorama==0.4.6 \ --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \ --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6 @@ -273,7 +275,7 @@ decorator==5.1.1 \ diffusers==0.7.2 \ --hash=sha256:4a5f8b3a5fbd936bba7d459611cb35ec62875030367be32b232f9e19543e25a9 \ --hash=sha256:fb814ffd150cc6f470380b8c6a521181a77beb2f44134d2aad2e4cd8aa2ced0e - # via -r requirements.in + # via -r installer/requirements.in dnspython==2.2.1 \ --hash=sha256:0f7569a4a6ff151958b64304071d370daa3243d15941a7beedf0c9fe5105603e \ --hash=sha256:a851e51367fb93e9e1361732c1d60dab63eff98712e503ea7d92e6eccb109b4f @@ -293,7 +295,7 @@ entrypoints==0.4 \ eventlet==0.33.1 \ --hash=sha256:a085922698e5029f820cf311a648ac324d73cec0e4792877609d978a4b5bbf31 \ --hash=sha256:afbe17f06a58491e9aebd7a4a03e70b0b63fd4cf76d8307bae07f280479b1515 - # via -r requirements.in + # via -r installer/requirements.in facexlib==0.2.5 \ --hash=sha256:31e20cc4ed5d63562d380e4564bae14ac0d5d1899a079bad87621e13564567e4 \ --hash=sha256:cc7ceb56c5424319c47223cf75eef6828c34c66082707c6eb35b95d39779f02d @@ -319,15 +321,15 @@ flask==2.2.2 \ flask-cors==3.0.10 \ --hash=sha256:74efc975af1194fc7891ff5cd85b0f7478be4f7f59fe158102e91abb72bb4438 \ --hash=sha256:b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de - # via -r requirements.in + # via -r installer/requirements.in flask-socketio==5.3.1 \ --hash=sha256:fd0ed0fc1341671d92d5f5b2f5503916deb7aa7e2940e6636cfa2c087c828bf9 \ --hash=sha256:ff0c721f20bff1e2cfba77948727a8db48f187e89a72fe50c34478ce6efb3353 - # via -r requirements.in + # via -r installer/requirements.in flaskwebgui==0.3.7 \ --hash=sha256:4a69955308eaa8bb256ba04a994dc8f58a48dcd6f9599694ab1bcd9f43d88a5d \ --hash=sha256:535974ce2672dcc74787c254de24cceed4101be75d96952dae82014dd57f061e - # via -r requirements.in + # via -r installer/requirements.in fonttools==4.38.0 \ --hash=sha256:2bb244009f9bf3fa100fc3ead6aeb99febe5985fa20afbfbaa2f8946c2fbdaf1 \ --hash=sha256:820466f43c8be8c3009aef8b87e785014133508f0de64ec469e4efb643ae54fb @@ -411,11 +413,11 @@ future==0.18.2 \ getpass-asterisk==1.0.1 \ --hash=sha256:20d45cafda0066d761961e0919728526baf7bb5151fbf48a7d5ea4034127d857 \ --hash=sha256:7cc357a924cf62fa4e15b73cb4e5e30685c9084e464ffdc3fd9000a2b54ea9e9 - # via -r requirements.in + # via -r installer/requirements.in gfpgan @ https://github.com/TencentARC/GFPGAN/archive/2eac2033893ca7f427f4035d80fe95b92649ac56.zip \ --hash=sha256:79e6d71c8f1df7c7ccb0ac6b9a2ccb615ad5cde818c8b6f285a8711c05aebf85 # via - # -r requirements.in + # -r installer/requirements.in # realesrgan gitdb==4.0.9 \ --hash=sha256:8033ad4e853066ba6ca92050b9df2f89301b8fc8bf7e9324d412a63f8bf1a8fd \ @@ -576,7 +578,7 @@ imageio-ffmpeg==0.4.7 \ --hash=sha256:7a08838f97f363e37ca41821b864fd3fdc99ab1fe2421040c78eb5f56a9e723e \ --hash=sha256:8e724d12dfe83e2a6eb39619e820243ca96c81c47c2648e66e05f7ee24e14312 \ --hash=sha256:fc60686ef03c2d0f842901b206223c30051a6a120384458761390104470846fd - # via -r requirements.in + # via -r installer/requirements.in importlib-metadata==5.0.0 \ --hash=sha256:da31db32b304314d044d3c12c79bd59e307889b287ad12ff387b3500835fc2ab \ --hash=sha256:ddb0e35065e8938f867ed4928d0ae5bf2a53b7773871bfe6bcc7e4fcdc7dea43 @@ -609,7 +611,7 @@ jsonschema==4.17.0 \ # jsonmerge k-diffusion @ https://github.com/invoke-ai/k-diffusion/archive/7f16b2c33411f26b3eae78d10648d625cb0c1095.zip \ --hash=sha256:c3f2c84036aa98c3abf4552fafab04df5ca472aa639982795e05bb1db43ce5e4 - # via -r requirements.in + # via -r installer/requirements.in kiwisolver==1.4.4 \ --hash=sha256:02f79693ec433cb4b5f51694e8477ae83b3205768a6fb48ffba60549080e295b \ --hash=sha256:03baab2d6b4a54ddbb43bba1a3a2d1627e82d205c5cf8f4c924dc49284b87166 \ @@ -1288,7 +1290,7 @@ pyparsing==3.0.9 \ pyreadline3==3.4.1 \ --hash=sha256:6f3d1f7b8a31ba32b73917cefc1f28cc660562f39aea8646d30bd6eff21f7bae \ --hash=sha256:b0efb6516fd4fb07b45949053826a62fa4cb353db5be2bbb4a7aa1fdd1e345fb - # via -r requirements.in + # via -r installer/requirements.in pyrsistent==0.19.2 \ --hash=sha256:055ab45d5911d7cae397dc418808d8802fb95262751872c841c170b0dbf51eed \ --hash=sha256:111156137b2e71f3a9936baf27cb322e8024dac3dc54ec7fb9f0bcf3249e68bb \ @@ -1425,7 +1427,7 @@ qudida==0.0.4 \ realesrgan==0.3.0 \ --hash=sha256:0d36da96ab9f447071606e91f502ccdfb08f80cc82ee4f8caf720c7745ccec7e \ --hash=sha256:59336c16c30dd5130eff350dd27424acb9b7281d18a6810130e265606c9a6088 - # via -r requirements.in + # via -r installer/requirements.in regex==2022.10.31 \ --hash=sha256:052b670fafbe30966bbe5d025e90b2a491f85dfe5b2583a163b5e60a85a321ad \ --hash=sha256:0653d012b3bf45f194e5e6a41df9258811ac8fc395579fa82958a8b76286bea4 \ @@ -1646,7 +1648,7 @@ semver==2.13.0 \ send2trash==1.8.0 \ --hash=sha256:d2c24762fd3759860a0aff155e45871447ea58d2be6bdd39b5c8f966a0c99c2d \ --hash=sha256:f20eaadfdb517eaca5ce077640cb261c7d2698385a6a0f072a4a5447fd49fa08 - # via -r requirements.in + # via -r installer/requirements.in sentry-sdk==1.10.1 \ --hash=sha256:06c0fa9ccfdc80d7e3b5d2021978d6eb9351fa49db9b5847cf4d1f2a473414ad \ --hash=sha256:105faf7bd7b7fa25653404619ee261527266b14103fe1389e0ce077bd23a9691 @@ -1737,11 +1739,11 @@ smmap==5.0.0 \ streamlit==1.14.0 \ --hash=sha256:62556d873567e1b3427bcd118a57ee6946619f363bd6bba38df2d1f8225ecba0 \ --hash=sha256:e078b8143d150ba721bdb9194218e311c5fe1d6d4156473a2dea6cc848a6c9fc - # via -r requirements.in + # via -r installer/requirements.in taming-transformers-rom1504==0.0.6 \ --hash=sha256:051b5804c58caa247bcd51d17ddb525b4d5f892a29d42dc460f40e3e9e34e5d8 \ --hash=sha256:73fe5fc1108accee4236ee6976e0987ab236afad0af06cb9f037641a908d2c32 - # via -r requirements.in + # via -r installer/requirements.in tb-nightly==2.11.0a20221106 \ --hash=sha256:8940457ee42db92f01da8bcdbbea1a476735eda559dde5976f5728919960af4a # via @@ -1766,7 +1768,7 @@ tensorboard-plugin-wit==1.8.1 \ # tensorboard test-tube==0.7.5 \ --hash=sha256:1379c33eb8cde3e9b36610f87da0f16c2e06496b1cfebac473df4e7be2faa124 - # via -r requirements.in + # via -r installer/requirements.in threadpoolctl==3.1.0 \ --hash=sha256:8b99adda265feb6773280df41eece7b2e6561b772d21ffd52e372f999024907b \ --hash=sha256:a335baacfaa4400ae1f0d8e3a58d6674d2f8828e3716bb2802c44955ad391380 @@ -1816,7 +1818,7 @@ toolz==0.12.0 \ --hash=sha256:2059bd4148deb1884bb0eb770a3cde70e7f954cfbbdc2285f1f2de01fd21eb6f \ --hash=sha256:88c570861c440ee3f2f6037c4654613228ff40c93a6c25e0eba70d17282c6194 # via altair -torch==1.13.0 \ +torch==1.13.0 ; platform_system == "Darwin" \ --hash=sha256:0fdd38c96230947b1ed870fed4a560252f8d23c3a2bf4dab9d2d42b18f2e67c8 \ --hash=sha256:220325d0f4e69ee9edf00c04208244ef7cf22ebce083815ce272c7491f0603f5 \ --hash=sha256:43db0723fc66ad6486f86dc4890c497937f7cd27429f28f73fb7e4d74b7482e2 \ @@ -1839,6 +1841,7 @@ torch==1.13.0 \ --hash=sha256:f68edfea71ade3862039ba66bcedf954190a2db03b0c41a9b79afd72210abd97 \ --hash=sha256:fa768432ce4b8ffa29184c79a3376ab3de4a57b302cdf3c026a6be4c5a8ab75b # via + # -r installer/requirements.in # accelerate # basicsr # clean-fid @@ -1858,7 +1861,7 @@ torch==1.13.0 \ torch-fidelity==0.3.0 \ --hash=sha256:3d3e33db98919759cc4f3f24cb27e1e74bdc7c905d90a780630e4e1c18492b66 \ --hash=sha256:d01284825595feb7dc3eae3dc9a0d8ced02be764813a3483f109bc142b52a1d3 - # via -r requirements.in + # via -r installer/requirements.in torchdiffeq==0.2.3 \ --hash=sha256:b5b01ec1294a2d8d5f77e567bf17c5de1237c0573cb94deefa88326f0e18c338 \ --hash=sha256:fe75f434b9090ac0c27702e02bed21472b0f87035be6581f51edc5d4013ea31a @@ -1888,7 +1891,7 @@ torchvision==0.13.1 ; platform_system == "Darwin" \ --hash=sha256:ef5fe3ec1848123cd0ec74c07658192b3147dcd38e507308c790d5943e87b88c \ --hash=sha256:f230a1a40ed70d51e463ce43df243ec520902f8725de2502e485efc5eea9d864 # via - # -r requirements.in + # -r installer/requirements.in # basicsr # clean-fid # clip @@ -1930,7 +1933,7 @@ tqdm==4.64.1 \ transformers==4.24.0 \ --hash=sha256:486f353a8e594002e48be0e2aba723d96eda839e63bfe274702a4b5eda85559b \ --hash=sha256:b7ab50039ef9bf817eff14ab974f306fd20a72350bdc9df3a858fd009419322e - # via -r requirements.in + # via -r installer/requirements.in typing-extensions==4.4.0 \ --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \ --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e diff --git a/installer/py3.10-linux-x86_64-cuda-reqs.txt b/installer/py3.10-linux-x86_64-cuda-reqs.txt index acb31ffa3f..cbb1d9eb4c 100644 --- a/installer/py3.10-linux-x86_64-cuda-reqs.txt +++ b/installer/py3.10-linux-x86_64-cuda-reqs.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with python 3.10 # To update, run: # -# pip-compile --allow-unsafe --generate-hashes --output-file=installer/py3.10-linux-x86_64-cuda-reqs.txt requirements.in +# pip-compile --allow-unsafe --generate-hashes --output-file=installer/py3.10-linux-x86_64-cuda-reqs.txt installer/requirements.in # --extra-index-url https://download.pytorch.org/whl/cu116 --trusted-host https @@ -13,10 +13,12 @@ absl-py==1.3.0 \ # via # tb-nightly # tensorboard -accelerate==0.13.2 \ - --hash=sha256:dd6f08b010077f252dda5a7699d87b02885335c456770939c536e65ff07ed760 \ - --hash=sha256:e22180d7094e4c1bfb05a2b078297c222f6b4fa595fde8916946c3f377cdf019 - # via k-diffusion +accelerate==0.14.0 \ + --hash=sha256:31c5bcc40564ef849b5bc1c4424a43ccaf9e26413b7df89c2e36bf81f070fd44 \ + --hash=sha256:b15d562c0889d0cf441b01faa025dfc29b163d061b6cc7d489c2c83b0a55ffab + # via + # -r installer/requirements.in + # k-diffusion addict==2.4.0 \ --hash=sha256:249bb56bbfd3cdc2a004ea0ff4c2b6ddc84d53bc2194761636eb314d5cfa5dfc \ --hash=sha256:b3b2210e0e067a281f5646c8c5db92e99b7231ea8b0eb5f74dbdf9e259d4e494 @@ -117,7 +119,7 @@ aiosignal==1.2.0 \ albumentations==1.3.0 \ --hash=sha256:294165d87d03bc8323e484927f0a5c1a3c64b0e7b9c32a979582a6c93c363bdf \ --hash=sha256:be1af36832c8893314f2a5550e8ac19801e04770734c1b70fa3c996b41f37bed - # via -r requirements.in + # via -r installer/requirements.in altair==4.2.0 \ --hash=sha256:0c724848ae53410c13fa28be2b3b9a9dcb7b5caa1a70f7f217bd663bb419935a \ --hash=sha256:d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026 @@ -180,7 +182,12 @@ click==8.1.3 \ # wandb clip @ https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip \ --hash=sha256:b5842c25da441d6c581b53a5c60e0c2127ebafe0f746f8e15561a006c6c3be6a - # via -r requirements.in + # via + # -r installer/requirements.in + # clipseg +clipseg @ https://github.com/invoke-ai/clipseg/archive/1f754751c85d7d4255fa681f4491ff5711c1c288.zip \ + --hash=sha256:14f43ed42f90be3fe57f06de483cb8be0f67f87a6f62a011339d45a39f4b4189 + # via -r installer/requirements.in commonmark==0.9.1 \ --hash=sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60 \ --hash=sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9 @@ -267,7 +274,7 @@ decorator==5.1.1 \ diffusers==0.7.2 \ --hash=sha256:4a5f8b3a5fbd936bba7d459611cb35ec62875030367be32b232f9e19543e25a9 \ --hash=sha256:fb814ffd150cc6f470380b8c6a521181a77beb2f44134d2aad2e4cd8aa2ced0e - # via -r requirements.in + # via -r installer/requirements.in dnspython==2.2.1 \ --hash=sha256:0f7569a4a6ff151958b64304071d370daa3243d15941a7beedf0c9fe5105603e \ --hash=sha256:a851e51367fb93e9e1361732c1d60dab63eff98712e503ea7d92e6eccb109b4f @@ -287,7 +294,7 @@ entrypoints==0.4 \ eventlet==0.33.1 \ --hash=sha256:a085922698e5029f820cf311a648ac324d73cec0e4792877609d978a4b5bbf31 \ --hash=sha256:afbe17f06a58491e9aebd7a4a03e70b0b63fd4cf76d8307bae07f280479b1515 - # via -r requirements.in + # via -r installer/requirements.in facexlib==0.2.5 \ --hash=sha256:31e20cc4ed5d63562d380e4564bae14ac0d5d1899a079bad87621e13564567e4 \ --hash=sha256:cc7ceb56c5424319c47223cf75eef6828c34c66082707c6eb35b95d39779f02d @@ -313,15 +320,15 @@ flask==2.2.2 \ flask-cors==3.0.10 \ --hash=sha256:74efc975af1194fc7891ff5cd85b0f7478be4f7f59fe158102e91abb72bb4438 \ --hash=sha256:b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de - # via -r requirements.in + # via -r installer/requirements.in flask-socketio==5.3.1 \ --hash=sha256:fd0ed0fc1341671d92d5f5b2f5503916deb7aa7e2940e6636cfa2c087c828bf9 \ --hash=sha256:ff0c721f20bff1e2cfba77948727a8db48f187e89a72fe50c34478ce6efb3353 - # via -r requirements.in + # via -r installer/requirements.in flaskwebgui==0.3.7 \ --hash=sha256:4a69955308eaa8bb256ba04a994dc8f58a48dcd6f9599694ab1bcd9f43d88a5d \ --hash=sha256:535974ce2672dcc74787c254de24cceed4101be75d96952dae82014dd57f061e - # via -r requirements.in + # via -r installer/requirements.in fonttools==4.38.0 \ --hash=sha256:2bb244009f9bf3fa100fc3ead6aeb99febe5985fa20afbfbaa2f8946c2fbdaf1 \ --hash=sha256:820466f43c8be8c3009aef8b87e785014133508f0de64ec469e4efb643ae54fb @@ -405,11 +412,11 @@ future==0.18.2 \ getpass-asterisk==1.0.1 \ --hash=sha256:20d45cafda0066d761961e0919728526baf7bb5151fbf48a7d5ea4034127d857 \ --hash=sha256:7cc357a924cf62fa4e15b73cb4e5e30685c9084e464ffdc3fd9000a2b54ea9e9 - # via -r requirements.in + # via -r installer/requirements.in gfpgan @ https://github.com/TencentARC/GFPGAN/archive/2eac2033893ca7f427f4035d80fe95b92649ac56.zip \ --hash=sha256:79e6d71c8f1df7c7ccb0ac6b9a2ccb615ad5cde818c8b6f285a8711c05aebf85 # via - # -r requirements.in + # -r installer/requirements.in # realesrgan gitdb==4.0.9 \ --hash=sha256:8033ad4e853066ba6ca92050b9df2f89301b8fc8bf7e9324d412a63f8bf1a8fd \ @@ -570,7 +577,7 @@ imageio-ffmpeg==0.4.7 \ --hash=sha256:7a08838f97f363e37ca41821b864fd3fdc99ab1fe2421040c78eb5f56a9e723e \ --hash=sha256:8e724d12dfe83e2a6eb39619e820243ca96c81c47c2648e66e05f7ee24e14312 \ --hash=sha256:fc60686ef03c2d0f842901b206223c30051a6a120384458761390104470846fd - # via -r requirements.in + # via -r installer/requirements.in importlib-metadata==5.0.0 \ --hash=sha256:da31db32b304314d044d3c12c79bd59e307889b287ad12ff387b3500835fc2ab \ --hash=sha256:ddb0e35065e8938f867ed4928d0ae5bf2a53b7773871bfe6bcc7e4fcdc7dea43 @@ -603,7 +610,7 @@ jsonschema==4.17.0 \ # jsonmerge k-diffusion @ https://github.com/invoke-ai/k-diffusion/archive/7f16b2c33411f26b3eae78d10648d625cb0c1095.zip \ --hash=sha256:c3f2c84036aa98c3abf4552fafab04df5ca472aa639982795e05bb1db43ce5e4 - # via -r requirements.in + # via -r installer/requirements.in kiwisolver==1.4.4 \ --hash=sha256:02f79693ec433cb4b5f51694e8477ae83b3205768a6fb48ffba60549080e295b \ --hash=sha256:03baab2d6b4a54ddbb43bba1a3a2d1627e82d205c5cf8f4c924dc49284b87166 \ @@ -831,7 +838,9 @@ matplotlib==3.6.2 \ --hash=sha256:ec9be0f4826cdb3a3a517509dcc5f87f370251b76362051ab59e42b6b765f8c4 \ --hash=sha256:f04f97797df35e442ed09f529ad1235d1f1c0f30878e2fe09a2676b71a8801e0 \ --hash=sha256:f41e57ad63d336fe50d3a67bb8eaa26c09f6dda6a59f76777a99b8ccd8e26aec - # via filterpy + # via + # clipseg + # filterpy multidict==6.0.2 \ --hash=sha256:0327292e745a880459ef71be14e709aaea2f783f3537588fb4ed09b6c01bca60 \ --hash=sha256:041b81a5f6b38244b34dc18c7b6aba91f9cdaf854d9a39e5ff0b58e2b5773b9c \ @@ -964,6 +973,7 @@ numpy==1.23.4 \ # altair # basicsr # clean-fid + # clipseg # contourpy # diffusers # facexlib @@ -1012,6 +1022,7 @@ opencv-python==4.6.0.66 \ --hash=sha256:f482e78de6e7b0b060ff994ffd859bddc3f7f382bb2019ef157b0ea8ca8712f5 # via # basicsr + # clipseg # facexlib # gfpgan # realesrgan @@ -1282,7 +1293,7 @@ pyparsing==3.0.9 \ pyreadline3==3.4.1 \ --hash=sha256:6f3d1f7b8a31ba32b73917cefc1f28cc660562f39aea8646d30bd6eff21f7bae \ --hash=sha256:b0efb6516fd4fb07b45949053826a62fa4cb353db5be2bbb4a7aa1fdd1e345fb - # via -r requirements.in + # via -r installer/requirements.in pyrsistent==0.19.2 \ --hash=sha256:055ab45d5911d7cae397dc418808d8802fb95262751872c841c170b0dbf51eed \ --hash=sha256:111156137b2e71f3a9936baf27cb322e8024dac3dc54ec7fb9f0bcf3249e68bb \ @@ -1419,7 +1430,7 @@ qudida==0.0.4 \ realesrgan==0.3.0 \ --hash=sha256:0d36da96ab9f447071606e91f502ccdfb08f80cc82ee4f8caf720c7745ccec7e \ --hash=sha256:59336c16c30dd5130eff350dd27424acb9b7281d18a6810130e265606c9a6088 - # via -r requirements.in + # via -r installer/requirements.in regex==2022.10.31 \ --hash=sha256:052b670fafbe30966bbe5d025e90b2a491f85dfe5b2583a163b5e60a85a321ad \ --hash=sha256:0653d012b3bf45f194e5e6a41df9258811ac8fc395579fa82958a8b76286bea4 \ @@ -1625,6 +1636,7 @@ scipy==1.9.3 \ # albumentations # basicsr # clean-fid + # clipseg # facexlib # filterpy # gfpgan @@ -1640,7 +1652,7 @@ semver==2.13.0 \ send2trash==1.8.0 \ --hash=sha256:d2c24762fd3759860a0aff155e45871447ea58d2be6bdd39b5c8f966a0c99c2d \ --hash=sha256:f20eaadfdb517eaca5ce077640cb261c7d2698385a6a0f072a4a5447fd49fa08 - # via -r requirements.in + # via -r installer/requirements.in sentry-sdk==1.10.1 \ --hash=sha256:06c0fa9ccfdc80d7e3b5d2021978d6eb9351fa49db9b5847cf4d1f2a473414ad \ --hash=sha256:105faf7bd7b7fa25653404619ee261527266b14103fe1389e0ce077bd23a9691 @@ -1731,11 +1743,11 @@ smmap==5.0.0 \ streamlit==1.14.0 \ --hash=sha256:62556d873567e1b3427bcd118a57ee6946619f363bd6bba38df2d1f8225ecba0 \ --hash=sha256:e078b8143d150ba721bdb9194218e311c5fe1d6d4156473a2dea6cc848a6c9fc - # via -r requirements.in + # via -r installer/requirements.in taming-transformers-rom1504==0.0.6 \ --hash=sha256:051b5804c58caa247bcd51d17ddb525b4d5f892a29d42dc460f40e3e9e34e5d8 \ --hash=sha256:73fe5fc1108accee4236ee6976e0987ab236afad0af06cb9f037641a908d2c32 - # via -r requirements.in + # via -r installer/requirements.in tb-nightly==2.11.0a20221106 \ --hash=sha256:8940457ee42db92f01da8bcdbbea1a476735eda559dde5976f5728919960af4a # via @@ -1760,7 +1772,7 @@ tensorboard-plugin-wit==1.8.1 \ # tensorboard test-tube==0.7.5 \ --hash=sha256:1379c33eb8cde3e9b36610f87da0f16c2e06496b1cfebac473df4e7be2faa124 - # via -r requirements.in + # via -r installer/requirements.in threadpoolctl==3.1.0 \ --hash=sha256:8b99adda265feb6773280df41eece7b2e6561b772d21ffd52e372f999024907b \ --hash=sha256:a335baacfaa4400ae1f0d8e3a58d6674d2f8828e3716bb2802c44955ad391380 @@ -1810,7 +1822,7 @@ toolz==0.12.0 \ --hash=sha256:2059bd4148deb1884bb0eb770a3cde70e7f954cfbbdc2285f1f2de01fd21eb6f \ --hash=sha256:88c570861c440ee3f2f6037c4654613228ff40c93a6c25e0eba70d17282c6194 # via altair -torch==1.12.1+cu116 \ +torch==1.12.1+cu116 ; platform_system == "Linux" or platform_system == "Windows" \ --hash=sha256:7725420dabebfcaf44984edce3283eea91f98f0f7d5874bc68c7a164bd8126e3 \ --hash=sha256:832effad8b21109700323a5aa137a2e4bdea711dac3d8491ff542f798dab0101 \ --hash=sha256:84f031e4ee25d95368d7531aa58e79da9808d3fa53b4b363ea03a2450b6fd0af \ @@ -1820,6 +1832,7 @@ torch==1.12.1+cu116 \ --hash=sha256:dda312901220895087cc83d3665464a3dc171d04460c61c31af463efbfb54896 \ --hash=sha256:fc9b4786ec54be67eaa8b0c7c9999e2f4ae2b89a1c18e41de1515a190440c691 # via + # -r installer/requirements.in # accelerate # basicsr # clean-fid @@ -1839,7 +1852,7 @@ torch==1.12.1+cu116 \ torch-fidelity==0.3.0 \ --hash=sha256:3d3e33db98919759cc4f3f24cb27e1e74bdc7c905d90a780630e4e1c18492b66 \ --hash=sha256:d01284825595feb7dc3eae3dc9a0d8ced02be764813a3483f109bc142b52a1d3 - # via -r requirements.in + # via -r installer/requirements.in torchdiffeq==0.2.3 \ --hash=sha256:b5b01ec1294a2d8d5f77e567bf17c5de1237c0573cb94deefa88326f0e18c338 \ --hash=sha256:fe75f434b9090ac0c27702e02bed21472b0f87035be6581f51edc5d4013ea31a @@ -1858,7 +1871,7 @@ torchvision==0.13.1+cu116 ; platform_system == "Linux" or platform_system == "Wi --hash=sha256:c3ceb2b3f456f0c984af71ef55f8637f178a29dc3e13a66fbb010ceead2891e1 \ --hash=sha256:dcf32f6d998493e76ec21a38bbb856b7402295cf7a67fb09ce5bde7e7e725756 # via - # -r requirements.in + # -r installer/requirements.in # basicsr # clean-fid # clip @@ -1900,7 +1913,7 @@ tqdm==4.64.1 \ transformers==4.24.0 \ --hash=sha256:486f353a8e594002e48be0e2aba723d96eda839e63bfe274702a4b5eda85559b \ --hash=sha256:b7ab50039ef9bf817eff14ab974f306fd20a72350bdc9df3a858fd009419322e - # via -r requirements.in + # via -r installer/requirements.in typing-extensions==4.4.0 \ --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \ --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e diff --git a/installer/py3.10-windows-x86_64-cuda-reqs.txt b/installer/py3.10-windows-x86_64-cuda-reqs.txt index 9945bcc3dd..951f45334e 100644 --- a/installer/py3.10-windows-x86_64-cuda-reqs.txt +++ b/installer/py3.10-windows-x86_64-cuda-reqs.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with python 3.10 # To update, run: # -# pip-compile --allow-unsafe --generate-hashes --output-file=installer/py3.10-windows-x86_64-cuda-reqs.txt requirements.in +# pip-compile --allow-unsafe --generate-hashes --output-file=installer/py3.10-windows-x86_64-cuda-reqs.txt installer/requirements.in # --extra-index-url https://download.pytorch.org/whl/cu116 --trusted-host https @@ -13,10 +13,12 @@ absl-py==1.3.0 \ # via # tb-nightly # tensorboard -accelerate==0.13.2 \ - --hash=sha256:dd6f08b010077f252dda5a7699d87b02885335c456770939c536e65ff07ed760 \ - --hash=sha256:e22180d7094e4c1bfb05a2b078297c222f6b4fa595fde8916946c3f377cdf019 - # via k-diffusion +accelerate==0.14.0 \ + --hash=sha256:31c5bcc40564ef849b5bc1c4424a43ccaf9e26413b7df89c2e36bf81f070fd44 \ + --hash=sha256:b15d562c0889d0cf441b01faa025dfc29b163d061b6cc7d489c2c83b0a55ffab + # via + # -r installer/requirements.in + # k-diffusion addict==2.4.0 \ --hash=sha256:249bb56bbfd3cdc2a004ea0ff4c2b6ddc84d53bc2194761636eb314d5cfa5dfc \ --hash=sha256:b3b2210e0e067a281f5646c8c5db92e99b7231ea8b0eb5f74dbdf9e259d4e494 @@ -117,7 +119,7 @@ aiosignal==1.2.0 \ albumentations==1.3.0 \ --hash=sha256:294165d87d03bc8323e484927f0a5c1a3c64b0e7b9c32a979582a6c93c363bdf \ --hash=sha256:be1af36832c8893314f2a5550e8ac19801e04770734c1b70fa3c996b41f37bed - # via -r requirements.in + # via -r installer/requirements.in altair==4.2.0 \ --hash=sha256:0c724848ae53410c13fa28be2b3b9a9dcb7b5caa1a70f7f217bd663bb419935a \ --hash=sha256:d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026 @@ -180,7 +182,12 @@ click==8.1.3 \ # wandb clip @ https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip \ --hash=sha256:b5842c25da441d6c581b53a5c60e0c2127ebafe0f746f8e15561a006c6c3be6a - # via -r requirements.in + # via + # -r installer/requirements.in + # clipseg +clipseg @ https://github.com/invoke-ai/clipseg/archive/1f754751c85d7d4255fa681f4491ff5711c1c288.zip \ + --hash=sha256:14f43ed42f90be3fe57f06de483cb8be0f67f87a6f62a011339d45a39f4b4189 + # via -r installer/requirements.in colorama==0.4.6 \ --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \ --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6 @@ -273,7 +280,7 @@ decorator==5.1.1 \ diffusers==0.7.2 \ --hash=sha256:4a5f8b3a5fbd936bba7d459611cb35ec62875030367be32b232f9e19543e25a9 \ --hash=sha256:fb814ffd150cc6f470380b8c6a521181a77beb2f44134d2aad2e4cd8aa2ced0e - # via -r requirements.in + # via -r installer/requirements.in dnspython==2.2.1 \ --hash=sha256:0f7569a4a6ff151958b64304071d370daa3243d15941a7beedf0c9fe5105603e \ --hash=sha256:a851e51367fb93e9e1361732c1d60dab63eff98712e503ea7d92e6eccb109b4f @@ -293,7 +300,7 @@ entrypoints==0.4 \ eventlet==0.33.1 \ --hash=sha256:a085922698e5029f820cf311a648ac324d73cec0e4792877609d978a4b5bbf31 \ --hash=sha256:afbe17f06a58491e9aebd7a4a03e70b0b63fd4cf76d8307bae07f280479b1515 - # via -r requirements.in + # via -r installer/requirements.in facexlib==0.2.5 \ --hash=sha256:31e20cc4ed5d63562d380e4564bae14ac0d5d1899a079bad87621e13564567e4 \ --hash=sha256:cc7ceb56c5424319c47223cf75eef6828c34c66082707c6eb35b95d39779f02d @@ -319,15 +326,15 @@ flask==2.2.2 \ flask-cors==3.0.10 \ --hash=sha256:74efc975af1194fc7891ff5cd85b0f7478be4f7f59fe158102e91abb72bb4438 \ --hash=sha256:b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de - # via -r requirements.in + # via -r installer/requirements.in flask-socketio==5.3.1 \ --hash=sha256:fd0ed0fc1341671d92d5f5b2f5503916deb7aa7e2940e6636cfa2c087c828bf9 \ --hash=sha256:ff0c721f20bff1e2cfba77948727a8db48f187e89a72fe50c34478ce6efb3353 - # via -r requirements.in + # via -r installer/requirements.in flaskwebgui==0.3.7 \ --hash=sha256:4a69955308eaa8bb256ba04a994dc8f58a48dcd6f9599694ab1bcd9f43d88a5d \ --hash=sha256:535974ce2672dcc74787c254de24cceed4101be75d96952dae82014dd57f061e - # via -r requirements.in + # via -r installer/requirements.in fonttools==4.38.0 \ --hash=sha256:2bb244009f9bf3fa100fc3ead6aeb99febe5985fa20afbfbaa2f8946c2fbdaf1 \ --hash=sha256:820466f43c8be8c3009aef8b87e785014133508f0de64ec469e4efb643ae54fb @@ -411,11 +418,11 @@ future==0.18.2 \ getpass-asterisk==1.0.1 \ --hash=sha256:20d45cafda0066d761961e0919728526baf7bb5151fbf48a7d5ea4034127d857 \ --hash=sha256:7cc357a924cf62fa4e15b73cb4e5e30685c9084e464ffdc3fd9000a2b54ea9e9 - # via -r requirements.in + # via -r installer/requirements.in gfpgan @ https://github.com/TencentARC/GFPGAN/archive/2eac2033893ca7f427f4035d80fe95b92649ac56.zip \ --hash=sha256:79e6d71c8f1df7c7ccb0ac6b9a2ccb615ad5cde818c8b6f285a8711c05aebf85 # via - # -r requirements.in + # -r installer/requirements.in # realesrgan gitdb==4.0.9 \ --hash=sha256:8033ad4e853066ba6ca92050b9df2f89301b8fc8bf7e9324d412a63f8bf1a8fd \ @@ -576,7 +583,7 @@ imageio-ffmpeg==0.4.7 \ --hash=sha256:7a08838f97f363e37ca41821b864fd3fdc99ab1fe2421040c78eb5f56a9e723e \ --hash=sha256:8e724d12dfe83e2a6eb39619e820243ca96c81c47c2648e66e05f7ee24e14312 \ --hash=sha256:fc60686ef03c2d0f842901b206223c30051a6a120384458761390104470846fd - # via -r requirements.in + # via -r installer/requirements.in importlib-metadata==5.0.0 \ --hash=sha256:da31db32b304314d044d3c12c79bd59e307889b287ad12ff387b3500835fc2ab \ --hash=sha256:ddb0e35065e8938f867ed4928d0ae5bf2a53b7773871bfe6bcc7e4fcdc7dea43 @@ -609,7 +616,7 @@ jsonschema==4.17.0 \ # jsonmerge k-diffusion @ https://github.com/invoke-ai/k-diffusion/archive/7f16b2c33411f26b3eae78d10648d625cb0c1095.zip \ --hash=sha256:c3f2c84036aa98c3abf4552fafab04df5ca472aa639982795e05bb1db43ce5e4 - # via -r requirements.in + # via -r installer/requirements.in kiwisolver==1.4.4 \ --hash=sha256:02f79693ec433cb4b5f51694e8477ae83b3205768a6fb48ffba60549080e295b \ --hash=sha256:03baab2d6b4a54ddbb43bba1a3a2d1627e82d205c5cf8f4c924dc49284b87166 \ @@ -837,7 +844,9 @@ matplotlib==3.6.2 \ --hash=sha256:ec9be0f4826cdb3a3a517509dcc5f87f370251b76362051ab59e42b6b765f8c4 \ --hash=sha256:f04f97797df35e442ed09f529ad1235d1f1c0f30878e2fe09a2676b71a8801e0 \ --hash=sha256:f41e57ad63d336fe50d3a67bb8eaa26c09f6dda6a59f76777a99b8ccd8e26aec - # via filterpy + # via + # clipseg + # filterpy multidict==6.0.2 \ --hash=sha256:0327292e745a880459ef71be14e709aaea2f783f3537588fb4ed09b6c01bca60 \ --hash=sha256:041b81a5f6b38244b34dc18c7b6aba91f9cdaf854d9a39e5ff0b58e2b5773b9c \ @@ -970,6 +979,7 @@ numpy==1.23.4 \ # altair # basicsr # clean-fid + # clipseg # contourpy # diffusers # facexlib @@ -1018,6 +1028,7 @@ opencv-python==4.6.0.66 \ --hash=sha256:f482e78de6e7b0b060ff994ffd859bddc3f7f382bb2019ef157b0ea8ca8712f5 # via # basicsr + # clipseg # facexlib # gfpgan # realesrgan @@ -1288,7 +1299,7 @@ pyparsing==3.0.9 \ pyreadline3==3.4.1 \ --hash=sha256:6f3d1f7b8a31ba32b73917cefc1f28cc660562f39aea8646d30bd6eff21f7bae \ --hash=sha256:b0efb6516fd4fb07b45949053826a62fa4cb353db5be2bbb4a7aa1fdd1e345fb - # via -r requirements.in + # via -r installer/requirements.in pyrsistent==0.19.2 \ --hash=sha256:055ab45d5911d7cae397dc418808d8802fb95262751872c841c170b0dbf51eed \ --hash=sha256:111156137b2e71f3a9936baf27cb322e8024dac3dc54ec7fb9f0bcf3249e68bb \ @@ -1425,7 +1436,7 @@ qudida==0.0.4 \ realesrgan==0.3.0 \ --hash=sha256:0d36da96ab9f447071606e91f502ccdfb08f80cc82ee4f8caf720c7745ccec7e \ --hash=sha256:59336c16c30dd5130eff350dd27424acb9b7281d18a6810130e265606c9a6088 - # via -r requirements.in + # via -r installer/requirements.in regex==2022.10.31 \ --hash=sha256:052b670fafbe30966bbe5d025e90b2a491f85dfe5b2583a163b5e60a85a321ad \ --hash=sha256:0653d012b3bf45f194e5e6a41df9258811ac8fc395579fa82958a8b76286bea4 \ @@ -1631,6 +1642,7 @@ scipy==1.9.3 \ # albumentations # basicsr # clean-fid + # clipseg # facexlib # filterpy # gfpgan @@ -1646,7 +1658,7 @@ semver==2.13.0 \ send2trash==1.8.0 \ --hash=sha256:d2c24762fd3759860a0aff155e45871447ea58d2be6bdd39b5c8f966a0c99c2d \ --hash=sha256:f20eaadfdb517eaca5ce077640cb261c7d2698385a6a0f072a4a5447fd49fa08 - # via -r requirements.in + # via -r installer/requirements.in sentry-sdk==1.10.1 \ --hash=sha256:06c0fa9ccfdc80d7e3b5d2021978d6eb9351fa49db9b5847cf4d1f2a473414ad \ --hash=sha256:105faf7bd7b7fa25653404619ee261527266b14103fe1389e0ce077bd23a9691 @@ -1737,11 +1749,11 @@ smmap==5.0.0 \ streamlit==1.14.0 \ --hash=sha256:62556d873567e1b3427bcd118a57ee6946619f363bd6bba38df2d1f8225ecba0 \ --hash=sha256:e078b8143d150ba721bdb9194218e311c5fe1d6d4156473a2dea6cc848a6c9fc - # via -r requirements.in + # via -r installer/requirements.in taming-transformers-rom1504==0.0.6 \ --hash=sha256:051b5804c58caa247bcd51d17ddb525b4d5f892a29d42dc460f40e3e9e34e5d8 \ --hash=sha256:73fe5fc1108accee4236ee6976e0987ab236afad0af06cb9f037641a908d2c32 - # via -r requirements.in + # via -r installer/requirements.in tb-nightly==2.11.0a20221106 \ --hash=sha256:8940457ee42db92f01da8bcdbbea1a476735eda559dde5976f5728919960af4a # via @@ -1766,7 +1778,7 @@ tensorboard-plugin-wit==1.8.1 \ # tensorboard test-tube==0.7.5 \ --hash=sha256:1379c33eb8cde3e9b36610f87da0f16c2e06496b1cfebac473df4e7be2faa124 - # via -r requirements.in + # via -r installer/requirements.in threadpoolctl==3.1.0 \ --hash=sha256:8b99adda265feb6773280df41eece7b2e6561b772d21ffd52e372f999024907b \ --hash=sha256:a335baacfaa4400ae1f0d8e3a58d6674d2f8828e3716bb2802c44955ad391380 @@ -1816,7 +1828,7 @@ toolz==0.12.0 \ --hash=sha256:2059bd4148deb1884bb0eb770a3cde70e7f954cfbbdc2285f1f2de01fd21eb6f \ --hash=sha256:88c570861c440ee3f2f6037c4654613228ff40c93a6c25e0eba70d17282c6194 # via altair -torch==1.12.1+cu116 \ +torch==1.12.1+cu116 ; platform_system == "Linux" or platform_system == "Windows" \ --hash=sha256:7725420dabebfcaf44984edce3283eea91f98f0f7d5874bc68c7a164bd8126e3 \ --hash=sha256:832effad8b21109700323a5aa137a2e4bdea711dac3d8491ff542f798dab0101 \ --hash=sha256:84f031e4ee25d95368d7531aa58e79da9808d3fa53b4b363ea03a2450b6fd0af \ @@ -1826,6 +1838,7 @@ torch==1.12.1+cu116 \ --hash=sha256:dda312901220895087cc83d3665464a3dc171d04460c61c31af463efbfb54896 \ --hash=sha256:fc9b4786ec54be67eaa8b0c7c9999e2f4ae2b89a1c18e41de1515a190440c691 # via + # -r installer/requirements.in # accelerate # basicsr # clean-fid @@ -1845,7 +1858,7 @@ torch==1.12.1+cu116 \ torch-fidelity==0.3.0 \ --hash=sha256:3d3e33db98919759cc4f3f24cb27e1e74bdc7c905d90a780630e4e1c18492b66 \ --hash=sha256:d01284825595feb7dc3eae3dc9a0d8ced02be764813a3483f109bc142b52a1d3 - # via -r requirements.in + # via -r installer/requirements.in torchdiffeq==0.2.3 \ --hash=sha256:b5b01ec1294a2d8d5f77e567bf17c5de1237c0573cb94deefa88326f0e18c338 \ --hash=sha256:fe75f434b9090ac0c27702e02bed21472b0f87035be6581f51edc5d4013ea31a @@ -1864,7 +1877,7 @@ torchvision==0.13.1+cu116 ; platform_system == "Linux" or platform_system == "Wi --hash=sha256:c3ceb2b3f456f0c984af71ef55f8637f178a29dc3e13a66fbb010ceead2891e1 \ --hash=sha256:dcf32f6d998493e76ec21a38bbb856b7402295cf7a67fb09ce5bde7e7e725756 # via - # -r requirements.in + # -r installer/requirements.in # basicsr # clean-fid # clip @@ -1906,7 +1919,7 @@ tqdm==4.64.1 \ transformers==4.24.0 \ --hash=sha256:486f353a8e594002e48be0e2aba723d96eda839e63bfe274702a4b5eda85559b \ --hash=sha256:b7ab50039ef9bf817eff14ab974f306fd20a72350bdc9df3a858fd009419322e - # via -r requirements.in + # via -r installer/requirements.in typing-extensions==4.4.0 \ --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \ --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e diff --git a/installer/requirements.in b/installer/requirements.in index ff84af7a58..81bf4ccd38 100644 --- a/installer/requirements.in +++ b/installer/requirements.in @@ -1,6 +1,7 @@ --prefer-binary --extra-index-url https://download.pytorch.org/whl/cu116 --trusted-host https://download.pytorch.org +accelerate~=0.14 albumentations diffusers eventlet @@ -16,10 +17,13 @@ streamlit taming-transformers-rom1504 test-tube torch-fidelity +torch==1.12.1 ; platform_system == 'Darwin' +torch==1.12.1+cu116 ; platform_system == 'Linux' or platform_system == 'Windows' torchvision==0.13.1 ; platform_system == 'Darwin' torchvision==0.13.1+cu116 ; platform_system == 'Linux' or platform_system == 'Windows' transformers picklescan https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip +https://github.com/invoke-ai/clipseg/archive/1f754751c85d7d4255fa681f4491ff5711c1c288.zip https://github.com/TencentARC/GFPGAN/archive/2eac2033893ca7f427f4035d80fe95b92649ac56.zip https://github.com/invoke-ai/k-diffusion/archive/7f16b2c33411f26b3eae78d10648d625cb0c1095.zip diff --git a/ldm/invoke/args.py b/ldm/invoke/args.py index abc2dd2949..497ddda76b 100644 --- a/ldm/invoke/args.py +++ b/ldm/invoke/args.py @@ -174,7 +174,8 @@ class Args(object): print(f'>> Initialization file {initfile} found. Loading...') sysargs.insert(0,f'@{initfile}') else: - print(f'>> Initialization file {initfile} not found. Applying default settings...') + print(f'>> Initialization file {INITFILE} not found. Creating a new one...') + self._create_init_file(INITFILE) self._arg_switches = self._arg_parser.parse_args(sysargs) return self._arg_switches except Exception as e: @@ -366,6 +367,17 @@ class Args(object): new_dict[k] = value2 if value2 is not None else value1 return new_dict + def _create_init_file(self,initfile:str): + with open(initfile, mode='w', encoding='utf-8') as f: + f.write('''# InvokeAI initialization file +# Put frequently-used startup commands here, one or more per line +# Examples: +# --web --host=0.0.0.0 +# --steps 20 +# -Ak_euler_a -C10.0 +''' + ) + def _create_arg_parser(self): ''' This defines all the arguments used on the command line when you launch diff --git a/notebooks/Stable-Diffusion-local-Windows.ipynb b/notebooks/Stable-Diffusion-local-Windows.ipynb deleted file mode 100644 index 8f7dae18fe..0000000000 --- a/notebooks/Stable-Diffusion-local-Windows.ipynb +++ /dev/null @@ -1,222 +0,0 @@ -{ - "cells": [ - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "# Easy-peasy Windows install" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Note that you will need NVIDIA drivers, Python 3.10, and Git installed\n", - "beforehand - simplified\n", - "[step-by-step instructions](https://github.com/invoke-ai/InvokeAI/wiki/Easy-peasy-Windows-install)\n", - "are available in the wiki (you'll only need steps 1, 2, & 3 )" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Run each cell in turn. In VSCode, either hit SHIFT-ENTER, or click on the little ▶️ to the left of the cell. In Jupyter/JupyterLab, you **must** hit SHIFT-ENTER" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "%pip install pew" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "%%cmd\n", - "git clone https://github.com/invoke-ai/InvokeAI.git\n", - "cd /content/InvokeAI/\n", - "git checkout --quiet development" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "%%cmd\n", - "pew new --python 3.10 -r requirements-lin-win-colab-CUDA.txt --dont-activate invokeai" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "# Switch the notebook kernel to the new 'invokeai' environment!\n", - "\n", - "## VSCode: restart VSCode and come back to this cell\n", - "\n", - "1. Ctrl+Shift+P\n", - "1. Type \"Select Interpreter\" and select \"Jupyter: Select Interpreter to Start Jupyter Server\"\n", - "1. VSCode will say that it needs to install packages. Click the \"Install\" button.\n", - "1. Once the install is finished, do 1 & 2 again\n", - "1. Pick 'invokeai'\n", - "1. Run the following cell" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "%cd InvokeAI" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "\n", - "## Jupyter/JupyterLab\n", - "\n", - "1. Run the cell below\n", - "1. Click on the toolbar where it says \"(ipyknel)\" ↗️. You should get a pop-up asking you to \"Select Kernel\". Pick 'invokeai' from the drop-down.\n" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "#### DO NOT RUN THE FOLLOWING CELL IF YOU ARE USING VSCODE!!" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "# DO NOT RUN THIS CELL IF YOU ARE USING VSCODE!!\n", - "%%cmd\n", - "pew workon invokeai\n", - "pip3 install ipykernel\n", - "python -m ipykernel install --name=invokeai" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "#### When running the next cell, Jupyter/JupyterLab users might get a warning saying \"IProgress not found\". This can be ignored." - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "%run \"scripts/preload_models.py\"" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "%%cmd\n", - "mkdir \"models/ldm/stable-diffusion-v1\"" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Now copy the SD model you downloaded from Hugging Face into the above new directory, and (if necessary) rename it to 'model.ckpt'" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Now go create some magic!\n", - "\n", - "VSCode\n", - "\n", - "- The actual input box for the 'dream' prompt will appear at the very top of the VSCode window. Type in your commands and hit 'ENTER'.\n", - "- To quit, hit the 'Interrupt' button in the toolbar up there ⬆️ a couple of times, then hit ENTER (you'll probably see a terrifying traceback from Python - just ignore it).\n", - "\n", - "Jupyter/JupyterLab\n", - "\n", - "- The input box for the 'dream' prompt will appear below. Type in your commands and hit 'ENTER'.\n", - "- To quit, hit the interrupt button (⏹️) in the toolbar up there ⬆️ a couple of times, then hit ENTER (you'll probably see a terrifying traceback from Python - just ignore it)." - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [ - "%run \"scripts/dream.py\"" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Once this seems to be working well, you can try opening a terminal\n", - "\n", - "- VSCode: type ('CTRL+`')\n", - "- Jupyter/JupyterLab: File|New Terminal\n", - "- Or jump out of the notebook entirely, and open Powershell/Command Prompt\n", - "\n", - "Now:\n", - "\n", - "1. `cd` to wherever the 'InvokeAI' directory is\n", - "1. Run `pew workon invokeai`\n", - "1. Run `winpty python scripts\\dream.py`" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3.10.6 64-bit", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.10.6" - }, - "vscode": { - "interpreter": { - "hash": "5e164cef426134bf171f386fbddecb52046b6c1479f922ab8dfdd30df05e0e80" - } - } - }, - "nbformat": 4, - "nbformat_minor": 4 -} diff --git a/notebooks/Stable_Diffusion_AI_Notebook.ipynb b/notebooks/Stable_Diffusion_AI_Notebook.ipynb index b8755ff32e..ef57b4a50d 100644 --- a/notebooks/Stable_Diffusion_AI_Notebook.ipynb +++ b/notebooks/Stable_Diffusion_AI_Notebook.ipynb @@ -74,8 +74,8 @@ "#@title 3. Install dependencies\n", "import gc\n", "\n", - "!wget https://raw.githubusercontent.com/invoke-ai/InvokeAI/development/requirements.txt\n", - "!wget https://raw.githubusercontent.com/invoke-ai/InvokeAI/development/requirements-lin-win-colab-CUDA.txt\n", + "!wget https://raw.githubusercontent.com/invoke-ai/InvokeAI/development/environments-and-requirements/requirements.txt\n", + "!wget https://raw.githubusercontent.com/invoke-ai/InvokeAI/development/environments-and-requirements/requirements-lin-win-colab-CUDA.txt\n", "!pip install colab-xterm\n", "!pip install -r requirements-lin-win-colab-CUDA.txt\n", "!pip install clean-fid torchtext\n", @@ -262,11 +262,18 @@ }, "gpuClass": "standard", "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3.10.4 64-bit", + "language": "python", "name": "python3" }, "language_info": { - "name": "python" + "name": "python", + "version": "3.10.4" + }, + "vscode": { + "interpreter": { + "hash": "3ad933181bd8a04b432d3370b9dc3b0662ad032c4dfaa4e4f1596c548f763858" + } } }, "nbformat": 4, diff --git a/setup.py b/setup.py index 1021de237f..02ffffeab1 100644 --- a/setup.py +++ b/setup.py @@ -11,16 +11,66 @@ def frontend_files(directory): frontend_files = frontend_files('frontend/dist') print(f'DEBUG: {frontend_files}') +VERSION = '2.1.4' +DESCRIPTION = ('An implementation of Stable Diffusion which provides various new features' + ' and options to aid the image generation process') +LONG_DESCRIPTION = ('This version of Stable Diffusion features a slick WebGUI, an' + ' interactive command-line script that combines text2img and img2img' + ' functionality in a "dream bot" style interface, and multiple features' + ' and other enhancements.') +HOMEPAGE = 'https://github.com/invoke-ai/InvokeAI' setup( name='invoke-ai', - version='2.1.4', - description='InvokeAI: A Stable Diffusion text to image generation toolkit', - packages=find_packages(), + version=VERSION, + description=DESCRIPTION, + long_description=LONG_DESCRIPTION, + author='The InvokeAI Project', + author_email='lincoln.stein@gmail.com', + url=HOMEPAGE, + license='MIT', + packages=find_packages(exclude=['tests.*']), install_requires=[ - 'torch', - 'numpy', - 'tqdm', + 'accelerate', + 'albumentations', + 'diffusers', + 'eventlet', + 'flask_cors', + 'flask_socketio', + 'flaskwebgui', + 'getpass_asterisk', + 'imageio-ffmpeg', + 'pyreadline3', + 'realesrgan', + 'send2trash', + 'streamlit', + 'taming-transformers-rom1504', + 'test-tube', + 'torch-fidelity', + 'transformers' + ], + python_requires='>=3.8, <4', + classifiers=[ + 'Development Status :: 4 - Beta', + 'Environment :: GPU', + 'Environment :: GPU :: NVIDIA CUDA', + 'Environment :: MacOS X', + 'Intended Audience :: End Users/Desktop', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: MIT License', + 'Operating System :: POSIX :: Linux', + 'Operating System :: MacOS', + 'Operating System :: Microsoft :: Windows', + 'Programming Language :: Python :: 3 :: Only,' + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Topic :: Artistic Software', + 'Topic :: Internet :: WWW/HTTP :: WSGI :: Application', + 'Topic :: Internet :: WWW/HTTP :: WSGI :: Server', + 'Topic :: Multimedia :: Graphics', + 'Topic :: Scientific/Engineering :: Artificial Intelligence', + 'Topic :: Scientific/Engineering :: Image Processing', ], scripts = ['scripts/invoke.py','scripts/load_models.py','scripts/sd-metadata.py'], data_files=[('frontend',frontend_files)], diff --git a/source_installer/install.sh b/source_installer/install.sh index 747d701611..d626169800 100755 --- a/source_installer/install.sh +++ b/source_installer/install.sh @@ -95,7 +95,7 @@ source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains abou conda activate if [ "$OS_NAME" == "mac" ]; then - echo "Macintosh system detected. Installing MPS and CPU support." + echo "macOS detected. Installing MPS and CPU support." ln -sf environments-and-requirements/environment-mac.yml environment.yml else if (lsmod | grep amdgpu) &>/dev/null ; then