AI/text-generation-webui
1
0
Fork 0
mirror of https://github.com/oobabooga/text-generation-webui.git synced 2024-10-01 01:26:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Updater: don't reinstall requirements if no updates after git pull"

Browse Source 
This reverts commit ac30e7fe9c.
This commit is contained in:
oobabooga 2024-07-25 07:34:01 -07:00
parent d581334a41
commit a34273755b
1 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
one_click.py
View File

@ -337,7 +337,6 @@ def update_requirements(initial_installation=False, pull=True):
git_creation_cmd = 'git init -b main && git remote add origin https://github.com/oobabooga/text-generation-webui && git fetch && git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main && git reset --hard origin/main && git branch --set-upstream-to=origin/main' git_creation_cmd = 'git init -b main && git remote add origin https://github.com/oobabooga/text-generation-webui && git fetch && git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main && git reset --hard origin/main && git branch --set-upstream-to=origin/main'
run_cmd(git_creation_cmd, environment=True, assert_success=True) run_cmd(git_creation_cmd, environment=True, assert_success=True)
repository_updated = False
if pull: if pull:
print_big_message("Updating the local copy of the repository with \"git pull\"") print_big_message("Updating the local copy of the repository with \"git pull\"")
@ -348,13 +347,9 @@ def update_requirements(initial_installation=False, pull=True):
] ]
before_pull_hashes = {file_name: calculate_file_hash(file_name) for file_name in files_to_check} before_pull_hashes = {file_name: calculate_file_hash(file_name) for file_name in files_to_check}
pull_output = run_cmd("git pull --autostash", assert_success=True, environment=True, capture_output=True) run_cmd("git pull --autostash", assert_success=True, environment=True)
after_pull_hashes = {file_name: calculate_file_hash(file_name) for file_name in files_to_check} after_pull_hashes = {file_name: calculate_file_hash(file_name) for file_name in files_to_check}
# Check if git pull actually updated anything
if "Already up to date." not in pull_output.stdout.decode('utf-8'):
repository_updated = True
# Check for differences in installation file hashes # Check for differences in installation file hashes
for file_name in files_to_check: for file_name in files_to_check:
if before_pull_hashes[file_name] != after_pull_hashes[file_name]: if before_pull_hashes[file_name] != after_pull_hashes[file_name]:
@ -387,19 +382,18 @@ def update_requirements(initial_installation=False, pull=True):
requirements_file = base_requirements requirements_file = base_requirements
if repository_updated or initial_installation:
print_big_message(f"Installing webui requirements from file: {requirements_file}") print_big_message(f"Installing webui requirements from file: {requirements_file}")
print(f"TORCH: {torver}\n") print(f"TORCH: {torver}\n")
# Prepare the requirements file # Prepare the requirements file
textgen_requirements = open(requirements_file).read().splitlines() textgen_requirements = open(requirements_file).read().splitlines()
if is_cuda118: if is_cuda118:
textgen_requirements = [ textgen_requirements = [
req.replace('+cu121', '+cu118').replace('+cu122', '+cu118') req.replace('+cu121', '+cu118').replace('+cu122', '+cu118')
for req in textgen_requirements for req in textgen_requirements
if "auto-gptq" not in req.lower() and "autoawq" not in req.lower() if "auto-gptq" not in req.lower() and "autoawq" not in req.lower()
] ]
if is_windows() and is_cuda118: # No flash-attention on Windows for CUDA 11 if is_windows() and is_cuda118: # No flash-attention on Windows for CUDA 11
textgen_requirements = [req for req in textgen_requirements if 'oobabooga/flash-attention' not in req] textgen_requirements = [req for req in textgen_requirements if 'oobabooga/flash-attention' not in req]
@ -417,14 +411,15 @@ def update_requirements(initial_installation=False, pull=True):
# Install/update the project requirements # Install/update the project requirements
run_cmd("python -m pip install -r temp_requirements.txt --upgrade", assert_success=True, environment=True) run_cmd("python -m pip install -r temp_requirements.txt --upgrade", assert_success=True, environment=True)
os.remove('temp_requirements.txt') os.remove('temp_requirements.txt')
else:
print("Repository is already up to date. Skipping requirements installation.")
# Check for '+cu' or '+rocm' in version string to determine if torch uses CUDA or ROCm. Check for pytorch-cuda as well for backwards compatibility # Check for '+cu' or '+rocm' in version string to determine if torch uses CUDA or ROCm. Check for pytorch-cuda as well for backwards compatibility
if not any((is_cuda, is_rocm)) and run_cmd("conda list -f pytorch-cuda | grep pytorch-cuda", environment=True, capture_output=True).returncode == 1: if not any((is_cuda, is_rocm)) and run_cmd("conda list -f pytorch-cuda | grep pytorch-cuda", environment=True, capture_output=True).returncode == 1:
clear_cache() clear_cache()
return return
if not os.path.exists("repositories/"):
os.mkdir("repositories")
clear_cache() clear_cache()