From 7d1936adad9f862fc5c084c9c49686a88472eaa5 Mon Sep 17 00:00:00 2001 From: mrq Date: Mon, 20 Feb 2023 23:12:53 +0000 Subject: [PATCH] actually cleaned the notebook --- notebook.ipynb | 77 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 14 deletions(-) diff --git a/notebook.ipynb b/notebook.ipynb index cb019a8..3b68b1c 100755 --- a/notebook.ipynb +++ b/notebook.ipynb @@ -54,7 +54,9 @@ "!python -m pip install -r ./dlas/requirements.txt\n", "!python -m pip install -r ./tortoise-tts/requirements.txt\n", "!python -m pip install -r ./requirements.txt\n", - "!python -m pip install -e ./tortoise-tts/" + "!python -m pip install -e ./tortoise-tts/\n", + "\n", + "!rm ./tortoise-tts/{main,webui}.py" ] }, { @@ -71,8 +73,7 @@ "source":[ "# for my debugging purposes\n", "%cd /content/ai-voice-cloning/\n", - "!./update.sh\n", - "# exit()" + "!./update.sh" ], "metadata":{ "id":"3DktoOXSHmtw" @@ -122,7 +123,7 @@ { "cell_type":"markdown", "source":[ - "## Running" + "## Running (Inlined)" ], "metadata":{ "id":"o1gkfw3B3JSk" @@ -138,8 +139,10 @@ "import sys\n", "\n", "sys.argv = [\"\"]\n", - "sys.path.append('./src/')\n", - "sys.path.append('./tortoise-tts/')\n", + "if './src/' not in sys.path:\n", + "\tsys.path.append('./src/')\n", + "if './tortoise-tts/' not in sys.path:\n", + "\tsys.path.append('./tortoise-tts/')\n", "\n", "if 'TORTOISE_MODELS_DIR' not in os.environ:\n", "\tos.environ['TORTOISE_MODELS_DIR'] = os.path.realpath(os.path.join(os.getcwd(), './models/tortoise/'))\n", @@ -147,18 +150,18 @@ "if 'TRANSFORMERS_CACHE' not in os.environ:\n", "\tos.environ['TRANSFORMERS_CACHE'] = os.path.realpath(os.path.join(os.getcwd(), './models/transformers/'))\n", "\n", - "from utils import *\n", - "from webui import *\n", + "import utils\n", + "import webui\n", "\n", - "args = setup_args()\n", - "\n", - "webui = setup_gradio()\n", + "args = utils.setup_args()\n", + "ui = webui.setup_gradio()\n", "# Be very, very sure to check \"Defer TTS Load\" in Settings, then restart, before you start training\n", "# You'll crash the runtime if you don't\n", "if not args.defer_tts_load:\n", - "\ttts = setup_tortoise()\n", - "webui.launch(share=True, prevent_thread_lock=True, height=1000)\n", - "webui.block_thread()" + "\tutils.setup_tortoise()\n", + "\n", + "ui.launch(share=True, prevent_thread_lock=True, height=1000)\n", + "ui.block_thread()" ], "metadata":{ "id":"c_EQZLTA19c7" @@ -168,6 +171,52 @@ ] }, + { + "cell_type":"markdown", + "source":[ + "## Running (non-inlined)" + ], + "metadata":{ + "id":"EM3iNqgJF6Be" + } + }, + { + "cell_type":"code", + "source":[ + "%cd /content/ai-voice-cloning/\n", + "!./start.sh" + ], + "metadata":{ + "id":"QRA8jF3cF-YJ" + }, + "execution_count":null, + "outputs":[ + + ] + }, + { + "cell_type":"markdown", + "source":[ + "# Restart Runtime" + ], + "metadata":{ + "id":"vH9KU7SMGDxb" + } + }, + { + "cell_type":"code", + "source":[ + "!rm ./tortoise-tts/{main,webui}.py\n", + "exit()" + ], + "metadata":{ + "id":"EWeyUPvgGDX5" + }, + "execution_count":null, + "outputs":[ + + ] + }, { "cell_type":"markdown", "source":[