diff --git a/aiserver.py b/aiserver.py index 36753fbc..fa28033b 100644 --- a/aiserver.py +++ b/aiserver.py @@ -350,8 +350,10 @@ def sendModelSelection(menu="mainmenu"): if menu in ('NeoCustom', 'GPT2Custom'): menu_list = [[folder, menu, "", False] for folder in next(os.walk('./models'))[1]] menu_list.append(["Return to Main Menu", "mainmenu", "", True]) - emit('from_server', {'cmd': 'hide_layer_bar'}, broadcast=True) emit('from_server', {'cmd': 'show_model_menu', 'data': menu_list, 'menu': 'custom'}, broadcast=True) + time.sleep(0.2) + emit('from_server', {'cmd': 'hide_layer_bar'}, broadcast=True) + time.sleep(0.2) else: emit('from_server', {'cmd': 'show_model_menu', 'data': model_menu[menu], 'menu': menu}, broadcast=True) @@ -989,6 +991,7 @@ def load_model(use_gpu=True, key='', gpu_layers=None, initial_load=False): global model global generator global torch + global model_config vars.noai = False if not initial_load: set_aibusy(True) @@ -1618,6 +1621,8 @@ def load_model(use_gpu=True, key='', gpu_layers=None, initial_load=False): import shutil shutil.move(vars.model.replace('/', '_'), "models/{}".format(vars.model.replace('/', '_'))) print("\n", flush=True) + print("At lazy load section") + print(vars.lazy_load) with maybe_use_float16(), torch_lazy_loader.use_lazy_torch_load(enable=vars.lazy_load, callback=get_lazy_load_callback(utils.num_layers(model_config)) if vars.lazy_load else None, dematerialized_modules=True): if(vars.lazy_load): # torch_lazy_loader.py and low_cpu_mem_usage can't be used at the same time lowmem = {} diff --git a/static/application.js b/static/application.js index 3ea36fd0..885c8e9b 100644 --- a/static/application.js +++ b/static/application.js @@ -2513,8 +2513,10 @@ $(document).ready(function(){ } if(msg.menu == 'apilist') { $("#modelkey").removeClass("hidden"); + console.log("Should be showing key"); } else { $("#modelkey").addClass("hidden"); + console.log("Should be hiding key"); } buildLoadModelList(msg.data, msg.menu); } else if(msg.cmd == 'show_layer_bar') { @@ -2529,6 +2531,7 @@ $(document).ready(function(){ $("#gpu_count")[0].value = msg.gpu_count; update_gpu_layers(); } else if(msg.cmd == 'hide_layer_bar') { + console.log("Should be removing layer bar"); $("#modellayers").addClass("hidden"); } else if(msg.cmd == 'check_enable_model_load') { //Check if it's safe to enable the load model button