Remove unnecessary shared.previous_model_name variable

Touch-Night · Jul 29, 2024 · 9dcff21 · 9dcff21
1 parent addcb52
commit 9dcff21
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/modules/logits.py b/modules/logits.py
@@ -13,8 +13,8 @@
 
 
 def get_next_logits(*args, **kwargs):
-    if shared.args.idle_timeout > 0 and shared.model is None and shared.previous_model_name not in [None, 'None']:
-        shared.model, shared.tokenizer = load_model(shared.previous_model_name)
+    if shared.args.idle_timeout > 0 and shared.model is None and shared.model_name not in [None, 'None']:
+        shared.model, shared.tokenizer = load_model(shared.model_name)
 
     needs_lock = not args[2]  # use_samplers
     if needs_lock:

diff --git a/modules/models.py b/modules/models.py
@@ -370,7 +370,6 @@ def clear_torch_cache():
 
 def unload_model(keep_model_name=False):
     shared.model = shared.tokenizer = None
-    shared.previous_model_name = shared.model_name
     shared.lora_names = []
     shared.model_dirty_from_training = False
     clear_torch_cache()

diff --git a/modules/shared.py b/modules/shared.py
@@ -13,7 +13,6 @@
 model = None
 tokenizer = None
 model_name = 'None'
-previous_model_name = 'None'
 is_seq2seq = False
 model_dirty_from_training = False
 lora_names = []

diff --git a/modules/text_generation.py b/modules/text_generation.py
@@ -32,8 +32,8 @@
 
 
 def generate_reply(*args, **kwargs):
-    if shared.args.idle_timeout > 0 and shared.model is None and shared.previous_model_name not in [None, 'None']:
-        shared.model, shared.tokenizer = load_model(shared.previous_model_name)
+    if shared.args.idle_timeout > 0 and shared.model is None and shared.model_name not in [None, 'None']:
+        shared.model, shared.tokenizer = load_model(shared.model_name)
 
     shared.generation_lock.acquire()
     try: