Skip to content

Commit ba9b819

Browse files
committed
Fix lint: ruff E712
1 parent 0f37f0c commit ba9b819

File tree

9 files changed

+23
-23
lines changed

9 files changed

+23
-23
lines changed

bins/svc/inference.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def prepare_for_audio_file(args, cfg, num_workers=1):
5050
acoustic_extractor.extract_utt_acoustic_features_serial(
5151
metadata, temp_audio_dir, cfg
5252
)
53-
if cfg.preprocess.use_min_max_norm_mel == True:
53+
if cfg.preprocess.use_min_max_norm_mel is True:
5454
acoustic_extractor.cal_mel_min_max(
5555
dataset=audio_name, output_path=preprocess_path, cfg=cfg, metadata=metadata
5656
)

models/tta/ldm/inference_utils/vocoder.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class DiscriminatorP(torch.nn.Module):
216216
def __init__(self, period, kernel_size=5, stride=3, use_spectral_norm=False):
217217
super(DiscriminatorP, self).__init__()
218218
self.period = period
219-
norm_f = weight_norm if use_spectral_norm == False else spectral_norm
219+
norm_f = weight_norm if use_spectral_norm is False else spectral_norm
220220
self.convs = nn.ModuleList(
221221
[
222222
norm_f(
@@ -314,7 +314,7 @@ def forward(self, y, y_hat):
314314
class DiscriminatorS(torch.nn.Module):
315315
def __init__(self, use_spectral_norm=False):
316316
super(DiscriminatorS, self).__init__()
317-
norm_f = weight_norm if use_spectral_norm == False else spectral_norm
317+
norm_f = weight_norm if use_spectral_norm is False else spectral_norm
318318
self.convs = nn.ModuleList(
319319
[
320320
norm_f(Conv1d(1, 128, 15, 1, padding=7)),

models/tts/naturalspeech2/ns2_dataset.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __init__(self, cfg, dataset, is_valid=False):
3636

3737
self.cfg = cfg
3838

39-
assert cfg.preprocess.use_mel == False
39+
assert cfg.preprocess.use_mel is False
4040
if cfg.preprocess.use_mel:
4141
self.utt2melspec_path = {}
4242
for utt_info in self.metadata:
@@ -52,7 +52,7 @@ def __init__(self, cfg, dataset, is_valid=False):
5252
uid + ".npy",
5353
)
5454

55-
assert cfg.preprocess.use_code == True
55+
assert cfg.preprocess.use_code is True
5656
if cfg.preprocess.use_code:
5757
self.utt2code_path = {}
5858
for utt_info in self.metadata:
@@ -68,7 +68,7 @@ def __init__(self, cfg, dataset, is_valid=False):
6868
uid + ".npy",
6969
)
7070

71-
assert cfg.preprocess.use_spkid == True
71+
assert cfg.preprocess.use_spkid is True
7272
if cfg.preprocess.use_spkid:
7373
self.utt2spkid = {}
7474
for utt_info in self.metadata:
@@ -78,7 +78,7 @@ def __init__(self, cfg, dataset, is_valid=False):
7878

7979
self.utt2spkid[utt] = utt_info["speaker"]
8080

81-
assert cfg.preprocess.use_pitch == True
81+
assert cfg.preprocess.use_pitch is True
8282
if cfg.preprocess.use_pitch:
8383
self.utt2pitch_path = {}
8484
for utt_info in self.metadata:
@@ -94,7 +94,7 @@ def __init__(self, cfg, dataset, is_valid=False):
9494
uid + ".npy",
9595
)
9696

97-
assert cfg.preprocess.use_duration == True
97+
assert cfg.preprocess.use_duration is True
9898
if cfg.preprocess.use_duration:
9999
self.utt2duration_path = {}
100100
for utt_info in self.metadata:
@@ -110,7 +110,7 @@ def __init__(self, cfg, dataset, is_valid=False):
110110
uid + ".npy",
111111
)
112112

113-
assert cfg.preprocess.use_phone == True
113+
assert cfg.preprocess.use_phone is True
114114
if cfg.preprocess.use_phone:
115115
self.utt2phone = {}
116116
for utt_info in self.metadata:
@@ -120,7 +120,7 @@ def __init__(self, cfg, dataset, is_valid=False):
120120

121121
self.utt2phone[utt] = utt_info["phones"]
122122

123-
assert cfg.preprocess.use_len == True
123+
assert cfg.preprocess.use_len is True
124124
if cfg.preprocess.use_len:
125125
self.utt2len = {}
126126
for utt_info in self.metadata:

models/tts/valle/valle_dataset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def __init__(self, cfg, dataset, is_valid=False):
3535

3636
assert isinstance(dataset, str)
3737

38-
assert cfg.preprocess.use_acoustic_token == True
38+
assert cfg.preprocess.use_acoustic_token is True
3939
if cfg.preprocess.use_acoustic_token:
4040
self.utt2acousticToken_path = {}
4141
for utt_info in self.metadata:
@@ -121,7 +121,7 @@ def __init__(self, args, cfg):
121121
super().__init__(args, cfg)
122122

123123
# prepare data
124-
assert cfg.preprocess.use_acoustic_token == True
124+
assert cfg.preprocess.use_acoustic_token is True
125125
if cfg.preprocess.use_acoustic_token:
126126
self.utt2acousticToken = {}
127127
for utt_info in self.metadata:

models/vocoders/gan/discriminator/mpd.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def __init__(self, cfg, period, kernel_size=5, stride=3, use_spectral_norm=False
1919
super(DiscriminatorP, self).__init__()
2020
self.period = period
2121
self.d_mult = cfg.model.mpd.discriminator_channel_mult_factor
22-
norm_f = weight_norm if use_spectral_norm == False else spectral_norm
22+
norm_f = weight_norm if use_spectral_norm is False else spectral_norm
2323
self.convs = nn.ModuleList(
2424
[
2525
norm_f(
@@ -130,7 +130,7 @@ def __init__(self, period, kernel_size=5, stride=3, use_spectral_norm=False):
130130
super(DiscriminatorP_vits, self).__init__()
131131
self.period = period
132132
self.use_spectral_norm = use_spectral_norm
133-
norm_f = weight_norm if use_spectral_norm == False else spectral_norm
133+
norm_f = weight_norm if use_spectral_norm is False else spectral_norm
134134
self.convs = nn.ModuleList(
135135
[
136136
norm_f(
@@ -207,7 +207,7 @@ def forward(self, x):
207207
class DiscriminatorS(torch.nn.Module):
208208
def __init__(self, use_spectral_norm=False):
209209
super(DiscriminatorS, self).__init__()
210-
norm_f = weight_norm if use_spectral_norm == False else spectral_norm
210+
norm_f = weight_norm if use_spectral_norm is False else spectral_norm
211211
self.convs = nn.ModuleList(
212212
[
213213
norm_f(Conv1d(1, 16, 15, 1, padding=7)),

models/vocoders/gan/discriminator/mrd.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def __init__(self, cfg, resolution):
2727
self.lrelu_slope = LRELU_SLOPE
2828

2929
norm_f = (
30-
weight_norm if cfg.model.mrd.use_spectral_norm == False else spectral_norm
30+
weight_norm if cfg.model.mrd.use_spectral_norm is False else spectral_norm
3131
)
3232
if cfg.model.mrd.mrd_override:
3333
print(
@@ -37,7 +37,7 @@ def __init__(self, cfg, resolution):
3737
)
3838
norm_f = (
3939
weight_norm
40-
if cfg.model.mrd.mrd_use_spectral_norm == False
40+
if cfg.model.mrd.mrd_use_spectral_norm is False
4141
else spectral_norm
4242
)
4343
self.d_mult = cfg.model.mrd.discriminator_channel_mult_factor

models/vocoders/gan/discriminator/msd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class DiscriminatorS(nn.Module):
1919
def __init__(self, use_spectral_norm=False):
2020
super(DiscriminatorS, self).__init__()
2121

22-
norm_f = weight_norm if use_spectral_norm == False else spectral_norm
22+
norm_f = weight_norm if use_spectral_norm is False else spectral_norm
2323

2424
self.convs = nn.ModuleList(
2525
[

processors/data_augment.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,10 @@ def wav_manipulation(
278278
], "aug_type must be one of formant_shift, pitch_shift, time_stretch, equalizer"
279279

280280
assert aug_type == "None" or (
281-
formant_shift == False
282-
and pitch_shift == False
283-
and time_stretch == False
284-
and equalizer == False
281+
formant_shift is False
282+
and pitch_shift is False
283+
and time_stretch is False
284+
and equalizer is False
285285
), "if aug_type is specified, other argument must be False"
286286

287287
if aug_type != "None":

utils/f0.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def get_f0_features_using_pyin(audio, cfg):
9191
hop_length=cfg.hop_size,
9292
)
9393
# Set nan to 0
94-
f0[voiced_flag == False] = 0
94+
f0[voiced_flag is False] = 0
9595
return f0
9696

9797

0 commit comments

Comments
 (0)