From b51af7f6d1e8cde1f1c741e5b53e055678b4282e Mon Sep 17 00:00:00 2001 From: RVC-Boss <129054828+RVC-Boss@users.noreply.github.com> Date: Tue, 15 Aug 2023 10:38:17 +0800 Subject: [PATCH] Update config.py --- config.py | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/config.py b/config.py index 3f8b625..3748eac 100644 --- a/config.py +++ b/config.py @@ -36,7 +36,7 @@ class Config: self.iscolab, self.noparallel, self.noautoopen, - self.dml, + self.dml ) = self.arg_parse() self.instead = "" self.x_pad, self.x_query, self.x_center, self.x_max = self.device_config() @@ -71,7 +71,7 @@ class Config: cmd_opts.colab, cmd_opts.noparallel, cmd_opts.noautoopen, - cmd_opts.dml, + cmd_opts.dml ) # has_mps is only available in nightly pytorch (for now) and MasOS 12.3+. @@ -149,38 +149,26 @@ class Config: if self.dml: print("use DirectML instead") try: - os.rename( - "runtime\Lib\site-packages\onnxruntime", - "runtime\Lib\site-packages\onnxruntime-cuda", - ) + os.rename("runtime\Lib\site-packages\onnxruntime","runtime\Lib\site-packages\onnxruntime-cuda") except: pass try: - os.rename( - "runtime\Lib\site-packages\onnxruntime-dml", - "runtime\Lib\site-packages\onnxruntime", - ) + os.rename("runtime\Lib\site-packages\onnxruntime-dml","runtime\Lib\site-packages\onnxruntime") except: + pass import torch_directml - self.device = torch_directml.device(torch_directml.default_device()) self.is_half = False else: if self.instead: print(f"use {self.instead} instead") try: - os.rename( - "runtime\Lib\site-packages\onnxruntime", - "runtime\Lib\site-packages\onnxruntime-cuda", - ) + os.rename("runtime\Lib\site-packages\onnxruntime","runtime\Lib\site-packages\onnxruntime-dml") except: pass try: - os.rename( - "runtime\Lib\site-packages\onnxruntime-dml", - "runtime\Lib\site-packages\onnxruntime", - ) + os.rename("runtime\Lib\site-packages\onnxruntime-cuda","runtime\Lib\site-packages\onnxruntime") except: pass return x_pad, x_query, x_center, x_max