From bcd4ee8bdb9e5fcc632def9e9efbdebb8d741e45 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Fri, 10 Mar 2023 10:08:48 -0500 Subject: [PATCH] post merge cleanup --- modules/shared.py | 1 - requirements_versions.txt | 52 +++++++++--------- test/basic_features/txt2img_test.py | 82 ----------------------------- 3 files changed, 25 insertions(+), 110 deletions(-) delete mode 100644 test/basic_features/txt2img_test.py diff --git a/modules/shared.py b/modules/shared.py index 476b85a4e..81df2b524 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -109,7 +109,6 @@ parser.add_argument("--tls-certfile", type=str, help="Partially enables TLS, req parser.add_argument("--server-name", type=str, help="Sets hostname of server", default=None) parser.add_argument("--gradio-queue", action='store_true', help="Uses gradio queue; experimental option; breaks restart UI button", default=True) parser.add_argument("--skip-version-check", action='store_true', help="Do not check versions of torch and xformers", default=True) -parser.add_argument("--opt-sdp-attention", action='store_true', help="enable scaled dot product cross-attention layer optimization; requires PyTorch 2.*") parser.add_argument("--no-hashing", action='store_true', help="disable sha256 hashing of checkpoints to help loading performance", default=False) parser.add_argument("--no-download-sd-model", action='store_true', help="don't download SD1.5 model even if no model is found in --ckpt-dir", default=False) parser.add_argument("--profile", action='store_true', help="run profiler", default=False) diff --git a/requirements_versions.txt b/requirements_versions.txt index 41e0ccc53..de6a85e12 100644 --- a/requirements_versions.txt +++ b/requirements_versions.txt @@ -1,30 +1,28 @@ -blendmodes==2022 -transformers==4.25.1 -accelerate==0.12.0 +accelerate==0.16.0 basicsr==1.4.2 -gfpgan==1.3.8 -gradio==3.16.2 -numpy==1.23.3 -Pillow==9.4.0 -realesrgan==0.3.0 -torch -omegaconf==2.2.3 -pytorch_lightning==1.7.6 -scikit-image==0.19.2 -fonts -font-roboto -timm==0.6.7 -piexif==1.1.3 +blendmodes==2022 +clean-fid==0.1.35 +diffusers==0.12.1 einops==0.4.1 -jsonmerge==1.8.0 -clean-fid==0.1.29 -resize-right==0.0.2 -torchdiffeq==0.2.3 -kornia==0.6.7 -lark==1.1.2 -inflection==0.5.1 -GitPython==3.1.30 -torchsde==0.2.5 -safetensors==0.2.7 -httpcore<=0.15 fastapi==0.90.1 +gfpgan==1.3.8 +GitPython==3.1.31 +gradio==3.16.2 +inflection==0.5.1 +jsonmerge==1.9.0 +kornia==0.6.9 +lark==1.1.5 +numexpr==2.8.4 +omegaconf==2.3.0 +pandas==1.5.3 +Pillow==9.4.0 +protobuf==3.20.3 +pytorch_lightning==1.7.7 +realesrgan==0.3.0 +resize-right==0.0.2 +safetensors==0.3.0 +scikit-image==0.19.3 +timm==0.6.12 +torchdiffeq==0.2.3 +torchsde==0.2.5 +transformers==4.26.1 diff --git a/test/basic_features/txt2img_test.py b/test/basic_features/txt2img_test.py deleted file mode 100644 index cb525fbb7..000000000 --- a/test/basic_features/txt2img_test.py +++ /dev/null @@ -1,82 +0,0 @@ -import unittest -import requests - - -class TestTxt2ImgWorking(unittest.TestCase): - def setUp(self): - self.url_txt2img = "http://localhost:7860/sdapi/v1/txt2img" - self.simple_txt2img = { - "enable_hr": False, - "denoising_strength": 0, - "firstphase_width": 0, - "firstphase_height": 0, - "prompt": "example prompt", - "styles": [], - "seed": -1, - "subseed": -1, - "subseed_strength": 0, - "seed_resize_from_h": -1, - "seed_resize_from_w": -1, - "batch_size": 1, - "n_iter": 1, - "steps": 3, - "cfg_scale": 7, - "width": 64, - "height": 64, - "restore_faces": False, - "tiling": False, - "negative_prompt": "", - "eta": 0, - "s_churn": 0, - "s_tmax": 0, - "s_tmin": 0, - "s_noise": 1, - "sampler_index": "Euler a" - } - - def test_txt2img_simple_performed(self): - self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) - - def test_txt2img_with_negative_prompt_performed(self): - self.simple_txt2img["negative_prompt"] = "example negative prompt" - self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) - - def test_txt2img_with_complex_prompt_performed(self): - self.simple_txt2img["prompt"] = "((emphasis)), (emphasis1:1.1), [to:1], [from::2], [from:to:0.3], [alt|alt1]" - self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) - - def test_txt2img_not_square_image_performed(self): - self.simple_txt2img["height"] = 128 - self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) - - def test_txt2img_with_hrfix_performed(self): - self.simple_txt2img["enable_hr"] = True - self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) - - def test_txt2img_with_tiling_performed(self): - self.simple_txt2img["tiling"] = True - self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) - - def test_txt2img_with_restore_faces_performed(self): - self.simple_txt2img["restore_faces"] = True - self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) - - def test_txt2img_with_vanilla_sampler_performed(self): - self.simple_txt2img["sampler_index"] = "PLMS" - self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) - self.simple_txt2img["sampler_index"] = "DDIM" - self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) - self.simple_txt2img["sampler_index"] = "UniPC" - self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) - - def test_txt2img_multiple_batches_performed(self): - self.simple_txt2img["n_iter"] = 2 - self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) - - def test_txt2img_batch_performed(self): - self.simple_txt2img["batch_size"] = 2 - self.assertEqual(requests.post(self.url_txt2img, json=self.simple_txt2img).status_code, 200) - - -if __name__ == "__main__": - unittest.main()