wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-01-20 11:20:18 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

fix macos support

Browse Source
This commit is contained in:
Benjamin Berman 2023-08-01 11:48:02 -07:00
parent 0e964180e6
commit 94fa7a3b61
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -27,4 +27,4 @@ scipy
tqdm tqdm
diffusers>=0.16.1 diffusers>=0.16.1
protobuf==3.20.3 protobuf==3.20.3
rembg[gpu] rembg

17
setup.py
View File

@ -42,6 +42,11 @@ cpu_torch_index_nightlies = "https://download.pytorch.org/whl/nightly/cpu"
# xformers not required for new torch # xformers not required for new torch
"""
Packages that should have a specific option set when a GPU accelerator is present
"""
gpu_accelerated_packages = {"rembg": "rembg[gpu]"}
def _is_nvidia() -> bool: def _is_nvidia() -> bool:
system = platform.system().lower() system = platform.system().lower()
@ -92,12 +97,15 @@ def dependencies() -> [str]:
_alternative_indices = [amd_torch_index, nvidia_torch_index, cpu_torch_index_nightlies] _alternative_indices = [amd_torch_index, nvidia_torch_index, cpu_torch_index_nightlies]
session = PipSession() session = PipSession()
gpu_accelerated = False
index_urls = ['https://pypi.org/simple'] index_urls = ['https://pypi.org/simple']
# prefer nvidia over AMD because AM5/iGPU systems will have a valid ROCm device # prefer nvidia over AMD because AM5/iGPU systems will have a valid ROCm device
if _is_nvidia(): if _is_nvidia():
index_urls += [nvidia_torch_index] index_urls += [nvidia_torch_index]
gpu_accelerated = True
elif _is_amd(): elif _is_amd():
index_urls += [amd_torch_index] index_urls += [amd_torch_index]
gpu_accelerated = True
else: else:
index_urls += [cpu_torch_index_nightlies] index_urls += [cpu_torch_index_nightlies]
@ -121,8 +129,11 @@ def dependencies() -> [str]:
for i, package in enumerate(_dependencies[:]): for i, package in enumerate(_dependencies[:]):
requirement = InstallRequirement(Requirement(package), comes_from=f"{package_name}=={version}") requirement = InstallRequirement(Requirement(package), comes_from=f"{package_name}=={version}")
candidate = finder.find_best_candidate(requirement.name, requirement.specifier) candidate = finder.find_best_candidate(requirement.name, requirement.specifier)
if any([url in candidate.best_candidate.link.url for url in _alternative_indices]): if candidate.best_candidate is not None:
_dependencies[i] = f"{requirement.name} @ {candidate.best_candidate.link.url}" if gpu_accelerated and requirement.name in gpu_accelerated_packages:
_dependencies[i] = gpu_accelerated_packages[requirement.name]
if any([url in candidate.best_candidate.link.url for url in _alternative_indices]):
_dependencies[i] = f"{requirement.name} @ {candidate.best_candidate.link.url}"
return _dependencies return _dependencies
@ -137,7 +148,7 @@ setup(
# todo: see https://packaging.python.org/en/latest/guides/creating-and-discovering-plugins/ for more about adding plugins # todo: see https://packaging.python.org/en/latest/guides/creating-and-discovering-plugins/ for more about adding plugins
packages=find_packages(where=".", include=['comfy', 'comfy_extras']), packages=find_packages(where=".", include=['comfy', 'comfy_extras']),
install_requires=dependencies(), install_requires=dependencies(),
setup_requires=["wheel"], setup_requires=["pip", "wheel"],
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [
# todo: eventually migrate main here # todo: eventually migrate main here