Fix and simplify requirements

This commit is contained in:
Zuellni
2023-09-21 00:33:40 +02:00
parent c2570715fc
commit e069a4d10b
3 changed files with 7 additions and 12 deletions
+1 -2
View File
@@ -8,8 +8,7 @@ git clone https://github.com/Zuellni/ComfyUI-ExLlama-Nodes
python -m pip install -r requirements.txt python -m pip install -r requirements.txt
``` ```
ExLlama for CUDA 11.8 is installed by default. It should be compatible with the latest portable build of ComfyUI. If you see any errors related to ExLlama while loading, you should manually install the wheel matching your system from [here](https://github.com/jllllll/exllama/releases/latest).
If you see an error while loading, you should manually install the version matching your system from [here](https://github.com/jllllll/exllama/releases/latest).
For example, on Windows with Python 3.11 and PyTorch CUDA 12.1, you would install: For example, on Windows with Python 3.11 and PyTorch CUDA 12.1, you would install:
``` ```
python -m pip install https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu121-cp311-cp311-win_amd64.whl python -m pip install https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu121-cp311-cp311-win_amd64.whl
+3 -3
View File
@@ -16,12 +16,12 @@ try:
from exllama.tokenizer import ExLlamaTokenizer from exllama.tokenizer import ExLlamaTokenizer
except ModuleNotFoundError: except ModuleNotFoundError:
raise ModuleNotFoundError( raise ModuleNotFoundError(
f"\n{Fore.RED}ExLlama package not installed. Get {Fore.CYAN}{cu}-{cp}{Fore.RED} from:\n" f"\n{Fore.RED}ExLlama not installed. Get {Fore.CYAN}{cu}-{cp}{Fore.RED} from:\n"
f"{Fore.MAGENTA}https://github.com/jllllll/exllama/releases/latest{Fore.RESET}" f"{Fore.MAGENTA}https://github.com/jllllll/exllama/releases/latest{Fore.RESET}"
) )
except ImportError: except ImportError:
raise ImportError( raise ImportError(
f"\n{Fore.RED}Wrong version of ExLlama installed. Get {Fore.CYAN}{cu}-{cp}{Fore.RED} from:\n" f"\n{Fore.RED}Wrong ExLlama version installed. Get {Fore.CYAN}{cu}-{cp}{Fore.RED} from:\n"
f"{Fore.MAGENTA}https://github.com/jllllll/exllama/releases/latest{Fore.RESET}" f"{Fore.MAGENTA}https://github.com/jllllll/exllama/releases/latest{Fore.RESET}"
) )
@@ -103,7 +103,7 @@ class Generator:
progress.update_absolute(max_tokens) progress.update_absolute(max_tokens)
text = text.strip() text = text.strip()
print(Fore.CYAN + text + Fore.RESET + "\n") print(f"{Fore.GREEN}ExLlama: {Fore.CYAN}{text}{Fore.RESET}\n")
return (text,) return (text,)
+3 -7
View File
@@ -1,9 +1,5 @@
https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu118-cp311-cp311-win_amd64.whl; platform_system == "Windows" and python_version == "3.11" https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu121-cp311-cp311-win_amd64.whl; platform_system == "Windows" and python_version == "3.11"
https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu118-cp310-cp310-win_amd64.whl; platform_system == "Windows" and python_version == "3.10" https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu118-cp310-cp310-win_amd64.whl; platform_system == "Windows" and python_version == "3.10"
https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu118-cp39-cp39-win_amd64.whl; platform_system == "Windows" and python_version == "3.9" https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu121-cp311-cp311-linux_x86_64.whl; platform_system == "Linux" and python_version == "3.11"
https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu118-cp38-cp38-win_amd64.whl; platform_system == "Windows" and python_version == "3.8" https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu118-cp310-cp310-linux_x86_64.whl; platform_system == "Linux" and python_version == "3.10"
https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu118-cp311-cp311-win_amd64.whl; platform_system == "Linux" and python_version == "3.11"
https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu118-cp310-cp310-win_amd64.whl; platform_system == "Linux" and python_version == "3.10"
https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu118-cp39-cp39-win_amd64.whl; platform_system == "Linux" and python_version == "3.9"
https://github.com/jllllll/exllama/releases/download/0.0.17/exllama-0.0.17+cu118-cp38-cp38-win_amd64.whl; platform_system == "Linux" and python_version == "3.8"
sentencepiece sentencepiece