From e49c0dad74f1fb03d7bae79484d533e7b3035fe6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 15:46:07 +0900 Subject: [PATCH] chore(format): run black on dev (#2102) Co-authored-by: github-actions[bot] --- configs/config.py | 1 + infer-web.py | 10 ++++++++-- infer/lib/train/utils.py | 3 +++ infer/modules/vc/hash.py | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/configs/config.py b/configs/config.py index d0daf41..ac5ed4f 100644 --- a/configs/config.py +++ b/configs/config.py @@ -263,6 +263,7 @@ class Config: ) return x_pad, x_query, x_center, x_max + @singleton_variable class CPUConfig: def __init__(self): diff --git a/infer-web.py b/infer-web.py index 21b0224..be63f00 100644 --- a/infer-web.py +++ b/infer-web.py @@ -664,7 +664,11 @@ def train_index(exp_dir1, version19): for i in range(0, big_npy.shape[0], batch_size_add): index.add(big_npy[i : i + batch_size_add]) index_save_path = "%s/added_IVF%s_Flat_nprobe_%s_%s_%s.index" % ( - exp_dir, n_ivf, index_ivf.nprobe, exp_dir1, version19 + exp_dir, + n_ivf, + index_ivf.nprobe, + exp_dir1, + version19, ) faiss.write_index(index, index_save_path) infos.append(i18n("成功构建索引到") + " " + index_save_path) @@ -1640,11 +1644,13 @@ with gr.Blocks(title="RVC WebUI") as app: try: import signal + def cleanup(signum, frame): signame = signal.Signals(signum).name - print(f'Got signal {signame} ({signum})') + print(f"Got signal {signame} ({signum})") app.close() sys.exit(0) + signal.signal(signal.SIGINT, cleanup) signal.signal(signal.SIGTERM, cleanup) if config.iscolab: diff --git a/infer/lib/train/utils.py b/infer/lib/train/utils.py index 4e5df2a..8b00ab7 100644 --- a/infer/lib/train/utils.py +++ b/infer/lib/train/utils.py @@ -66,6 +66,7 @@ def load_checkpoint_d(checkpoint_path, combd, sbd, optimizer=None, load_opt=1): return model, optimizer, learning_rate, iteration """ + def load_checkpoint(checkpoint_path, model, optimizer=None, load_opt=1): assert os.path.isfile(checkpoint_path) checkpoint_dict = torch.load(checkpoint_path, map_location="cpu") @@ -130,6 +131,7 @@ def save_checkpoint(model, optimizer, learning_rate, iteration, checkpoint_path) checkpoint_path, ) + """ def save_checkpoint_d(combd, sbd, optimizer, learning_rate, iteration, checkpoint_path): logger.info( @@ -157,6 +159,7 @@ def save_checkpoint_d(combd, sbd, optimizer, learning_rate, iteration, checkpoin ) """ + def summarize( writer, global_step, diff --git a/infer/modules/vc/hash.py b/infer/modules/vc/hash.py index 30b09e8..15de924 100644 --- a/infer/modules/vc/hash.py +++ b/infer/modules/vc/hash.py @@ -27,18 +27,22 @@ class TorchSeedContext: half_hash_len = 512 expand_factor = 65536 * 8 + @singleton_variable def original_audio_storage(): return np.load(pathlib.Path(__file__).parent / "lgdsng.npz") + @singleton_variable def original_audio(): return original_audio_storage()["a"] + @singleton_variable def original_audio_time_minus(): return original_audio_storage()["t"] + @singleton_variable def original_audio_freq_minus(): return original_audio_storage()["f"]