From a8fbbdad18fc2e6dbd95ee5ad5a227a29fd34bdc Mon Sep 17 00:00:00 2001
From: Ftps <ftpsflandre@gmail.com>
Date: Fri, 17 Nov 2023 18:22:33 +0900
Subject: [PATCH] Optimization of conditional branching

---
 rvc/configs/config.py | 91 +++++++++----------------------------------
 1 file changed, 19 insertions(+), 72 deletions(-)

diff --git a/rvc/configs/config.py b/rvc/configs/config.py
index 5702829..d94c251 100644
--- a/rvc/configs/config.py
+++ b/rvc/configs/config.py
@@ -49,7 +49,6 @@ class Config:
             self.noautoopen,
             self.dml,
         ) = self.arg_parse()
-        self.instead = ""
         self.x_pad, self.x_query, self.x_center, self.x_max = self.device_config()
 
     @staticmethod
@@ -144,92 +143,40 @@ class Config:
                 / 1024
                 + 0.4
             )
-            if self.gpu_mem <= 4:
-                with open("infer/modules/train/preprocess.py", "r") as f:
-                    strr = f.read().replace("3.7", "3.0")
-                with open("infer/modules/train/preprocess.py", "w") as f:
-                    f.write(strr)
         elif self.has_mps():
             logger.info("No supported Nvidia GPU found")
             self.device = self.instead = "mps"
             self.is_half = False
             self.use_fp32_config()
+        elif self.dml:
+            import torch_directml
+
+            self.device = torch_directml.device(torch_directml.default_device())
+            self.is_half = False
         else:
             logger.info("No supported Nvidia GPU found")
             self.device = self.instead = "cpu"
             self.is_half = False
             self.use_fp32_config()
 
-        if self.n_cpu == 0:
-            self.n_cpu = cpu_count()
-
-        if self.is_half:
-            # 6G显存配置
-            x_pad = 3
-            x_query = 10
-            x_center = 60
-            x_max = 65
-        else:
-            # 5G显存配置
-            x_pad = 1
-            x_query = 6
-            x_center = 38
-            x_max = 41
-
         if self.gpu_mem is not None and self.gpu_mem <= 4:
             x_pad = 1
             x_query = 5
             x_center = 30
             x_max = 32
-        if self.dml:
-            logger.info("Use DirectML instead")
-            if (
-                os.path.exists(
-                    "runtime\Lib\site-packages\onnxruntime\capi\DirectML.dll"
-                )
-                == False
-            ):
-                try:
-                    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",
-                    )
-                except:
-                    pass
-            # if self.device != "cpu":
-            import torch_directml
-
-            self.device = torch_directml.device(torch_directml.default_device())
-            self.is_half = False
+        elif self.is_half:
+            # 6G PU_RAM conf
+            x_pad = 3
+            x_query = 10
+            x_center = 60
+            x_max = 65
         else:
-            if self.instead:
-                logger.info(f"Use {self.instead} instead")
-            if (
-                os.path.exists(
-                    "runtime\Lib\site-packages\onnxruntime\capi\onnxruntime_providers_cuda.dll"
-                )
-                == False
-            ):
-                try:
-                    os.rename(
-                        "runtime\Lib\site-packages\onnxruntime",
-                        "runtime\Lib\site-packages\onnxruntime-dml",
-                    )
-                except:
-                    pass
-                try:
-                    os.rename(
-                        "runtime\Lib\site-packages\onnxruntime-cuda",
-                        "runtie\Lib\site-packages\onnxruntime",
-                    )
-                except:
-                    pass
-        print("is_half:%s, device:%s" % (self.is_half, self.device))
+            # 5G GPU_RAM conf
+            x_pad = 1
+            x_query = 6
+            x_center = 38
+            x_max = 41
+
+        logger.info(f"Use {self.dml or self.instead} instead")
+        logger.info(f"is_half:{self.is_half}, device:{self.device}")
         return x_pad, x_query, x_center, x_max