Skip to content

Commit a74da51

Browse files
Bebra777228Bebra777228
committed
remove unused imports and parameters
1 parent 846509d commit a74da51

File tree

7 files changed

+10
-46
lines changed

7 files changed

+10
-46
lines changed

‎.github/workflows/test_cli.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ on:
44
push:
55
branches:
66
- '*'
7-
paths:
8-
- 'rvc/*'
97
pull_request:
108
branches:
119
- '*'
12-
paths:
13-
- 'rvc/*'
1410

1511
jobs:
1612
rvc_cli:
@@ -47,7 +43,7 @@ jobs:
4743
4844
- name: Run rvc_cli script
4945
run: |
50-
python3 -m rvc.cli.rvc_cli -i "audio/test.mp3" -m "Tsoi" -p -0.5 -ir 0 -fr 3 -rms 0.25 -f0 "rmvpe" -hop 32 -pro 0.33 -f0min 1 -f0max 1100 -f "mp3"
46+
python3 -m rvc.cli.rvc_cli -i "audio/test.mp3" -m "Tsoi" -p -0.5 -ir 0 -rms 0.25 -f0 "rmvpe" -hop 32 -pro 0.33 -f0min 1 -f0max 1100 -f "mp3"
5147
5248
tts_cli:
5349
runs-on: ubuntu-latest
@@ -78,4 +74,4 @@ jobs:
7874
7975
- name: Run tts_cli script
8076
run: |
81-
python3 -m rvc.cli.edge_tts_cli -i "e" -m "Tsoi" -v "en-US-GuyNeural" -p -0.5 -ir 0 -fr 3 -rms 0.25 -f0 "rmvpe" -hop 32 -pro 0.33 -f0min 1 -f0max 1100 -f "mp3"
77+
python3 -m rvc.cli.edge_tts_cli -i "e" -m "Tsoi" -v "en-US-GuyNeural" -p -0.5 -ir 0 -rms 0.25 -f0 "rmvpe" -hop 32 -pro 0.33 -f0min 1 -f0max 1100 -f "mp3"

‎rvc/cli/edge_tts_cli.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44

55
import argparse
66

7-
from rvc.infer.infer import RVC_MODELS_DIR, rvc_infer
7+
from rvc.infer.infer import rvc_infer
88

99
parser = argparse.ArgumentParser(description="Замена голоса в директории output/", add_help=True)
1010
parser.add_argument("-i", "--text_input", type=str, required=True)
1111
parser.add_argument("-m", "--model_name", type=str, required=True)
1212
parser.add_argument("-v", "--tts_voice", type=str, required=True)
1313
parser.add_argument("-p", "--pitch", type=float, required=True)
1414
parser.add_argument("-ir", "--index_rate", type=float, default=0)
15-
parser.add_argument("-fr", "--filter_radius", type=int, default=3)
1615
parser.add_argument("-rms", "--volume_envelope", type=float, default=0.25)
1716
parser.add_argument("-f0", "--method", type=str, default="rmvpe")
1817
parser.add_argument("-hop", "--hop_length", type=int, default=128)
@@ -33,7 +32,6 @@
3332
index_rate=args.index_rate,
3433
volume_envelope=args.volume_envelope,
3534
protect=args.protect,
36-
filter_radius=args.filter_radius,
3735
f0_min=args.f0_min,
3836
f0_max=args.f0_max,
3937
output_format=args.format,

‎rvc/cli/rvc_cli.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44

55
import argparse
66

7-
from rvc.infer.infer import RVC_MODELS_DIR, rvc_infer
7+
from rvc.infer.infer import rvc_infer
88

99
parser = argparse.ArgumentParser(description="Замена голоса в директории output/", add_help=True)
1010
parser.add_argument("-i", "--input_path", type=str, required=True)
1111
parser.add_argument("-m", "--model_name", type=str, required=True)
1212
parser.add_argument("-p", "--pitch", type=float, required=True)
1313
parser.add_argument("-ir", "--index_rate", type=float, default=0)
14-
parser.add_argument("-fr", "--filter_radius", type=int, default=3)
1514
parser.add_argument("-rms", "--volume_envelope", type=float, default=0.25)
1615
parser.add_argument("-f0", "--method", type=str, default="rmvpe")
1716
parser.add_argument("-hop", "--hop_length", type=int, default=128)
@@ -32,7 +31,6 @@
3231
index_rate=args.index_rate,
3332
volume_envelope=args.volume_envelope,
3433
protect=args.protect,
35-
filter_radius=args.filter_radius,
3634
f0_min=args.f0_min,
3735
f0_max=args.f0_max,
3836
output_format=args.format,

‎rvc/infer/infer.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ def load_rvc_model(rvc_model):
5656

