remove clip as requirement

Signed-off-by: vladmandic <mandic00@live.com>
This commit is contained in:
vladmandic
2026-02-12 08:40:10 +01:00
parent 3ee816888e
commit 88db926ecd
6 changed files with 11 additions and 33 deletions
+2 -1
View File
@@ -1,6 +1,6 @@
# Change Log for SD.Next
## Update for 2026-02-11
## Update for 2026-02-12
- **Image manipulation**
- use high-quality [sharpfin](https://github.com/drhead/Sharpfin) accelerated library
@@ -29,6 +29,7 @@
- refactor: captioning part-2, thanks @CalamitousFelicitousness
- refactor: remove face restoration, thanks @CalamitousFelicitousness
- update `lint` rules, thanks @awsr
- remove requirements: `clip`, `open-clip`
- update `requirements`
- **Fixes**
- fix: handle `clip` installer doing unwanted `setuptools` update
+4 -29
View File
@@ -633,11 +633,12 @@ def get_platform():
release = platform.release()
return {
'arch': platform.machine(),
'cpu': platform.processor(),
'cpu': f'{platform.processor()}',
'system': platform.system(),
'release': release,
'python': platform.python_version(),
'locale': locale.getlocale(),
'setuptools': package_version('setuptools'),
'docker': os.environ.get('SD_DOCKER', None) is not None,
# 'host': platform.node(),
# 'version': platform.version(),
@@ -1114,27 +1115,6 @@ def check_modified_files():
ts('files', t_start)
# install required packages
def install_packages():
t_start = time.time()
if args.profile:
pr = cProfile.Profile()
pr.enable()
# log.info('Install: verifying packages')
clip_package = os.environ.get('CLIP_PACKAGE', "git+https://github.com/openai/CLIP.git")
install(clip_package, 'clip', quiet=True, no_build_isolation=True)
install('open-clip-torch', no_deps=True, quiet=True)
install(clip_package, 'ftfy', quiet=True, no_build_isolation=True)
# tensorflow_package = os.environ.get('TENSORFLOW_PACKAGE', 'tensorflow==2.13.0')
# tensorflow_package = os.environ.get('TENSORFLOW_PACKAGE', None)
# if tensorflow_package is not None:
# install(tensorflow_package, 'tensorflow-rocm' if 'rocm' in tensorflow_package else 'tensorflow', ignore=True, quiet=True)
if args.profile:
pr.disable( )
print_profile(pr, 'Packages')
ts('packages', t_start)
# run extension installer
def run_extension_installer(folder):
path_installer = os.path.realpath(os.path.join(folder, "install.py"))
@@ -1390,17 +1370,12 @@ def install_optional():
install('nvidia-ml-py', ignore=True, quiet=True)
install('pillow-jxl-plugin==1.3.5', ignore=True, quiet=True)
install('ultralytics==8.3.40', ignore=True, quiet=True)
install('open-clip-torch', no_deps=True, quiet=True)
install('git+https://github.com/tencent-ailab/IP-Adapter.git', 'ip_adapter', ignore=True, quiet=True)
# install('git+https://github.com/openai/CLIP.git', 'clip', quiet=True, no_build_isolation=True)
# install('torchao==0.10.0', ignore=True, quiet=True)
# install('bitsandbytes==0.47.0', ignore=True, quiet=True)
# install('optimum-quanto==0.2.7', ignore=True, quiet=True)
try:
import gguf
scripts_dir = os.path.join(os.path.dirname(gguf.__file__), '..', 'scripts')
if os.path.exists(scripts_dir):
os.rename(scripts_dir, scripts_dir + '_gguf')
except Exception:
pass
ts('optional', t_start)
+1 -2
View File
@@ -253,7 +253,7 @@ def main():
if not args.skip_env or args.skip_all:
installer.set_environment()
if args.uv:
installer.install("uv", "uv")
installer.install('uv', 'uv')
installer.install_gradio()
installer.check_torch()
installer.check_onnx()
@@ -272,7 +272,6 @@ def main():
init_paths()
else:
installer.install_requirements()
installer.install_packages()
if installer.check_timestamp():
installer.log.info('Startup: quick launch')
init_paths()
+2
View File
@@ -102,6 +102,8 @@ def get_clip_models():
def refresh_clip_models():
from installer import install
install('open-clip-torch', no_deps=True, quiet=True)
global clip_models # pylint: disable=global-statement
import open_clip
models = sorted(open_clip.list_pretrained())
+1
View File
@@ -31,6 +31,7 @@ sqlalchemy
invisible-watermark
PyWavelets
pi-heif
ftfy
# versioned
fastapi==0.124.4
+1 -1
View File
@@ -8,7 +8,7 @@ def lang_detect(text:str, top:int=1, threshold:float=0.25) -> str:
from modules import shared
if model is None:
from installer import install
install("fasttext")
install('fasttext')
import fasttext
from huggingface_hub import hf_hub_download
model_path = hf_hub_download(repo_id, filename="model.bin", cache_dir=shared.opts.hfcache_dir)