Merge branch 'master' into v.1.5.3

This commit is contained in:
w-okada 2023-08-26 16:48:44 +09:00
commit f40056bed3
3 changed files with 69 additions and 31 deletions

View File

@ -32,7 +32,13 @@
"source": [ "source": [
"# このノートブックは管理されていません。\n", "# このノートブックは管理されていません。\n",
"# VCClientをColabで使用する場合は、次のートブックをご使用ください。\n", "# VCClientをColabで使用する場合は、次のートブックをご使用ください。\n",
"https://github.com/w-okada/voice-changer/blob/master/Realtime_Voice_Changer_on_Colab.ipynb" "\n",
"# This notebook is not being managed.\n",
"# If you're using VCClient in Colab, please use the following notebook.\n",
"\n",
"https://github.com/w-okada/voice-changer/blob/master/Realtime_Voice_Changer_on_Colab.ipynb\n",
"\n",
"\n"
], ],
"metadata": { "metadata": {
"id": "_41LkcbiwUFK" "id": "_41LkcbiwUFK"

View File

@ -7,9 +7,26 @@
"colab_type": "text" "colab_type": "text"
}, },
"source": [ "source": [
"<a href=\"https://colab.research.google.com/github/w-okada/voice-changer/blob/dev/SoftVcDemo.ipynb\" target=\"_parent\"><img src=\"https://colab.research.google.com/assets/colab-badge.svg\" alt=\"Open In Colab\"/></a>" "<a href=\"https://colab.research.google.com/github/w-okada/voice-changer/blob/master/SoftVcDemo.ipynb\" target=\"_parent\"><img src=\"https://colab.research.google.com/assets/colab-badge.svg\" alt=\"Open In Colab\"/></a>"
] ]
}, },
{
"cell_type": "markdown",
"source": [
"# このノートブックは管理されていません。\n",
"# VCClientをColabで使用する場合は、次のートブックをご使用ください。\n",
"\n",
"# This notebook is not being managed.\n",
"# If you're using VCClient in Colab, please use the following notebook.\n",
"\n",
"https://github.com/w-okada/voice-changer/blob/master/Realtime_Voice_Changer_on_Colab.ipynb\n",
"\n",
"\n"
],
"metadata": {
"id": "NOiKHadoysaB"
}
},
{ {
"cell_type": "markdown", "cell_type": "markdown",
"source": [ "source": [
@ -32,7 +49,7 @@
"cell_type": "markdown", "cell_type": "markdown",
"source": [ "source": [
"# Check GPU\n", "# Check GPU\n",
"GPU is required for soft-vc. Confirm GPU is assigned. " "GPU is required for soft-vc. Confirm GPU is assigned."
], ],
"metadata": { "metadata": {
"id": "s4nKpd5ArRky" "id": "s4nKpd5ArRky"
@ -41,7 +58,7 @@
{ {
"cell_type": "code", "cell_type": "code",
"source": [ "source": [
"# (1) Confirm GPU \n", "# (1) Confirm GPU\n",
"!nvidia-smi" "!nvidia-smi"
], ],
"metadata": { "metadata": {
@ -51,7 +68,7 @@
"base_uri": "https://localhost:8080/" "base_uri": "https://localhost:8080/"
} }
}, },
"execution_count": 1, "execution_count": null,
"outputs": [ "outputs": [
{ {
"output_type": "stream", "output_type": "stream",
@ -84,7 +101,7 @@
{ {
"cell_type": "markdown", "cell_type": "markdown",
"source": [ "source": [
"# Install and import modules \n", "# Install and import modules\n",
"Install required modules.\n" "Install required modules.\n"
], ],
"metadata": { "metadata": {
@ -105,7 +122,7 @@
"base_uri": "https://localhost:8080/" "base_uri": "https://localhost:8080/"
} }
}, },
"execution_count": 2, "execution_count": null,
"outputs": [ "outputs": [
{ {
"output_type": "stream", "output_type": "stream",
@ -152,7 +169,7 @@
"metadata": { "metadata": {
"id": "eCb2j68vsqxB" "id": "eCb2j68vsqxB"
}, },
"execution_count": 3, "execution_count": null,
"outputs": [] "outputs": []
}, },
{ {
@ -167,7 +184,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 4, "execution_count": null,
"metadata": { "metadata": {
"id": "WO8XzrFMZGoj", "id": "WO8XzrFMZGoj",
"colab": { "colab": {
@ -308,7 +325,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 5, "execution_count": null,
"metadata": { "metadata": {
"colab": { "colab": {
"base_uri": "https://localhost:8080/" "base_uri": "https://localhost:8080/"
@ -350,7 +367,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 6, "execution_count": null,
"metadata": { "metadata": {
"id": "8-z9j4e_j-Wb", "id": "8-z9j4e_j-Wb",
"outputId": "e7cd3270-42dd-4f6c-912c-cdb0718c04cf", "outputId": "e7cd3270-42dd-4f6c-912c-cdb0718c04cf",
@ -426,7 +443,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 7, "execution_count": null,
"metadata": { "metadata": {
"id": "-iPiSzvAepCl" "id": "-iPiSzvAepCl"
}, },
@ -439,7 +456,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 10, "execution_count": null,
"metadata": { "metadata": {
"colab": { "colab": {
"base_uri": "https://localhost:8080/" "base_uri": "https://localhost:8080/"
@ -506,7 +523,7 @@
"height": 34 "height": 34
} }
}, },
"execution_count": 11, "execution_count": null,
"outputs": [ "outputs": [
{ {
"output_type": "stream", "output_type": "stream",
@ -530,9 +547,8 @@
"metadata": { "metadata": {
"accelerator": "GPU", "accelerator": "GPU",
"colab": { "colab": {
"collapsed_sections": [],
"provenance": [], "provenance": [],
"authorship_tag": "ABX9TyNIoYdRE9rtKaA9+L9JwdPZ", "authorship_tag": "ABX9TyPplIZOpDSd6hZqbrwRvhm8",
"include_colab_link": true "include_colab_link": true
}, },
"gpuClass": "standard", "gpuClass": "standard",

View File

@ -4,8 +4,7 @@
"metadata": { "metadata": {
"colab": { "colab": {
"provenance": [], "provenance": [],
"collapsed_sections": [], "authorship_tag": "ABX9TyMgL73lmseS7jsiBW+SSenN",
"authorship_tag": "ABX9TyP6Wv8fttT+X2Op6MmqB/kg",
"include_colab_link": true "include_colab_link": true
}, },
"kernelspec": { "kernelspec": {
@ -25,9 +24,26 @@
"colab_type": "text" "colab_type": "text"
}, },
"source": [ "source": [
"<a href=\"https://colab.research.google.com/github/w-okada/voice-changer/blob/dev/VoiceRecorder.ipynb\" target=\"_parent\"><img src=\"https://colab.research.google.com/assets/colab-badge.svg\" alt=\"Open In Colab\"/></a>" "<a href=\"https://colab.research.google.com/github/w-okada/voice-changer/blob/master/VoiceRecorder.ipynb\" target=\"_parent\"><img src=\"https://colab.research.google.com/assets/colab-badge.svg\" alt=\"Open In Colab\"/></a>"
] ]
}, },
{
"cell_type": "markdown",
"source": [
"# このノートブックは管理されていません。\n",
"# VCClientをColabで使用する場合は、次のートブックをご使用ください。\n",
"\n",
"# This notebook is not being managed.\n",
"# If you're using VCClient in Colab, please use the following notebook.\n",
"\n",
"https://github.com/w-okada/voice-changer/blob/master/Realtime_Voice_Changer_on_Colab.ipynb\n",
"\n",
"\n"
],
"metadata": {
"id": "1ixPDugV0EA2"
}
},
{ {
"cell_type": "markdown", "cell_type": "markdown",
"source": [ "source": [
@ -84,7 +100,7 @@
"id": "Eihm8H2X-7wm", "id": "Eihm8H2X-7wm",
"outputId": "76331fb1-5ef8-40e6-a381-258b5e425853" "outputId": "76331fb1-5ef8-40e6-a381-258b5e425853"
}, },
"execution_count": 1, "execution_count": null,
"outputs": [ "outputs": [
{ {
"output_type": "stream", "output_type": "stream",
@ -105,7 +121,7 @@
"metadata": { "metadata": {
"id": "nSXATMWYb4Ik" "id": "nSXATMWYb4Ik"
}, },
"execution_count": 2, "execution_count": null,
"outputs": [] "outputs": []
}, },
{ {
@ -132,7 +148,7 @@
"id": "86wTFmqsNMnD", "id": "86wTFmqsNMnD",
"outputId": "40471833-d720-41c9-f4a7-ac15fbf18e14" "outputId": "40471833-d720-41c9-f4a7-ac15fbf18e14"
}, },
"execution_count": 3, "execution_count": null,
"outputs": [ "outputs": [
{ {
"output_type": "stream", "output_type": "stream",
@ -179,7 +195,7 @@
"metadata": { "metadata": {
"id": "ow88ZaubluOJ" "id": "ow88ZaubluOJ"
}, },
"execution_count": 4, "execution_count": null,
"outputs": [] "outputs": []
}, },
{ {
@ -196,7 +212,7 @@
"id": "rpWUobjlBCNF", "id": "rpWUobjlBCNF",
"outputId": "285e0259-16af-4932-e78b-bec94f337e9c" "outputId": "285e0259-16af-4932-e78b-bec94f337e9c"
}, },
"execution_count": 5, "execution_count": null,
"outputs": [ "outputs": [
{ {
"output_type": "stream", "output_type": "stream",
@ -256,7 +272,7 @@
"id": "LwZAAuqxX7yY", "id": "LwZAAuqxX7yY",
"outputId": "ea2b3b39-d571-4d47-a38b-d0e657a335cd" "outputId": "ea2b3b39-d571-4d47-a38b-d0e657a335cd"
}, },
"execution_count": 6, "execution_count": null,
"outputs": [ "outputs": [
{ {
"output_type": "stream", "output_type": "stream",
@ -290,9 +306,9 @@
"source": [ "source": [
"# サーバの起動\n", "# サーバの起動\n",
"\n", "\n",
"サーバを起動します。(5-1) \n", "サーバを起動します。(5-1)\n",
"\n", "\n",
"サーバの起動状況を確認します。(5-2) \n", "サーバの起動状況を確認します。(5-2)\n",
"\n", "\n",
"このセルは繰り返し実行することになるのでCtrl+Retでセルを実行してください。\n", "このセルは繰り返し実行することになるのでCtrl+Retでセルを実行してください。\n",
"\n", "\n",
@ -329,7 +345,7 @@
"metadata": { "metadata": {
"id": "iNOAB7zISI6J" "id": "iNOAB7zISI6J"
}, },
"execution_count": 7, "execution_count": null,
"outputs": [] "outputs": []
}, },
{ {
@ -345,7 +361,7 @@
"id": "chu06KpAjEK6", "id": "chu06KpAjEK6",
"outputId": "6f5cbed9-65a7-4570-f58a-5447e402947c" "outputId": "6f5cbed9-65a7-4570-f58a-5447e402947c"
}, },
"execution_count": 10, "execution_count": null,
"outputs": [ "outputs": [
{ {
"output_type": "stream", "output_type": "stream",
@ -396,7 +412,7 @@
}, },
"outputId": "7d2664b8-945c-4ee6-b49f-51f7f96cf388" "outputId": "7d2664b8-945c-4ee6-b49f-51f7f96cf388"
}, },
"execution_count": 11, "execution_count": null,
"outputs": [ "outputs": [
{ {
"output_type": "display_data", "output_type": "display_data",
@ -516,7 +532,7 @@
"for chara in data_setting:\n", "for chara in data_setting:\n",
" chara_root_dir = os.path.join(MMVC_DATA_DIR, chara[3])\n", " chara_root_dir = os.path.join(MMVC_DATA_DIR, chara[3])\n",
" os.makedirs(chara_root_dir, exist_ok=True)\n", " os.makedirs(chara_root_dir, exist_ok=True)\n",
" \n", "\n",
" chara_text_dir = os.path.join(chara_root_dir, \"text\")\n", " chara_text_dir = os.path.join(chara_root_dir, \"text\")\n",
" os.makedirs(chara_text_dir, exist_ok=True)\n", " os.makedirs(chara_text_dir, exist_ok=True)\n",
" chara_wav_dir = os.path.join(chara_root_dir, \"wav\")\n", " chara_wav_dir = os.path.join(chara_root_dir, \"wav\")\n",