removed openblas backend, merged into CPU (with llamafile for BLAS). GPU backend is now automatically selected when running from CLI unless noblas is specified.

This commit is contained in:
Concedo 2024-09-15 19:21:52 +08:00
parent 01c7d82185
commit 53bf0fb32d
14 changed files with 115 additions and 159 deletions

View file

@ -97,9 +97,9 @@ class model_backend(InferenceModel):
"menu_path": "",
"refresh_model_inputs": False,
"extra_classes": "",
'children': [{'text': 'Use No BLAS', 'value': 0}, {'text': 'Use OpenBLAS', 'value': 1}, {'text': 'Use CuBLAS', 'value': 2},
{'text': 'Use CLBLast GPU #1', 'value': 3},{'text': 'Use CLBLast GPU #2', 'value': 4},{'text': 'Use CLBLast GPU #3', 'value': 5}
,{'text': 'NoAVX2 Mode (Old CPU)', 'value': 6},{'text': 'Failsafe Mode (Old CPU)', 'value': 7},{'text': 'Use Vulkan GPU #1', 'value': 8},{'text': 'Use Vulkan GPU #2', 'value': 9}],
'children': [{'text': 'Use No BLAS', 'value': 0}, {'text': 'Use CuBLAS', 'value': 1},
{'text': 'Use CLBLast GPU #1', 'value': 2},{'text': 'Use CLBLast GPU #2', 'value': 3},{'text': 'Use CLBLast GPU #3', 'value': 4}
,{'text': 'NoAVX2 Mode (Old CPU)', 'value': 5},{'text': 'Failsafe Mode (Old CPU)', 'value': 6},{'text': 'Use Vulkan GPU #1', 'value': 7},{'text': 'Use Vulkan GPU #2', 'value': 8}],
})
requested_parameters.append({
"uitype": "text",
@ -238,24 +238,22 @@ class model_backend(InferenceModel):
if accel==0:
self.kcpp_noblas = True
elif accel==1:
pass
elif accel==2:
self.kcpp_usecublas = ["normal"]
elif accel==3:
elif accel==2:
self.kcpp_useclblast = [0,0]
elif accel==4:
elif accel==3:
self.kcpp_useclblast = [1,0]
elif accel==5:
elif accel==4:
self.kcpp_useclblast = [0,1]
elif accel==6:
elif accel==5:
self.kcpp_noavx2 = True
elif accel==7:
elif accel==6:
self.kcpp_noavx2 = True
self.kcpp_noblas = True
self.kcpp_nommap = True
elif accel==8:
elif accel==7:
self.kcpp_usevulkan = [0]
elif accel==9:
elif accel==8:
self.kcpp_usevulkan = [1]
pass