Skip to content

Merge dev branch #4927

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

Merged
oobabooga merged 5 commits into from
Dec 15, 2023
Merged

Merge dev branch #4927

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8acecf3
Bump llama-cpp-python to 0.2.23 (NVIDIA & CPU-only, no AMD, no Metal)…
oobabooga Dec 14, 2023
4ae2dce
One-click installer: more friendly progress messages
oobabooga Dec 15, 2023
fd1449d
One-click installer: fix minor bug introduced in previous commit
oobabooga Dec 15, 2023
dde7921
One-click installer: minor message change
oobabooga Dec 15, 2023
f336f8a
Merge branch 'main' into dev
oobabooga Dec 15, 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
20 changes: 11 additions & 9 deletions one_click.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,12 @@ def install_webui():
install_pytorch = "python -m pip install torch==2.0.1a0 torchvision==0.15.2a0 intel_extension_for_pytorch==2.0.110+xpu --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/us/"

# Install Git and then Pytorch
print_big_message("Installing PyTorch.")
run_cmd(f"{install_git} && {install_pytorch} && python -m pip install py-cpuinfo==9.0.0", assert_success=True, environment=True)

# Install CUDA libraries (this wasn't necessary for Pytorch before...)
if choice == "A":
print_big_message("Installing the CUDA runtime libraries.")
run_cmd(f"conda install -y -c \"nvidia/label/{'cuda-12.1.1' if use_cuda118 == 'N' else 'cuda-11.8.0'}\" cuda-runtime", assert_success=True, environment=True)

# Install the webui requirements
Expand Down Expand Up @@ -261,20 +263,18 @@ def update_requirements(initial_installation=False):

if install:
print_big_message("Installing extensions requirements.")
extensions = next(os.walk("extensions"))[1]
for extension in extensions:
if extension in ['superbooga', 'superboogav2', 'coqui_tts']: # Fail to install on Windows
continue

skip = ['superbooga', 'superboogav2', 'coqui_tts'] # Fail to install on Windows
extensions = [foldername for foldername in os.listdir('extensions') if os.path.isfile(os.path.join('extensions', foldername, 'requirements.txt'))]
extensions = [x for x in extensions if x not in skip]
for i, extension in enumerate(extensions):
print(f"\n\n--- [{i+1}/{len(extensions)}]: {extension}\n\n")
extension_req_path = os.path.join("extensions", extension, "requirements.txt")
if os.path.exists(extension_req_path):
run_cmd("python -m pip install -r " + extension_req_path + " --upgrade", assert_success=False, environment=True)
run_cmd("python -m pip install -r " + extension_req_path + " --upgrade", assert_success=False, environment=True)
elif initial_installation:
print_big_message("Will not install extensions due to INSTALL_EXTENSIONS environment variable.")

# Detect the Python and PyTorch versions
torver = torch_version()
print(f"TORCH: {torver}")
is_cuda = '+cu' in torver
is_cuda118 = '+cu118' in torver # 2.1.0+cu118
is_cuda117 = '+cu117' in torver # 2.0.1+cu117
Expand Down Expand Up @@ -303,8 +303,10 @@ def update_requirements(initial_installation=False):
else:
requirements_file = "requirements_noavx2.txt"

# Prepare the requirements file
print_big_message(f"Installing webui requirements from file: {requirements_file}")
print(f"TORCH: {torver}\n")

# Prepare the requirements file
textgen_requirements = open(requirements_file).read().splitlines()
if is_cuda117:
textgen_requirements = [req.replace('+cu121', '+cu117').replace('+cu122', '+cu117').replace('torch2.1', 'torch2.0') for req in textgen_requirements]
Expand Down