Fix merge

Author: Nexesenex

ggml/src/ggml-cpu/ops.cpp

@@ -7877,7 +7877,7 @@ static void ggml_compute_forward_im2col_3d_f16(
                                             dst_data[iic*KD_KH_KW + ikd * KH_KW + ikh*KW + ikw] = 0;
                                         } else {
                                             const float * const s = (const float *) ((const char *)src_data + iid*nb12 + iih*nb11 + iiw*nb10); // [ID, IH, IW]
-                                            dst_data[iic*KD_KH_KW + ikd * KH_KW + ikh*KW + ikw] = GGML_CPU_FP32_TO_FP16(*s);
+                                            dst_data[iic*KD_KH_KW + ikd * KH_KW + ikh*KW + ikw] = GGML_FP32_TO_FP16(*s);
                                         }
                                     }
                                 }

ggml/src/ggml.c

@@ -1933,7 +1933,7 @@ static const char * GGML_OP_NAME[GGML_OP_COUNT] = {
     "GLU",
 };
 
-static_assert(GGML_OP_COUNT == 90, "GGML_OP_COUNT != 90");
+static_assert(GGML_OP_COUNT == 91, "GGML_OP_COUNT != 91");
 
 static const char * GGML_OP_SYMBOL[GGML_OP_COUNT] = {
     "none",
@@ -2038,7 +2038,7 @@ static const char * GGML_OP_SYMBOL[GGML_OP_COUNT] = {
     "glu(x)",
 };
 
-static_assert(GGML_OP_COUNT == 90, "GGML_OP_COUNT != 90");
+static_assert(GGML_OP_COUNT == 91, "GGML_OP_COUNT != 91");
 
 static_assert(GGML_OP_POOL_COUNT == 2, "GGML_OP_POOL_COUNT != 2");
 

koboldcpp.py

@@ -77,10 +77,10 @@
 # extra_images_max = 4
 
 # global vars
-KcppVersion = "1.99002"
-LcppVersion = "b6365-70"
+KcppVersion = "1.99003"
+LcppVersion = "b6387-75"
 IKLcppVersion = "IKLpr624"
-EsoboldVersion = "RMv1.17.29m"
+EsoboldVersion = "RMv1.17.291m"
 CudaSpecifics = "Cu128_Ar86_SMC2_DmmvX32Y1"
 ReleaseDate = "2025/10/07"
 showdebug = True