mirror of
https://github.com/oobabooga/text-generation-webui.git
synced 2024-11-25 17:29:22 +01:00
Updater: don't reinstall requirements if no updates after git pull
This commit is contained in:
parent
1f101ee3e5
commit
ac30e7fe9c
54
one_click.py
54
one_click.py
@ -337,6 +337,7 @@ 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\"")
|
||||||
|
|
||||||
@ -347,9 +348,13 @@ 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}
|
||||||
run_cmd("git pull --autostash", assert_success=True, environment=True)
|
pull_output = run_cmd("git pull --autostash", assert_success=True, environment=True, capture_output=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:
|
||||||
|
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]:
|
||||||
@ -382,39 +387,40 @@ def update_requirements(initial_installation=False, pull=True):
|
|||||||
|
|
||||||
requirements_file = base_requirements
|
requirements_file = base_requirements
|
||||||
|
|
||||||
print_big_message(f"Installing webui requirements from file: {requirements_file}")
|
if repository_updated or initial_installation:
|
||||||
print(f"TORCH: {torver}\n")
|
print_big_message(f"Installing webui requirements from file: {requirements_file}")
|
||||||
|
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:
|
|
||||||
textgen_requirements = [req.replace('+cu121', '+cu118').replace('+cu122', '+cu118') for req in textgen_requirements if "auto-gptq" not in req]
|
|
||||||
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]
|
|
||||||
|
|
||||||
with open('temp_requirements.txt', 'w') as file:
|
if is_cuda118:
|
||||||
file.write('\n'.join(textgen_requirements))
|
textgen_requirements = [req.replace('+cu121', '+cu118').replace('+cu122', '+cu118') for req in textgen_requirements if "auto-gptq" not in req]
|
||||||
|
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]
|
||||||
|
|
||||||
# Workaround for git+ packages not updating properly.
|
with open('temp_requirements.txt', 'w') as file:
|
||||||
git_requirements = [req for req in textgen_requirements if req.startswith("git+")]
|
file.write('\n'.join(textgen_requirements))
|
||||||
for req in git_requirements:
|
|
||||||
url = req.replace("git+", "")
|
|
||||||
package_name = url.split("/")[-1].split("@")[0].rstrip(".git")
|
|
||||||
run_cmd(f"python -m pip uninstall -y {package_name}", environment=True)
|
|
||||||
print(f"Uninstalled {package_name}")
|
|
||||||
|
|
||||||
# Install/update the project requirements
|
# Workaround for git+ packages not updating properly.
|
||||||
run_cmd("python -m pip install -r temp_requirements.txt --upgrade", assert_success=True, environment=True)
|
git_requirements = [req for req in textgen_requirements if req.startswith("git+")]
|
||||||
os.remove('temp_requirements.txt')
|
for req in git_requirements:
|
||||||
|
url = req.replace("git+", "")
|
||||||
|
package_name = url.split("/")[-1].split("@")[0].rstrip(".git")
|
||||||
|
run_cmd(f"python -m pip uninstall -y {package_name}", environment=True)
|
||||||
|
print(f"Uninstalled {package_name}")
|
||||||
|
|
||||||
|
# Install/update the project requirements
|
||||||
|
run_cmd("python -m pip install -r temp_requirements.txt --upgrade", assert_success=True, environment=True)
|
||||||
|
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()
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user