Merge pull request #69 from matoro/main (#1165)

Fix gpulayers autodetection for cublas & clblast backends
This commit is contained in:
YellowRoseCx 2024-10-14 08:10:41 -04:00 committed by GitHub
parent efc6939294
commit f029de6e46
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -4088,7 +4088,7 @@ def main(launch_args,start_server=True):
fetch_gpu_properties(False,True,True) fetch_gpu_properties(False,True,True)
pass pass
if args.gpulayers==-1: if args.gpulayers==-1:
if MaxMemory[0] > 0 and (not args.usecpu) and (args.usecublas or (args.usevulkan is not None) or args.useclblast or sys.platform=="darwin"): if MaxMemory[0] > 0 and (not args.usecpu) and ((args.usecublas is not None) or (args.usevulkan is not None) or (args.useclblast is not None) or sys.platform=="darwin"):
extract_modelfile_params(args.model_param,args.sdmodel,args.whispermodel,args.mmproj) extract_modelfile_params(args.model_param,args.sdmodel,args.whispermodel,args.mmproj)
layeramt = autoset_gpu_layers(args.contextsize,args.sdquant,args.blasbatchsize) layeramt = autoset_gpu_layers(args.contextsize,args.sdquant,args.blasbatchsize)
print(f"Auto Recommended GPU Layers: {layeramt}") print(f"Auto Recommended GPU Layers: {layeramt}")