Faster narration generation w/low vram

Moved the memory management of the TTS model into the narrator so that it doesnt shift the model backwards and forwards VRAM<>System ram on each portion of the generation. Only the beginning and end. Only benefits when Low VRAM is enabled, but should shave a few seconds of generation of your average generation.
This commit is contained in:
erew123 authored and GitHub committed 2024-05-01 16:09:59 +01:00
1 parent 9f18b24465
commit a1b889108f
1 file changed
+25 -13
+25 -13
View File
@@ -476,6 +476,11 @@ async def deepspeed(request: Request, new_deepspeed_value: bool):
######################## ########################
#### TTS GENERATION #### #### TTS GENERATION ####
######################## ########################
debug_generate_audio = False
tts_stop_generation = False # Called to stop generation of the current text at whatever stage its at. currently only set for streaming.
tts_generation_lock = False # Tracks locking of the generaetion process.
tts_narrator_generatingtts = False # Tracks if the current tts processes are narrator based, to avoid moving model on each chunk of text generated.
# Not in use tts_queue_behaviour = False # True is to queue the current generation request. False is to cancel the current generation and start a new one.
# TTS VOICE GENERATION METHODS (called from voice_preview and output_modifer) # TTS VOICE GENERATION METHODS (called from voice_preview and output_modifer)
async def generate_audio(text, voice, language, temperature, repetition_penalty, output_file, streaming=False): async def generate_audio(text, voice, language, temperature, repetition_penalty, output_file, streaming=False):
@@ -487,11 +492,10 @@ async def generate_audio(text, voice, language, temperature, repetition_penalty,
async for _ in response: async for _ in response:
pass pass
stop_generation = False
async def generate_audio_internal(text, voice, language, temperature, repetition_penalty, output_file, streaming): async def generate_audio_internal(text, voice, language, temperature, repetition_penalty, output_file, streaming):
global model global model, tts_stop_generation, tts_generation_lock
global stop_generation tts_generation_lock = True
if params["low_vram"] and device == "cpu": if params["low_vram"] and device == "cpu":
await switch_device() await switch_device()
generate_start_time = time.time() # Record the start time of generating TTS generate_start_time = time.time() # Record the start time of generating TTS
@@ -542,10 +546,11 @@ async def generate_audio_internal(text, voice, language, temperature, repetition
yield wav_buf.read() yield wav_buf.read()
for i, chunk in enumerate(output): for i, chunk in enumerate(output):
if stop_generation: if tts_stop_generation:
print(f"[{params['branding']}TTSGen] Stopping audio generation.") print(f"[{params['branding']}TTSGen] Stopping audio generation.")
file_chunks.clear() # Clear the file_chunks list file_chunks.clear() # Clear the file_chunks list
stop_generation = False tts_stop_generation = False
tts_generation_lock = False
break break
file_chunks.append(chunk) file_chunks.append(chunk)
if isinstance(chunk, list): if isinstance(chunk, list):
@@ -555,8 +560,7 @@ async def generate_audio_internal(text, voice, language, temperature, repetition
chunk = np.clip(chunk, -1, 1) chunk = np.clip(chunk, -1, 1)
chunk = (chunk * 32767).astype(np.int16) chunk = (chunk * 32767).astype(np.int16)
yield chunk.tobytes() yield chunk.tobytes()
#if streaming_debug: print(f"[{params['branding']}Debug] Stream audio generation: Yielded audio chunk {i}.") if debug_generate_audio else None
# print(f"Stream audio generation: Yielded audio chunk {i}.")
else: else:
# Non-streaming-specific operation # Non-streaming-specific operation
torchaudio.save(output_file, torch.tensor(output["wav"]).unsqueeze(0), 24000) torchaudio.save(output_file, torch.tensor(output["wav"]).unsqueeze(0), 24000)
@@ -599,12 +603,11 @@ async def generate_audio_internal(text, voice, language, temperature, repetition
# Print Generation time and settings # Print Generation time and settings
generate_end_time = time.time() # Record the end time to generate TTS generate_end_time = time.time() # Record the end time to generate TTS
generate_elapsed_time = generate_end_time - generate_start_time generate_elapsed_time = generate_end_time - generate_start_time
print( print(f"[{params['branding']}TTSGen] \033[93m{generate_elapsed_time:.2f} seconds. \033[94mLowVRAM: \033[33m{params['low_vram']} \033[94mDeepSpeed: \033[33m{params['deepspeed_activate']}\033[0m")
f"[{params['branding']}TTSGen] \033[93m{generate_elapsed_time:.2f} seconds. \033[94mLowVRAM: \033[33m{params['low_vram']} \033[94mDeepSpeed: \033[33m{params['deepspeed_activate']}\033[0m"
)
# Move model back to cpu system ram if needed. # Move model back to cpu system ram if needed.
if params["low_vram"] and device == "cuda": if params["low_vram"] and device == "cuda" and tts_narrator_generatingtts == False:
await switch_device() await switch_device()
tts_generation_lock = False
return return
@@ -866,8 +869,9 @@ async def tts_generate_streaming(request: Request, text: str = Form(...), voice:
@app.put("/api/stop-generation") @app.put("/api/stop-generation")
async def stop_generation_endpoint(): async def stop_generation_endpoint():
global stop_generation global tts_stop_generation, tts_generation_lock
stop_generation = True if tts_generation_lock and not tts_stop_generation:
tts_stop_generation = True
return {"message": "Generation stopped"} return {"message": "Generation stopped"}
############################## ##############################
@@ -1045,6 +1049,7 @@ async def tts_generate(
"autoplay_volume": autoplay_volume, "autoplay_volume": autoplay_volume,
"streaming": streaming, "streaming": streaming,
} }
global tts_narrator_generatingtts
JSONresult = TTSGenerator.validate_json_input(json_input_data) JSONresult = TTSGenerator.validate_json_input(json_input_data)
if JSONresult is None: if JSONresult is None:
pass pass
@@ -1052,6 +1057,9 @@ async def tts_generate(
print(f"[{params['branding']}API] \033[91mError with API request:\033[0m", JSONresult) print(f"[{params['branding']}API] \033[91mError with API request:\033[0m", JSONresult)
return JSONResponse(content={"error": JSONresult}, status_code=400) return JSONResponse(content={"error": JSONresult}, status_code=400)
if narrator_enabled: if narrator_enabled:
if params["low_vram"] and device == "cpu":
await switch_device()
tts_narrator_generatingtts = True
processed_parts = process_text(text_input) processed_parts = process_text(text_input)
audio_files_all_paragraphs = [] audio_files_all_paragraphs = []
for part_type, part in processed_parts: for part_type, part in processed_parts:
@@ -1085,6 +1093,10 @@ async def tts_generate(
audio_files_all_paragraphs.append(audio_path) audio_files_all_paragraphs.append(audio_path)
# Combine audio files across paragraphs # Combine audio files across paragraphs
output_file_path, output_file_url, output_cache_url = combine(output_file_timestamp, output_file_name, audio_files_all_paragraphs) output_file_path, output_file_url, output_cache_url = combine(output_file_timestamp, output_file_name, audio_files_all_paragraphs)
tts_narrator_generatingtts = False
# Move model back to cpu system ram if needed.
if params["low_vram"] and device == "cuda":
await switch_device()
else: else:
if output_file_timestamp: if output_file_timestamp:
timestamp = int(time.time()) timestamp = int(time.time())