enable v101

.gitignore

@@ -159,4 +159,5 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
-.DS_Store
+.DS_Store
+.idea/

infer.py

@@ -19,25 +19,26 @@ import numpy as np
 from models import SynthesizerTrn
 from text.symbols import symbols
 
-# from oldVersion.V210.models import SynthesizerTrn as V210SynthesizerTrn
-# from oldVersion.V210.text import symbols as V210symbols
+from oldVersion.V210.models import SynthesizerTrn as V210SynthesizerTrn
+from oldVersion.V210.text import symbols as V210symbols
 # from oldVersion.V200.models import SynthesizerTrn as V200SynthesizerTrn
 # from oldVersion.V200.text import symbols as V200symbols
 # from oldVersion.V111.models import SynthesizerTrn as V111SynthesizerTrn
 # from oldVersion.V111.text import symbols as V111symbols
 # from oldVersion.V110.models import SynthesizerTrn as V110SynthesizerTrn
 # from oldVersion.V110.text import symbols as V110symbols
-# from oldVersion.V101.models import SynthesizerTrn as V101SynthesizerTrn
-# from oldVersion.V101.text import symbols as V101symbols
+from oldVersion.V101.models import SynthesizerTrn as V101SynthesizerTrn
+from oldVersion.V101.text import symbols as V101symbols
 
 # from oldVersion import V111, V110, V101, V200, V210
+from oldVersion import V101, V210
 
 # 当前版本信息
 latest_version = "2.3"
 
 # 版本兼容
 SynthesizerTrnMap = {
-    # "2.1": V210SynthesizerTrn,
+    "2.1": V210SynthesizerTrn,
     # "2.0.2-fix": V200SynthesizerTrn,
     # "2.0.1": V200SynthesizerTrn,
     # "2.0": V200SynthesizerTrn,
@@ -45,13 +46,13 @@ SynthesizerTrnMap = {
     # "1.1.1": V111SynthesizerTrn,
     # "1.1": V110SynthesizerTrn,
     # "1.1.0": V110SynthesizerTrn,
-    # "1.0.1": V101SynthesizerTrn,
+    "1.0.1": V101SynthesizerTrn,
     # "1.0": V101SynthesizerTrn,
     # "1.0.0": V101SynthesizerTrn,
 }
 
 symbolsMap = {
-    # "2.1": V210symbols,
+    "2.1": V210symbols,
     # "2.0.2-fix": V200symbols,
     # "2.0.1": V200symbols,
     # "2.0": V200symbols,
@@ -59,7 +60,7 @@ symbolsMap = {
     # "1.1.1": V111symbols,
     # "1.1": V110symbols,
     # "1.1.0": V110symbols,
-    # "1.0.1": V101symbols,
+    "1.0.1": V101symbols,
     # "1.0": V101symbols,
     # "1.0.0": V101symbols,
 }
@@ -163,9 +164,9 @@ def infer(
 ):
     # 2.2版本参数位置变了
     # 2.1 参数新增 emotion reference_audio skip_start skip_end
-    # inferMap_V3 = {
-    #     "2.1": V210.infer,
-    #}
+    inferMap_V3 = {
+        "2.1": V210.infer,
+    }
     # 支持中日英三语版本
     inferMap_V2 = {
         # "2.0.2-fix": V200.infer,
@@ -179,7 +180,7 @@ def infer(
     # 仅支持中文版本
     # 在测试中，并未发现两个版本的模型不能互相通用
     inferMap_V1 = {
-        # "1.0.1": V101.infer,
+        "1.0.1": V101.infer,
         # "1.0": V101.infer,
         # "1.0.0": V101.infer,
     }