Commit Graph

148 Commits

Author SHA1 Message Date
AUTOMATIC 5c9f2bbb74 do not import modules.paths in launch.py 2023-03-12 08:58:58 +03:00
Zhang Hua 1fa1ab5249
launch.py: fix failure because webui.sh's changes
launch.py: using getcwd() instead curdir

launch.py: use absolute path for preparing

also remove chdir()

launch.py: use absolute path for test

launch.py: add default script_path and data_path
2023-03-11 20:00:11 +08:00
AUTOMATIC 1ace16e799 use path to git from env variable for git_pull_recursive 2023-03-11 12:21:53 +03:00
vladlearns 13081dd45e chore: added autostash flag to pull 2023-03-09 16:56:06 +02:00
vladlearns b07b7057f0 chore: removed scripts and added a flag to launch.py 2023-03-09 16:29:07 +02:00
w-e-w dd20fc0fda fix --help
show correct help message
2023-02-04 23:23:20 +09:00
AUTOMATIC 2c1bb46c7a amend the error in previous commit 2023-01-30 18:48:10 +03:00
AUTOMATIC 19de2a626b make linux launch.py use XFORMERS_PACKAGE var too; thanks, acncagua 2023-01-30 15:48:09 +03:00
AUTOMATIC cbd6329488 add an environment variable for selecting xformers package 2023-01-30 09:12:43 +03:00
AUTOMATIC bd52a6d899 some more changes for python version warning; add a commandline flag to disable 2023-01-28 10:48:08 +03:00
AUTOMATIC 7d1f2a3a49 remove waiting for input on version mismatch warning, change supported versions 2023-01-28 10:21:31 +03:00
Spaceginner 9ecf1e827c
Made it only a warning 2023-01-27 17:35:24 +05:00
Spaceginner 1619233a74
Only Linux will have max 3.11 2023-01-26 12:52:44 +05:00
Spaceginner f5d73b6a66
Fixed typo 2023-01-25 22:56:09 +05:00
Spaceginner 0cc5f380d5
even more clarifications(?)
i have no idea what commit message should be
2023-01-25 22:41:51 +05:00
Spaceginner 2de99d62dd
some clarification 2023-01-25 22:38:28 +05:00
Spaceginner 57096823fa
Remove a stacktrace from an assertion to not scare people 2023-01-25 22:33:35 +05:00
Spaceginner e425b9812b
Added Python version check 2023-01-25 22:07:48 +05:00
AUTOMATIC 48a15821de remove the pip install stuff because it does not work as i hoped it would 2023-01-25 00:49:16 +03:00
AUTOMATIC 93fad28a97 print progress when installing torch
add PIP_INSTALLER_LOCATION env var to install pip if it's not installed
remove accidental call to accelerate when venv is disabled
add another env var to skip venv - SKIP_VENV
2023-01-24 21:13:05 +03:00
AUTOMATIC dac45299dd make git commands not fail for extensions when you have spaces in webui directory 2023-01-24 20:22:19 +03:00
acncagua 078e16e4d3 Set Linux xformers 0.0.16RC425 2023-01-24 12:21:07 +09:00
AUTOMATIC 7ff1ef77dd add a message about new torch/xformers version and a way to upgrade by specifying a commandline flag 2023-01-23 17:17:31 +03:00
AUTOMATIC1111 56f63cd498
Merge pull request #5939 from petalas/petalas/torch-upgrade
upgrading torch, torchvision, xformers (windows), to use cu117
2023-01-23 17:15:51 +03:00
AUTOMATIC c361b89026 disable the new NaN check for the CI 2023-01-17 11:05:01 +03:00
Nick Petalas c091cf1b4a upgrading torch, torchvision, xformers (windows) to use u117 2023-01-16 20:35:11 +00:00
AUTOMATIC 52f6e94338 add --skip-install option to prevent running pip in launch.py and speedup launch a bit 2023-01-16 20:13:23 +03:00
Vladimir Repin 76a21b9626 clear envvar, add assertion 2023-01-10 12:47:52 +03:00
AUTOMATIC 997461d3dd add footer with versions 2023-01-05 11:57:14 +03:00
AUTOMATIC1111 59c2dfe1e6
Merge pull request #5361 from rick68/patch-1
Update launch.py
2022-12-10 11:25:10 +03:00
brkirch 5ec8981df4 Revert most launch.py changes, add mac user script
Adds an addition file to read environment variables from when the webui.sh is run from macOS.
2022-12-03 06:44:59 -05:00
Hsiang-Cheng Yang b7ef99634c
Update launch.py
fix a typo
2022-12-03 17:35:17 +08:00
brkirch bef36597cc Fix run as root flag
Even though -f enables running webui.sh as root, the -f flag will also be passed to launch.py, causing it to exit with a usage message. This adds a line to launch.py to remove the -f flag if present.

