vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix for config file loading. from kcpp settings file

Browse source
This commit is contained in:
Concedo 2023-08-24 15:45:33 +08:00
parent a3b9949626
commit 598d4d89ab
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
koboldcpp.py
View file

@ -1577,10 +1577,15 @@ def main(launch_args,start_server=True):
args = launch_args args = launch_args
embedded_kailite = None embedded_kailite = None
if args.config: if args.config:
with open(args.config, 'r') as f: if isinstance(args.config, str) and os.path.exists(args.config):
config = json.load(f) with open(args.config, 'r') as f:
for key, value in config.items(): config = json.load(f)
setattr(args, key, value) for key, value in config.items():
setattr(args, key, value)
else:
print("Specified kcpp config file invalid or not found.")
time.sleep(2)
sys.exit(2)
if not args.model_param: if not args.model_param:
args.model_param = args.model args.model_param = args.model
if not args.model_param: if not args.model_param:
@ -1730,7 +1735,7 @@ if __name__ == '__main__':
parser.add_argument("--host", help="Host IP to listen on. If empty, all routable interfaces are accepted.", default="") parser.add_argument("--host", help="Host IP to listen on. If empty, all routable interfaces are accepted.", default="")
parser.add_argument("--launch", help="Launches a web browser when load is completed.", action='store_true') parser.add_argument("--launch", help="Launches a web browser when load is completed.", action='store_true')
parser.add_argument("--lora", help="LLAMA models only, applies a lora file on top of model. Experimental.", metavar=('[lora_filename]', '[lora_base]'), nargs='+') parser.add_argument("--lora", help="LLAMA models only, applies a lora file on top of model. Experimental.", metavar=('[lora_filename]', '[lora_base]'), nargs='+')
parser.add_argument("--config", help="Load settings from a .kcpps file. Other arguments will be ignored", nargs="?") parser.add_argument("--config", help="Load settings from a .kcpps file. Other arguments will be ignored", type=str, nargs='?')
physical_core_limit = 1 physical_core_limit = 1
if os.cpu_count()!=None and os.cpu_count()>1: if os.cpu_count()!=None and os.cpu_count()>1:
physical_core_limit = int(os.cpu_count()/2) physical_core_limit = int(os.cpu_count()/2)