Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: lora debug messages removed, fix: download on model hash mismatch, feat: image_is_control, refactors #20

Merged
merged 103 commits into from
Jun 22, 2023
Merged

fix: lora debug messages removed, fix: download on model hash mismatch, feat: image_is_control, refactors #20

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
e8a084b
fix: remove some unneeded logger messages
tazlin Jun 13, 2023
4a5dc91
Merge pull request #16 from jug-dev/unneeded-logger-messages
tazlin Jun 13, 2023
ba02aa1
fix: eliminate deprecation warning in 3rd party CN preproc
tazlin Jun 14, 2023
dc7db15
docs: slightly clarify intent of `test_import_check()`
tazlin Jun 14, 2023
437b070
refactor: bring controlnet annotator code into comfy_horde.py
tazlin Jun 14, 2023
3aea8f6
feat: support arbitrary importation of comfy_horde
tazlin Jun 14, 2023
86c0bbb
fix: improve singleton nature of `SharedModelManager`
tazlin Jun 14, 2023
f60d163
refactor: remove automatic `hordelib.initialise()` calls from test di…
tazlin Jun 14, 2023
2d1caaf
refactor: manually import comfy modules on `hordelib.initialise()`
tazlin Jun 14, 2023
8ad9d58
fix: tweak `comfy_install` test order
tazlin Jun 14, 2023
179153d
refactor: have validate_model return `None` if the model isn't on disk
tazlin Jun 14, 2023
ee4a6aa
feat: allow unloading model managers
tazlin Jun 16, 2023
2c69a2e
docs: todo note about `is_model_loaded(...)`
tazlin Jun 16, 2023
1b17859
refactor: change test_build_helper_import to non-pytest
tazlin Jun 16, 2023
6aea1f2
test: adds check for the initailise() safe guard
tazlin Jun 16, 2023
5dfc191
refactor: leverage `conftest.py` for better fixture management
tazlin Jun 16, 2023
8694513
refactor: rework SharedModelManager tests to `conftest.py` driven fix…
tazlin Jun 16, 2023
2667f5f
refactor: remove stale test, moved to shared_model_manager tests
tazlin Jun 16, 2023
e2d0849
refactor: fixture for safety_checker model manager
tazlin Jun 16, 2023
4cf83f4
refactor: strip out now needed code for lora MM test
tazlin Jun 16, 2023
bc44d31
refactor: rework CompVisModelManger tests to `conftest.py` driven fix…
tazlin Jun 16, 2023
e3d2484
refactor: rework blip tests to `conftest.py` driven fixtures
tazlin Jun 16, 2023
490850c
refactor: rework clip tests to `conftest.py` driven fixtures
tazlin Jun 16, 2023
ce5a258
refactor: rework core comfy tests to `conftest.py` driven fixtures
tazlin Jun 16, 2023
182cb3c
refactor: rework post processor tests to `conftest.py` driven fixtures
tazlin Jun 16, 2023
44ba1a9
refactor: rework `test_initialisation.py` tests to `conftest.py` driv…
tazlin Jun 16, 2023
96b62fa
refactor: rework payload mapping tests to `conftest.py` driven fixtures
tazlin Jun 16, 2023
2492fc2
refactor: rework safety checker tests to `conftest.py` driven fixtures
tazlin Jun 16, 2023
538f474
refactor: rework util tests to `conftest.py` driven fixtures
tazlin Jun 16, 2023
e4d1662
tests: include `test_no_initialise_comfy_horde` in main tox test
tazlin Jun 16, 2023
aae9e77
tests: have test_stable_diffusion_model fixture return the model name
tazlin Jun 16, 2023
227b314
refactor: rework image metadata tests to `conftest.py` driven fixtures
tazlin Jun 16, 2023
244c3f5
ci: refactor: remove build_helper_import_check.py
tazlin Jun 17, 2023
577daee
refactor: reworks `distance.py` to support cosine similarity
tazlin Jun 17, 2023
3b45edf
refactor: `pytest_collection_modifyitems(...)` more straightforward s…
tazlin Jun 17, 2023
d31cf74
feat: better fixture for testing SD model, isolated Comfy_Horde fixture
tazlin Jun 17, 2023
fceac60
style: minor func def whitespace change
tazlin Jun 17, 2023
0eb8ae6
feat: centralize image similarity pytest functions
tazlin Jun 17, 2023
8054c04
tests: some initial distance.py testing/validation
tazlin Jun 17, 2023
82bb545
refactor: rework controlnet annotator tests to `conftest.py` driven f…
tazlin Jun 17, 2023
094e065
refactor: rework horde inference tests to `conftest.py` driven fixtures
tazlin Jun 17, 2023
1105a00
refactor: rework controlnet inference tests to `conftest.py` driven f…
tazlin Jun 17, 2023
0017205
refactor: rework img2img inference tests to `conftest.py` driven fixt…
tazlin Jun 17, 2023
3b869d5
refactor: rework inpainting tests to `conftest.py` driven fixtures
tazlin Jun 17, 2023
e4850e2
refactor: rework lora tests to `conftest.py` driven fixtures
tazlin Jun 17, 2023
f956a05
refactor: rework non-horde inference tests to `conftest.py` driven fi…
tazlin Jun 17, 2023
d66b236
tests: fix: uses updated `stable_diffusion_modelname_for_testing` in …
tazlin Jun 17, 2023
5e912b2
refactor: rework horde_sampler tests to `conftest.py` driven fixtures
tazlin Jun 17, 2023
eaf6180
test: refactor: rework post processor tests for `testing_shared_funct…
tazlin Jun 17, 2023
3011d27
fix: removes mistaken 'cv2' from reqs.txt
tazlin Jun 17, 2023
600e6d7
ci: fix: removes `IMAGE_DISTANCE_THRESHOLD` from CI
tazlin Jun 17, 2023
9ae59cc
test: fix: use model fixture for controlnet tests
tazlin Jun 17, 2023
763eede
fix: remove unused imports in lora test
tazlin Jun 17, 2023
c3641f1
tests: feat: adds SKIP to result codes, `ORTHOGONAL` entry for cosine
tazlin Jun 17, 2023
f0d299f
tests: refactor: better classes, enums and interfaces for test image …
tazlin Jun 17, 2023
6cd657f
tests: refactor: clarify result codes, fix code bucketing behavior
tazlin Jun 17, 2023
86ff915
tests: fix: have PP tests use new `ImageSimilarityConstraints` class
tazlin Jun 17, 2023
2014222
fix: don't fail if model reference json wasn't on disk
tazlin Jun 17, 2023
57cc7ee
refactor: remove duplicate loadModelDatabase func from lora MM
tazlin Jun 17, 2023
a39f592
tests: refactor: reorganize some more of the test run order
tazlin Jun 17, 2023
3a1414f
tests: fix: typo+unused variable in upscaling test
tazlin Jun 17, 2023
fa12d28
doc: note about anime 6b upscaler image similarity
tazlin Jun 17, 2023
cca865d
feat: `IDENTICAL` entries for image similarity results
tazlin Jun 17, 2023
462cda8
tests: fix: correct use new shared func in `test_inference`
tazlin Jun 17, 2023
7130d13
tests: fix: use passed variable for clarity in SMM Test
tazlin Jun 17, 2023
6eab76b
fix: make histogram result code `SKIP` a small negative number
tazlin Jun 17, 2023
8933519
test: fix: typo in param in horde pp tests
tazlin Jun 17, 2023
037c7cd
tests: fix: changes shared_model_manager to class scope
tazlin Jun 17, 2023
ba88acb
test: explicit is not none for image returned in controlnet test
tazlin Jun 17, 2023
da1feab
tests: fix: remove unneeded debug log message from similarity check
tazlin Jun 17, 2023
cf42a79
fix: download model reference if not on disk, even if `download_refer…
tazlin Jun 17, 2023
f18ebcb
Revert "refactor: remove duplicate loadModelDatabase func from lora MM"
tazlin Jun 17, 2023
9e069b6
Merge pull request #17 from jug-dev/pytest-rework
tazlin Jun 18, 2023
f0c02a4
fix: actually attempt to redownload on hash mismatch
tazlin Jun 20, 2023
c9ac713
tests: fix: tweak tests to support model hash mismatch
tazlin Jun 20, 2023
0d039db
Merge pull request #19 from jug-dev/model-hash-mismatch
tazlin Jun 20, 2023
33e9457
Added test for image_is_control
Jun 20, 2023
40b4efa
Implement image_is_control
spinagon Jun 19, 2023
431b85f
Added image_is_control, fixed bugs
Jun 20, 2023
aef4624
Merge pull request #18 from spinagon/main
tazlin Jun 21, 2023
ed419ee
fix: remove rlimit hack from 3rd party module
tazlin Jun 14, 2023
d873bbe
Merge pull request #21 from jug-dev/remove-annotator-hack
tazlin Jun 21, 2023
1b73c36
chore: move mypy config to mypy.ini
tazlin Jun 18, 2023
f158b76
chore: ignore xformers, clip free in mypy
tazlin Jun 18, 2023
3a229d4
fix: restrict excluded models to just pix2pix
tazlin Jun 18, 2023
acf69fc
refactor: mypy typing quibbles in comfy_horde.py+benchmark.py
tazlin Jun 18, 2023
f4f95be
refactor: correct type hints for ImageSimilarityResult
tazlin Jun 18, 2023
3dff8e9
fix: initialise value of `_comfy_model_manager`
tazlin Jun 18, 2023
7afc862
refactor: remove custom loguru hijacks
tazlin Jun 18, 2023
ac3efb0
refactor: type hint, minor refactors
tazlin Jun 18, 2023
e9006d3
chore: more mypy settings for missing imports
tazlin Jun 21, 2023
4505d89
refactor: prefer load MMs by enum/type, deprecate named MM params
tazlin Jun 21, 2023
e9f8c55
refactor: change example modules to `unload_model_managers`
tazlin Jun 21, 2023
7b3c326
style: missed whitespace violation
tazlin Jun 21, 2023
7c0cfd7
fix: obsolete variable in run_upscale
tazlin Jun 21, 2023
c354db3
chore: more accurate type hints in tests
tazlin Jun 21, 2023
e649ce5
style: lint fix
tazlin Jun 21, 2023
8e7f64c
fix: check if lora exists before deleting
tazlin Jun 21, 2023
352d176
fix: increase adhoc lora timeout
tazlin Jun 21, 2023
f06fc34
fix: remove outdated model reference download behavior
tazlin Jun 21, 2023
577ffa6
fix: better backwards compat. for `get_mm_pointers(...)`
tazlin Jun 22, 2023
259634c
chore: ensure min clip_Free version
tazlin Jun 22, 2023
483fc08
Merge pull request #22 from jug-dev/more-refactors-noone-asked-for
tazlin Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: eliminate deprecation warning in 3rd party CN preproc
  • Loading branch information
@tazlin
tazlin committed Jun 17, 2023
commit ba02aa18c43354e7d54568fe29ee5c8d8964fb72
2 changes: 1 addition & 1 deletion hordelib/nodes/comfy_controlnet_preprocessors/openpose/body.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import numpy as np
import math
import time
from scipy.ndimage.filters import gaussian_filter
from scipy.ndimage import gaussian_filter
import torch
from torchvision import transforms

Expand Down
2 changes: 1 addition & 1 deletion hordelib/nodes/comfy_controlnet_preprocessors/openpose/hand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import numpy as np
import math
import time
from scipy.ndimage.filters import gaussian_filter
from scipy.ndimage import gaussian_filter
import torch
from skimage.measure import label
import model_management
Expand Down