rixty
/
KoboldAI-Client
mirror of https://github.com/KoboldAI/KoboldAI-Client.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'refs/pull/180/head' of https://github.com/ebolam/KoboldAI into united

This commit is contained in:
ebolam 2022-09-27 19:29:05 -04:00
parent be719a7e5e 52e120c706
commit 4aa842eada
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
aiserver.py
View File

@ -1566,10 +1566,12 @@ def get_layer_count(model, directory=""):
model_config = AutoConfig.from_pretrained(directory, revision=vars.revision, cache_dir="cache") model_config = AutoConfig.from_pretrained(directory, revision=vars.revision, cache_dir="cache")
else: else:
model_config = AutoConfig.from_pretrained(model, revision=vars.revision, cache_dir="cache") model_config = AutoConfig.from_pretrained(model, revision=vars.revision, cache_dir="cache")
try:
if ((utils.HAS_ACCELERATE and model_config.model_type != 'gpt2') or model_config.model_type in ("gpt_neo", "gptj", "xglm", "opt")) and not vars.nobreakmodel: if ((utils.HAS_ACCELERATE and model_config.model_type != 'gpt2') or model_config.model_type in ("gpt_neo", "gptj", "xglm", "opt")) and not vars.nobreakmodel:
return utils.num_layers(model_config) return utils.num_layers(model_config)
else: else:
return None
except:
return None return None
else: else:
return None return None
@ -2229,7 +2231,7 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
loadmodelsettings() loadmodelsettings()
loadsettings() loadsettings()
logger.init("GPU support", status="Searching") logger.init("GPU support", status="Searching")
vars.hascuda = torch.cuda.is_available() vars.hascuda = torch.cuda.is_available() and not args.cpu
vars.bmsupported = ((utils.HAS_ACCELERATE and vars.model_type != 'gpt2') or vars.model_type in ("gpt_neo", "gptj", "xglm", "opt")) and not vars.nobreakmodel vars.bmsupported = ((utils.HAS_ACCELERATE and vars.model_type != 'gpt2') or vars.model_type in ("gpt_neo", "gptj", "xglm", "opt")) and not vars.nobreakmodel
if(args.breakmodel is not None and args.breakmodel): if(args.breakmodel is not None and args.breakmodel):
logger.warning("--breakmodel is no longer supported. Breakmodel mode is now automatically enabled when --breakmodel_gpulayers is used (see --help for details).") logger.warning("--breakmodel is no longer supported. Breakmodel mode is now automatically enabled when --breakmodel_gpulayers is used (see --help for details).")