In addition to the above, all the letters in the command line arguments after each '-' were being processed for 'f' and "illegal option" was displayed for each letter that didn't match. Instead, this commit silences those errors and stops processing if the first flag doesn't start with '-f'.
2022-12-01 04:49:49 -05:00
brkirch 79953e9b8b Add support for macOS (Darwin) in launch.py 2022-12-01 04:49:46 -05:00
AUTOMATIC 89d8804768 only run install.py for enabled extensions 2022-11-27 18:48:08 +03:00
AUTOMATIC1111 8c8ad93bb5
Merge pull request #4635 from mezotaken/master
CI tests with github-actions and some improvements to testing
2022-11-27 16:40:26 +03:00
AUTOMATIC ce6911158b Add support Stable Diffusion 2.0 2022-11-26 16:10:46 +03:00
AUTOMATIC c81d440d87 moved deepdanbooru to pure pytorch implementation 2022-11-20 16:39:20 +03:00
Vladimir Repin 9e4f68acad
Stop exporting cl args and upload stdout and stderr as artifacts 2022-11-14 18:40:15 +03:00
Vladimir Repin 0646040667 Propagate test error and try it without localhost 2022-11-14 14:36:07 +03:00
Vladimir Repin 93d6c0209a Tests separated for github-actions CI 2022-11-14 13:39:22 +03:00
Anas Abou Allaban 084cf04390 Fix env var names 2022-11-12 22:41:22 -05:00
Vladimir Repin 007f4f7314 Tests cleaned up 2022-11-12 15:12:15 +03:00
AUTOMATIC 98947d173e run installers for newly installed extensions 2022-11-12 11:11:47 +03:00
hentailord85ez c0f7dbda33
Update k-diffusion to release 0.0.10 2022-11-04 23:01:58 +00:00
Billy Cao 688aa2c9c1
Merge branch 'AUTOMATIC1111:master' into fix_nowebui_arg 2022-11-03 13:08:26 +08:00
Billy Cao fb1374791b Fix --nowebui argument being ineffective 2022-11-03 13:08:11 +08:00
AUTOMATIC b85e83c3bd add PYTHONPATH for extension's install.py 2022-11-01 14:48:53 +03:00
AUTOMATIC d35bf64945 make launch.py run installers for extensions that have ones
add some more classes to safety module for an extension
2022-11-01 14:20:15 +03:00
AUTOMATIC 5a6e0cfba6 always add --api when running tests 2022-10-30 08:28:36 +03:00
AUTOMATIC 59dfe0845d launch tests from launch.py with --tests commandline argument 2022-10-30 08:22:44 +03:00
judgeou fe9740d2f5 update deepdanbooru version 2022-10-24 08:46:31 +03:00
ふぁ 604620a7f0 Add xformers message. 2022-10-19 21:31:16 +03:00
AUTOMATIC 433a7525c1 remove shared option for update check (because it is not an argument of webui)
have launch.py examine both COMMANDLINE_ARGS as well as argv for its arguments
2022-10-18 15:18:02 +03:00
DepFA e511b867a9 Make update check commandline option, give response on all paths. 2022-10-18 15:10:09 +03:00
DepFA a647cbc618 move update check to after dep installation 2022-10-18 15:10:09 +03:00
DepFA 68e83f40bf add update warning to launch.py 2022-10-18 15:10:09 +03:00
Zeithrold 863e9efc19
Pull out some of URL to Env Variable (#2578)
* moved repository url to changeable environment variable

* move stable diffusion repo itself to env

* added missing env

* Remove default URL

Co-authored-by: AUTOMATIC1111 <16777216c@gmail.com>
2022-10-16 10:13:18 +03:00
C43H66N12O12S2 be1596ce30 fix typo 2022-10-15 20:25:27 +03:00
C43H66N12O12S2 8fb0b99152 Update launch.py 2022-10-15 20:25:27 +03:00
C43H66N12O12S2 09814e3cf3 Update launch.py 2022-10-15 20:25:27 +03:00
AUTOMATIC f756bc540a fix #2588 breaking launch.py (. . .) 2022-10-15 10:28:26 +03:00
Cassy-Lee 7855993bef Move index_url args into run_pip. 2022-10-15 10:10:22 +03:00
Cassy-Lee 77bf3525f8 Update launch.py
Allow change set --index-url for pip.
2022-10-15 10:10:22 +03:00
ChucklesTheBeard 9b75ab144f fix typo 2022-10-14 21:26:54 +03:00
JamnedZ 4e485b7923 Added installation of pyngrok if needed 2022-10-11 15:38:53 +03:00
C43H66N12O12S2 b8c38f2bbf change prebuilt wheel 2022-10-10 19:54:07 +03:00
AUTOMATIC bba2ac8324 reshuffle the code a bit in launcher to keep functions in one place for #2069 2022-10-09 15:22:51 +03:00
Greendayle f8197976ef Shielded launch enviroment creation stuff from multiprocessing 2022-10-09 15:17:36 +03:00
Greendayle 0ec80f0125
Merge branch 'master' into dev/deepdanbooru 2022-10-08 18:28:22 +02:00
Greendayle 01f8cb4447 made deepdanbooru optional, added to readme, automatic download of deepbooru model 2022-10-08 18:02:56 +02:00
C43H66N12O12S2 7e639cd498 check for 3.10 2022-10-08 17:54:16 +03:00
AUTOMATIC dc1117233e simplify xfrmers options: --xformers to enable and that's it 2022-10-08 17:02:18 +03:00
C43H66N12O12S2 ca5f0f149c
Update launch.py 2022-10-08 16:22:38 +03:00
C43H66N12O12S2 d0e85873ac
check for OS and env variable 2022-10-08 16:13:26 +03:00
C43H66N12O12S2 4201fd14f5
install xformers 2022-10-08 14:42:34 +03:00
AUTOMATIC f5490674a8 fix bad output for error when updating a git repo 2022-10-06 17:41:49 +03:00
C43H66N12O12S2 a971e4a767 update k-diff once again 2022-10-06 13:42:21 +03:00
C43H66N12O12S2 c30c06db20 update k-diffusion 2022-10-06 13:42:21 +03:00
AUTOMATIC 6e7057b31b support for downloading new commit hash for git repos 2022-10-06 12:08:58 +03:00
AUTOMATIC 53a3dc601f move CLIP out of requirements and into launcher to make it possible to launch the program offline 2022-10-02 18:21:56 +03:00
AUTOMATIC d1f098540a remove unwanted formatting/functionality from the PR 2022-09-30 11:42:40 +03:00
d8ahazard d73741794d Merge remote-tracking branch 'upstream/master' into ModelLoader 2022-09-29 19:59:36 -05:00
d8ahazard 0dce0df1ee Holy $hit.
Yep.

Fix gfpgan_model_arch requirement(s).
Add Upscaler base class, move from images.
Add a lot of methods to Upscaler.
Re-work all the child upscalers to be proper classes.
Add BSRGAN scaler.
Add ldsr_model_arch class, removing the dependency for another repo that just uses regular latent-diffusion stuff.
Add one universal method that will always find and load new upscaler models without having to add new "setup_model" calls. Still need to add command line params, but that could probably be automated.
Add a "self.scale" property to all Upscalers so the scalers themselves can do "things" in response to the requested upscaling size.
Ensure LDSR doesn't get stuck in a longer loop of "upscale/downscale/upscale" as we try to reach the target upscale size.
Add typehints for IDE sanity.
PEP-8 improvements.
Moar.
2022-09-29 17:46:23 -05:00
AUTOMATIC dc1ee79e96 added --exit for notebooks 2022-09-29 18:33:29 +03:00
C43H66N12O12S2 b6f80bdcc2 update k-diffusion 2022-09-29 13:52:51 +03:00
AUTOMATIC a703f56d73 clone k-diffusion instead of installing it via pip, and do not install its requirements.txt 2022-09-28 21:38:26 +03:00
AUTOMATIC d64b451681 added support for automatically installing latest k-diffusion
added eta parameter to parameters output for generated images
split eta settings into ancestral and ddim (because they have different default values)
2022-09-28 18:09:06 +03:00
AUTOMATIC 5eb9d1aeac change the version of k-diffusion. It still won't be installed unless you are installing from scratch, though. 2022-09-28 15:53:01 +03:00
Alex Offshore b8bb14960a
Fix variable name typo in error message for launch.py
COMMANDINE_ARGS -> COMMANDLINE_ARGS
2022-09-27 17:47:07 +03:00
d8ahazard 5a1951f175 Update launch.py 2022-09-21 16:50:30 +03:00
d8ahazard 1a1f7e85c7
Add LDSR and "GoLatent?" Upscaling (#763)
* Add LDSR Upscaling
2022-09-21 16:06:37 +03:00
benbot d6e8d85e30 removed TORCH_COMMAND section from webui.sh and
added correct torchvision version to default torch install command
2022-09-21 16:04:13 +03:00
AUTOMATIC 45c46f4cb3 oops 2022-09-21 10:32:58 +03:00
AUTOMATIC a8ff013963 added --skip-torch-cuda-test to launcher for #746 2022-09-21 10:25:45 +03:00
Rahul Kolasseri c2775528c9 added __name__ == __main__ to launch.py so it can be imported without launching the webUI 2022-09-20 17:23:26 +03:00
AUTOMATIC 918a092ed4 emergency fix for running in dir with spaces 2022-09-13 17:32:40 +03:00
AUTOMATIC 33e6b6e9a6 moved most of functionality from webui.bat into cross-platform launch.py
moved stable diffusion dependencies into requirements.txt
added checkout with specific commit hashes to all external repos
2022-09-13 16:48:18 +03:00