From 7cc9fb4fcf728488ddcf4725a396d6a526970ed4 Mon Sep 17 00:00:00 2001 From: wataru Date: Wed, 31 May 2023 20:07:12 +0900 Subject: [PATCH] remove numpy int --- .gitignore | 3 +++ client/demo/dist/assets/gui_settings/edition.txt | 1 - client/demo/public/assets/gui_settings/edition.txt | 1 - server/const.py | 2 +- server/samples_0003_o.json | 10 +++++----- .../RVC/pitchExtractor/CrepePitchExtractor.py | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 01b486a6..a5cca763 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,9 @@ server/weights_/ server/weights__/ server/models/ server/samples.json +server/samples_0003_t.json +server/samples_0003_o.json + start_trainer.sh # venv diff --git a/client/demo/dist/assets/gui_settings/edition.txt b/client/demo/dist/assets/gui_settings/edition.txt index ceffe78a..e69de29b 100644 --- a/client/demo/dist/assets/gui_settings/edition.txt +++ b/client/demo/dist/assets/gui_settings/edition.txt @@ -1 +0,0 @@ -onnxdirectML-cuda diff --git a/client/demo/public/assets/gui_settings/edition.txt b/client/demo/public/assets/gui_settings/edition.txt index ceffe78a..e69de29b 100644 --- a/client/demo/public/assets/gui_settings/edition.txt +++ b/client/demo/public/assets/gui_settings/edition.txt @@ -1 +0,0 @@ -onnxdirectML-cuda diff --git a/server/const.py b/server/const.py index 104296c9..1e993ca1 100644 --- a/server/const.py +++ b/server/const.py @@ -103,7 +103,7 @@ class ServerAudioDeviceTypes(Enum): SAMPLES_JSONS = [ # "https://huggingface.co/wok000/vcclient_model/raw/main/samples_0001.json", # "https://huggingface.co/wok000/vcclient_model/raw/main/samples_0002.json", - # "https://huggingface.co/wok000/vcclient_model/raw/main/samples_0003_t.json", + "https://huggingface.co/wok000/vcclient_model/raw/main/samples_0003_t.json", "https://huggingface.co/wok000/vcclient_model/raw/main/samples_0003_o.json", # "https://huggingface.co/wok000/vcclient_model/raw/main/test/test_official_v1_v2.json", # "https://huggingface.co/wok000/vcclient_model/raw/main/test/test_ddpn_v1_v2.json", diff --git a/server/samples_0003_o.json b/server/samples_0003_o.json index 4a37f64a..678eca11 100644 --- a/server/samples_0003_o.json +++ b/server/samples_0003_o.json @@ -4,7 +4,7 @@ "id": "KikotoKurage_o", "lang": "ja-JP", "tag": ["v2", "onnx"], - "name": "黄琴海月", + "name": "黄琴海月(onnx)", "modelUrl": "https://huggingface.co/wok000/vcclient_model/resolve/main/rvc_v2_alpha/kikoto_kurage/kikoto_kurage_v2_40k_e100_simple.onnx", "indexUrl": "https://huggingface.co/wok000/vcclient_model/resolve/main/rvc_v2_alpha/kikoto_kurage/added_IVF5181_Flat_nprobe_1_v2.index.bin", "termsOfUseUrl": "https://huggingface.co/wok000/vcclient_model/raw/main/rvc_v2_alpha/kikoto_kurage/terms_of_use.txt", @@ -18,7 +18,7 @@ "id": "KikotoMahiro_o", "lang": "ja-JP", "tag": ["v2", "onnx"], - "name": "黄琴まひろ", + "name": "黄琴まひろ(onnx)", "modelUrl": "https://huggingface.co/wok000/vcclient_model/resolve/main/rvc_v2_alpha/kikoto_mahiro/kikoto_mahiro_v2_40k_simple.onnx", "indexUrl": "https://huggingface.co/wok000/vcclient_model/resolve/main/rvc_v2_alpha/kikoto_mahiro/added_IVF6881_Flat_nprobe_1_v2.index.bin", "termsOfUseUrl": "https://huggingface.co/wok000/vcclient_model/raw/main/rvc_v2_alpha/kikoto_mahiro/terms_of_use.txt", @@ -32,7 +32,7 @@ "id": "TokinaShigure_o", "lang": "ja-JP", "tag": ["v2", "onnx"], - "name": "刻鳴時雨", + "name": "刻鳴時雨(onnx)", "modelUrl": "https://huggingface.co/wok000/vcclient_model/resolve/main/rvc_v2_alpha/tokina_shigure/tokina_shigure_v2_40k_e100_simple.onnx", "indexUrl": "https://huggingface.co/wok000/vcclient_model/resolve/main/rvc_v2_alpha/tokina_shigure/added_IVF2736_Flat_nprobe_1_v2.index.bin", "termsOfUseUrl": "https://huggingface.co/wok000/vcclient_model/raw/main/rvc_v2_alpha/tokina_shigure/terms_of_use.txt", @@ -46,7 +46,7 @@ "id": "Amitaro_o", "lang": "ja-JP", "tag": ["v2", "onnx"], - "name": "あみたろ", + "name": "あみたろ(onnx)", "modelUrl": "https://huggingface.co/wok000/vcclient_model/resolve/main/rvc_v2_alpha/amitaro/amitaro_v2_40k_e100_simple.onnx", "indexUrl": "https://huggingface.co/wok000/vcclient_model/resolve/main/rvc_v2_alpha/amitaro/added_IVF3139_Flat_nprobe_1_v2.index.bin", "termsOfUseUrl": "https://huggingface.co/wok000/vcclient_model/raw/main/rvc_v2_alpha/amitaro/terms_of_use.txt", @@ -60,7 +60,7 @@ "id": "Tsukuyomi-chan_o", "lang": "ja-JP", "tag": ["v2", "onnx"], - "name": "つくよみちゃん", + "name": "つくよみちゃん(onnx)", "modelUrl": "https://huggingface.co/wok000/vcclient_model/resolve/main/rvc_v2_alpha/tsukuyomi-chan/tsukuyomi_v2_40k_e100_simple.onnx", "indexUrl": "https://huggingface.co/wok000/vcclient_model/resolve/main/rvc_v2_alpha/tsukuyomi-chan/added_IVF7852_Flat_nprobe_1_v2.index.bin", "termsOfUseUrl": "https://huggingface.co/wok000/vcclient_model/blob/main/rvc_v2_alpha/tsukuyomi-chan/terms_of_use.txt", diff --git a/server/voice_changer/RVC/pitchExtractor/CrepePitchExtractor.py b/server/voice_changer/RVC/pitchExtractor/CrepePitchExtractor.py index 25745867..e3dc74ed 100644 --- a/server/voice_changer/RVC/pitchExtractor/CrepePitchExtractor.py +++ b/server/voice_changer/RVC/pitchExtractor/CrepePitchExtractor.py @@ -54,6 +54,6 @@ class CrepePitchExtractor(PitchExtractor): f0_mel = torch.clip( (f0_mel - f0_mel_min) * 254.0 / (f0_mel_max - f0_mel_min) + 1.0, 1.0, 255.0 ) - f0_coarse = f0_mel.round().detach().cpu().numpy().astype(np.int) + f0_coarse = f0_mel.round().detach().cpu().numpy().astype(int) return f0_coarse, f0bak