@@ -103,6 +103,7 @@ def pick_existant_file(ntoption,nonntoption):
103103lib_noavx2 = pick_existant_file ("koboldcpp_noavx2.dll" ,"koboldcpp_noavx2.so" )
104104lib_clblast = pick_existant_file ("koboldcpp_clblast.dll" ,"koboldcpp_clblast.so" )
105105lib_cublas = pick_existant_file ("koboldcpp_cublas.dll" ,"koboldcpp_cublas.so" )
106+ lib_hipblas = pick_existant_file ("koboldcpp_hipblas.dll" ,"koboldcpp_hipblas.so" )
106107
107108
108109def init_library ():
@@ -113,6 +114,7 @@ def init_library():
113114 use_openblas = False # if true, uses OpenBLAS for acceleration. libopenblas.dll must exist in the same dir.
114115 use_clblast = False #uses CLBlast instead
115116 use_cublas = False #uses cublas instead
117+ use_hipblas = False #uses hipblas instead
116118 use_noavx2 = False #uses no avx2 instructions
117119 use_failsafe = False #uses no intrinsics, failsafe mode
118120 if args .noavx2 :
@@ -131,11 +133,16 @@ def init_library():
131133 print ("Attempting to use CLBlast library for faster prompt ingestion. A compatible clblast will be required." )
132134 use_clblast = True
133135 elif (args .usecublas is not None ):
134- if not file_exists (lib_cublas ):
136+ if not file_exists (lib_cublas ) and not file_exists ( lib_hipblas ) :
135137 print ("Warning: CuBLAS library file not found. Non-BLAS library will be used." )
136138 else :
137- print ("Attempting to use CuBLAS library for faster prompt ingestion. A compatible CuBLAS will be required." )
138- use_cublas = True
139+ if file_exists (lib_cublas ):
140+ print ("Attempting to use CuBLAS library for faster prompt ingestion. A compatible CuBLAS will be required." )
141+ use_cublas = True
142+ elif file_exists (lib_hipblas ):
143+ print ("Attempting to use hipBLAS library for faster prompt ingestion. A compatible AMD GPU will be required." )
144+ use_hipblas = True
145+
139146 else :
140147 if not file_exists (lib_openblas ) or (os .name == 'nt' and not file_exists ("libopenblas.dll" )):
141148 print ("Warning: OpenBLAS library file not found. Non-BLAS library will be used." )
@@ -157,6 +164,8 @@ def init_library():
157164 libname = lib_clblast
158165 elif use_cublas :
159166 libname = lib_cublas
167+ elif use_hipblas :
168+ libname = lib_hipblas
160169 elif use_openblas :
161170 libname = lib_openblas
162171 else :
@@ -766,10 +775,11 @@ def show_new_gui():
766775 (lib_openblas , "Use OpenBLAS" ),
767776 (lib_clblast , "Use CLBlast" ),
768777 (lib_cublas , "Use CuBLAS" ),
778+ (lib_hipblas , "Use hipBLAS (ROCm)" ),
769779 (lib_default , "Use No BLAS" ),
770780 (lib_noavx2 , "NoAVX2 Mode (Old CPU)" ),
771781 (lib_failsafe , "Failsafe Mode (Old CPU)" )]
772- openblas_option , clblast_option , cublas_option , default_option , noavx2_option , failsafe_option = (opt if file_exists (lib ) or (os .name == 'nt' and file_exists (opt + ".dll" )) else None for lib , opt in lib_option_pairs )
782+ openblas_option , clblast_option , cublas_option , hipblas_option , default_option , noavx2_option , failsafe_option = (opt if file_exists (lib ) or (os .name == 'nt' and file_exists (opt + ".dll" )) else None for lib , opt in lib_option_pairs )
773783 # slider data
774784 blasbatchsize_values = ["-1" , "32" , "64" , "128" , "256" , "512" , "1024" , "2048" ]
775785 blasbatchsize_text = ["Don't Batch BLAS" ,"32" ,"64" ,"128" ,"256" ,"512" ,"1024" ,"2048" ]
@@ -922,15 +932,15 @@ def setup_backend_tooltip(parent):
922932
923933 def changerunmode (a ,b ,c ):
924934 index = runopts_var .get ()
925- if index == "Use CLBlast" or index == "Use CuBLAS" :
935+ if index == "Use CLBlast" or index == "Use CuBLAS" or index == "Use hipBLAS (ROCm)" :
926936 gpu_selector_label .grid (row = 3 , column = 0 , padx = 8 , pady = 1 , stick = "nw" )
927937 quick_gpu_selector_label .grid (row = 3 , column = 0 , padx = 8 , pady = 1 , stick = "nw" )
928938 if index == "Use CLBlast" :
929939 gpu_selector_box .grid (row = 3 , column = 1 , padx = 8 , pady = 1 , stick = "nw" )
930940 quick_gpu_selector_box .grid (row = 3 , column = 1 , padx = 8 , pady = 1 , stick = "nw" )
931941 if gpu_choice_var .get ()== "All" :
932942 gpu_choice_var .set ("1" )
933- elif index == "Use CuBLAS" :
943+ elif index == "Use CuBLAS" or index == "Use hipBLAS (ROCm)" :
934944 CUDA_gpu_selector_box .grid (row = 3 , column = 1 , padx = 8 , pady = 1 , stick = "nw" )
935945 CUDA_quick_gpu_selector_box .grid (row = 3 , column = 1 , padx = 8 , pady = 1 , stick = "nw" )
936946 else :
@@ -941,7 +951,7 @@ def changerunmode(a,b,c):
941951 quick_gpu_selector_box .grid_forget ()
942952 CUDA_quick_gpu_selector_box .grid_forget ()
943953
944- if index == "Use CuBLAS" :
954+ if index == "Use CuBLAS" or index == "Use hipBLAS (ROCm)" :
945955 lowvram_box .grid (row = 4 , column = 0 , padx = 8 , pady = 1 , stick = "nw" )
946956 quick_lowvram_box .grid (row = 4 , column = 0 , padx = 8 , pady = 1 , stick = "nw" )
947957 mmq_box .grid (row = 4 , column = 1 , padx = 8 , pady = 1 , stick = "nw" )
@@ -952,7 +962,7 @@ def changerunmode(a,b,c):
952962 mmq_box .grid_forget ()
953963 quick_mmq_box .grid_forget ()
954964
955- if index == "Use CLBlast" or index == "Use CuBLAS" :
965+ if index == "Use CLBlast" or index == "Use CuBLAS" or index == "Use hipBLAS (ROCm)" :
956966 gpu_layers_label .grid (row = 5 , column = 0 , padx = 8 , pady = 1 , stick = "nw" )
957967 gpu_layers_entry .grid (row = 5 , column = 1 , padx = 8 , pady = 1 , stick = "nw" )
958968 quick_gpu_layers_label .grid (row = 5 , column = 0 , padx = 8 , pady = 1 , stick = "nw" )
@@ -1147,7 +1157,7 @@ def export_vars():
11471157 gpuchoiceidx = int (gpu_choice_var .get ())- 1
11481158 if runopts_var .get () == "Use CLBlast" :
11491159 args .useclblast = [[0 ,0 ], [1 ,0 ], [0 ,1 ], [1 ,1 ]][gpuchoiceidx ]
1150- if runopts_var .get () == "Use CuBLAS" :
1160+ if runopts_var .get () == "Use CuBLAS" or runopts_var . get () == "Use hipBLAS (ROCm)" :
11511161 if gpu_choice_var .get ()== "All" :
11521162 args .usecublas = ["lowvram" ] if lowvram_var .get () == 1 else ["normal" ]
11531163 else :
@@ -1204,8 +1214,11 @@ def import_vars(dict):
12041214 runopts_var .set (clblast_option )
12051215 gpu_choice_var .set (str (["0 0" , "1 0" , "0 1" , "1 1" ].index (str (dict ["useclblast" ][0 ]) + " " + str (dict ["useclblast" ][1 ])) + 1 ))
12061216 elif "usecublas" in dict and dict ["usecublas" ]:
1207- if cublas_option is not None :
1208- runopts_var .set (cublas_option )
1217+ if cublas_option is not None or hipblas_option is not None :
1218+ if cublas_option :
1219+ runopts_var .set (cublas_option )
1220+ elif hipblas_option :
1221+ runopts_var .set (cublas_option )
12091222 lowvram_var .set (1 if "lowvram" in dict ["usecublas" ] else 0 )
12101223 mmq_var .set (1 if "mmq" in dict ["usecublas" ] else 0 )
12111224 gpu_choice_var .set ("All" )
0 commit comments