5757
# Загружает модель Hubert
5858
def load_hubert(model_path):
59-
models, saved_cfg, task = checkpoint_utils.load_model_ensemble_and_task([model_path], suffix="")
60-
hubert = models[0].to(config.device)
61-
hubert = hubert.float()
59+
model, _, _ = checkpoint_utils.load_model_ensemble_and_task([model_path], suffix="")
60+
hubert = model[0].to(config.device).float()
6261
hubert.eval()
6362
return hubert
6463

@@ -124,7 +123,6 @@ def rvc_infer(
124123
index_rate=0.5,
125124
volume_envelope=0.25,
126125
protect=0.33,
127-
filter_radius=3,
128126
f0_min=50,
129127
f0_max=1100,
130128
output_format="wav",
@@ -168,13 +166,11 @@ def rvc_infer(
168166
net_g,
169167
0,
170168
audio,
171-
input_audio,
172169
pitch,
173170
f0_method,
174171
index_path,
175172
index_rate,
176173
pitch_guidance,
177-
filter_radius,
178174
volume_envelope,
179175
version,
180176
protect,

‎rvc/infer/pipeline.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,10 @@ def get_f0_crepe(self, x, f0_min, f0_max, p_len, hop_length, model="full"):
113113

114114
def get_f0(
115115
self,
116-
input_audio_path,
117116
x,
118117
p_len,
119118
pitch,
120119
f0_method,
121-
filter_radius,
122120
hop_length,
123121
inp_f0=None,
124122
f0_min=50,
@@ -127,6 +125,7 @@ def get_f0(
127125
"""
128126
Получает F0 с использованием выбранного метода.
129127
"""
128+
f0 = None
130129
f0_mel_min = 1127 * np.log(1 + f0_min / 700)
131130
f0_mel_max = 1127 * np.log(1 + f0_max / 700)
132131

@@ -150,6 +149,9 @@ def get_f0(
150149
del self.model_fcpe
151150
gc.collect()
152151

152+
if f0 is None:
153+
raise ValueError("Метод F0 не распознан или не смог рассчитать F0.")
154+
153155
f0 *= pow(2, pitch / 12)
154156
tf0 = self.sample_rate // self.window
155157
if inp_f0 is not None:
@@ -254,13 +256,11 @@ def pipeline(
254256
net_g,
255257
sid,
256258
audio,
257-
input_audio_path,
258259
pitch,
259260
f0_method,
260261
file_index,
261262
index_rate,
262263
pitch_guidance,
263-
filter_radius,
264264
volume_envelope,
265265
version,
266266
protect,
@@ -316,12 +316,10 @@ def pipeline(
316316
sid = torch.tensor(sid, device=self.device).unsqueeze(0).long()
317317
if pitch_guidance:
318318
pitch, pitchf = self.get_f0(
319-
input_audio_path,
320319
audio_pad,
321320
p_len,
322321
pitch,
323322
f0_method,
324-
filter_radius,
325323
hop_length,
326324
inp_f0,
327325
f0_min,

‎tabs/edge_tts.py‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,6 @@ def edge_tts_tab():
173173
interactive=True,
174174
visible=True,
175175
)
176-
filter_radius = gr.Slider(
177-
minimum=0,
178-
maximum=7,
179-
step=1,
180-
value=3,
181-
label="Радиус фильтра",
182-
info="Если это число больше или равно трем, использование медианной фильтрации по собранным результатам тона может привести к снижению дыхания..",
183-
interactive=True,
184-
visible=True,
185-
)
186176
volume_envelope = gr.Slider(
187177
minimum=0,
188178
maximum=1,
@@ -244,7 +234,6 @@ def edge_tts_tab():
244234
index_rate,
245235
volume_envelope,
246236
protect,
247-
filter_radius,
248237
f0_min,
249238
f0_max,
250239
output_format,

‎tabs/inference.py‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,6 @@ def inference_tab():
157157
interactive=True,
158158
visible=True,
159159
)
160-
filter_radius = gr.Slider(
161-
minimum=0,
162-
maximum=7,
163-
step=1,
164-
value=3,
165-
label="Радиус фильтра",
166-
info="Если это число больше или равно трем, использование медианной фильтрации по собранным результатам тона может привести к снижению дыхания..",
167-
interactive=True,
168-
visible=True,
169-
)
170160
volume_envelope = gr.Slider(
171161
minimum=0,
172162
maximum=1,
@@ -241,7 +231,6 @@ def inference_tab():
241231
index_rate,
242232
volume_envelope,
243233
protect,
244-
filter_radius,
245234
f0_min,
246235
f0_max,
247236
output_format,

0 commit comments

Comments
 (0)