github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-04-23 03:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflict between timm version needed by LLaVA and controlnet-aux

Browse Source
This commit is contained in:
Eugene Brodsky
2025-03-26 13:18:14 -04:00
committed by psychedelicious
parent f53ff5fa3c
commit c3ffb0feed
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pyproject.toml
View File

@@ -56,6 +56,7 @@ dependencies = [
"torchmetrics",
"torchsde",
"torchvision",
"timm~=1.0.0", # controlnet-aux depends on a version of timm that breaks LLaVA. explicitly pinning `timm` here, which results in a downgrade of `controlnet-aux`. https://github.com/huggingface/controlnet_aux/pull/101. If this poses a problem, we need to decide between newer `controlnet_aux` and LLaVA, OR we can fork `controlnet_aux` and update the pin.
"transformers",
# Core application dependencies, pinned for reproducible builds.

17
uv.lock generated
View File

@@ -1332,7 +1332,6 @@ dependencies = [
{ name = "python-socketio" },
{ name = "pytorch-lightning" },
{ name = "requests" },
{ name = "rich" },
{ name = "safetensors" },
{ name = "scikit-image" },
{ name = "semver" },
@@ -1345,7 +1344,6 @@ dependencies = [
{ name = "torchvision" },
{ name = "transformers" },
{ name = "uvicorn", extra = ["standard"] },
{ name = "windows-curses", marker = "sys_platform == 'win32'" },
]
[package.optional-dependencies]
@@ -1457,7 +1455,6 @@ requires-dist = [
{ name = "pytorch-lightning" },
{ name = "requests" },
{ name = "requests-testadapter", marker = "extra == 'test'" },
{ name = "rich", specifier = "~=13.3" },
{ name = "ruff", marker = "extra == 'test'", specifier = "~=0.11.2" },
{ name = "ruff-lsp", marker = "extra == 'test'", specifier = "~=0.0.62" },
{ name = "safetensors" },
@@ -1474,7 +1471,6 @@ requires-dist = [
{ name = "transformers" },
{ name = "twine", marker = "extra == 'dist'" },
{ name = "uvicorn", extras = ["standard"] },
{ name = "windows-curses", marker = "sys_platform == 'win32'" },
{ name = "xformers", marker = "sys_platform != 'darwin' and extra == 'xformers'", specifier = ">=0.0.28.post1" },
]
provides-extras = ["xformers", "onnx", "onnx-cuda", "onnx-directml", "dist", "docs", "dev", "test"]
@@ -4478,19 +4474,6 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/0b/2c/87f3254fd8ffd29e4c02732eee68a83a1d3c346ae39bc6822dcbcb697f2b/wheel-0.45.1-py3-none-any.whl", hash = "sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248", size = 72494 },
]
[[package]]
name = "windows-curses"
version = "2.4.1"
source = { registry = "https://pypi.org/simple" }
wheels = [
{ url = "https://files.pythonhosted.org/packages/15/34/e70815e7ae6f157c00121180a607dbcdc82acfd949c70bba28c45d206dec/windows_curses-2.4.1-cp310-cp310-win32.whl", hash = "sha256:53d711e07194d0d3ff7ceff29e0955b35479bc01465d46c3041de67b8141db2f", size = 71136 },
{ url = "https://files.pythonhosted.org/packages/a6/1d/1bb512c445af24fb0a3dccf9537c8727bba5920e69539227b87f5351f608/windows_curses-2.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:325439cd4f37897a1de8a9c068a5b4c432f9244bf9c855ee2fbeb3fa721a770c", size = 81418 },
{ url = "https://files.pythonhosted.org/packages/74/b3/46a2508fff83b5affb5a311797c584c494b4b0c4c8796a1afa2c1b1e03ac/windows_curses-2.4.1-cp311-cp311-win32.whl", hash = "sha256:4fa1a176bfcf098d0c9bb7bc03dce6e83a4257fc0c66ad721f5745ebf0c00746", size = 71129 },
{ url = "https://files.pythonhosted.org/packages/50/29/fd7c0c80177d8df55f841504a5f332b95b0002c80f82055913b6caac94e6/windows_curses-2.4.1-cp311-cp311-win_amd64.whl", hash = "sha256:fd7d7a9cf6c1758f46ed76b8c67f608bc5fcd5f0ca91f1580fd2d84cf41c7f4f", size = 81431 },
{ url = "https://files.pythonhosted.org/packages/f4/99/60f34e51514c82631aa5c6d21eab88ce1701562de9844608411e39462a46/windows_curses-2.4.1-cp312-cp312-win32.whl", hash = "sha256:bdbe7d58747408aef8a9128b2654acf6fbd11c821b91224b9a046faba8c6b6ca", size = 71489 },
{ url = "https://files.pythonhosted.org/packages/62/8f/d908bcab1954375b156a9300fa86ceccb110f39457cd6fd59c72777626ab/windows_curses-2.4.1-cp312-cp312-win_amd64.whl", hash = "sha256:5c9c2635faf171a229caca80e1dd760ab00db078e2a285ba2f667bbfcc31777c", size = 81777 },
]
[[package]]
name = "wrapt"
version = "1.17.2"