FIX.1: onnx, onnxruntime-gpu stable versions

Issues: #483 #486 #502 #536 #538 #539
This commit is contained in:
Евгений Гурьев | Eugene Gourieff | 古仁 2024-10-08 03:39:49 +07:00
parent 0458e56cb9
commit c7b8556856
2 changed files with 10 additions and 19 deletions

View File

@ -21,20 +21,6 @@ req_file = os.path.join(BASE_PATH, "requirements.txt")
models_dir = os.path.join(models_path, "insightface") models_dir = os.path.join(models_path, "insightface")
# DEPRECATED:
# models_dir_old = os.path.join(models_path, "roop")
# if os.path.exists(models_dir_old):
# if not os.listdir(models_dir_old) and (not os.listdir(models_dir) or not os.path.exists(models_dir)):
# os.rename(models_dir_old, models_dir)
# else:
# import shutil
# for file in os.listdir(models_dir_old):
# shutil.move(os.path.join(models_dir_old, file), os.path.join(models_dir, file))
# try:
# os.rmdir(models_dir_old)
# except Exception as e:
# print(f"OSError: {e}")
model_url = "https://huggingface.co/datasets/Gourieff/ReActor/resolve/main/models/inswapper_128.onnx" model_url = "https://huggingface.co/datasets/Gourieff/ReActor/resolve/main/models/inswapper_128.onnx"
model_name = os.path.basename(model_url) model_name = os.path.basename(model_url)
model_path = os.path.join(models_dir, model_name) model_path = os.path.join(models_dir, model_name)
@ -117,12 +103,17 @@ with open(req_file) as file:
last_device = "CPU" last_device = "CPU"
with open(os.path.join(BASE_PATH, "last_device.txt"), "w") as txt: with open(os.path.join(BASE_PATH, "last_device.txt"), "w") as txt:
txt.write(last_device) txt.write(last_device)
if cuda_version is not None and float(cuda_version)>=12: # CU12 if cuda_version is not None:
if not is_installed(ort,"1.17.1",False): if float(cuda_version)>=12: # CU12.x
extra_index_url = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/"
else: # CU11.8
extra_index_url = "https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-11/pypi/simple"
if not is_installed(ort,"1.17.1",True):
install_count += 1 install_count += 1
ort = "onnxruntime-gpu==1.17.1"
pip_uninstall("onnxruntime", "onnxruntime-gpu") pip_uninstall("onnxruntime", "onnxruntime-gpu")
pip_install(ort,"--extra-index-url","https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/") pip_install(ort,"--extra-index-url",extra_index_url)
elif not is_installed(ort,"1.16.1",False): elif not is_installed(ort,"1.18.1",False):
install_count += 1 install_count += 1
pip_install(ort, "-U") pip_install(ort, "-U")
except Exception as e: except Exception as e:

View File

@ -1,4 +1,4 @@
albumentations==1.4.3 albumentations==1.4.3
insightface==0.7.3 insightface==0.7.3
onnx>=1.14.0 onnx==1.16.1
opencv-python>=4.7.0.72 opencv-python>=4.7.0.72