Revert "Use reentrant generation lock (#6107)"

This reverts commit b675151f25.
This commit is contained in:
oobabooga 2024-06-13 17:53:07 -07:00
parent 8930bfc5f4
commit 9aef01551d

View File

@ -32,7 +32,7 @@ import sys
import time import time
from functools import partial from functools import partial
from pathlib import Path from pathlib import Path
from threading import RLock, Thread from threading import Lock, Thread
import yaml import yaml
@ -243,7 +243,7 @@ if __name__ == "__main__":
if shared.args.lora: if shared.args.lora:
add_lora_to_model(shared.args.lora) add_lora_to_model(shared.args.lora)
shared.generation_lock = RLock() shared.generation_lock = Lock()
if shared.args.idle_timeout > 0: if shared.args.idle_timeout > 0:
timer_thread = Thread(target=unload_model_if_idle) timer_thread = Thread(target=unload_model_if_idle)