fix merge

Author: Nexesenex

ggml/src/ggml-cpu/ops.cpp

@@ -8074,7 +8074,7 @@ static void ggml_compute_forward_conv_3d_impl(const ggml_compute_params * params
                             if (kernel_type == GGML_TYPE_F32) {
                                 *(float *)element_ptr = src_val;
                             } else if (kernel_type == GGML_TYPE_F16) {
-                                *(ggml_fp16_t *)element_ptr = GGML_CPU_FP32_TO_FP16(src_val);
+                                *(ggml_fp16_t *)element_ptr = GGML_FP32_TO_FP16(src_val);
                             }
                         }
                     }

ggml/src/ggml.c

@@ -1932,7 +1932,7 @@ static const char * GGML_OP_NAME[GGML_OP_COUNT] = {
     "GLU",
 };
 
-static_assert(GGML_OP_COUNT == 89, "GGML_OP_COUNT != 89");
+static_assert(GGML_OP_COUNT == 90, "GGML_OP_COUNT != 90");
 
 static const char * GGML_OP_SYMBOL[GGML_OP_COUNT] = {
     "none",
@@ -2036,7 +2036,7 @@ static const char * GGML_OP_SYMBOL[GGML_OP_COUNT] = {
     "glu(x)",
 };
 
-static_assert(GGML_OP_COUNT == 89, "GGML_OP_COUNT != 89");
+static_assert(GGML_OP_COUNT == 90, "GGML_OP_COUNT != 90");
 
 static_assert(GGML_OP_POOL_COUNT == 2, "GGML_OP_POOL_COUNT != 2");
 
@@ -8357,4 +8357,4 @@ struct ggml_tensor * ggml_upscale_linear(
 
     return result;
 }
-//// end kcpp dirtypatch ////
+//// end kcpp dirtypatch ////

koboldcpp.py

@@ -78,7 +78,7 @@
 
 # global vars
 KcppVersion = "1.98100"
-LcppVersion = "b6267-40"
+LcppVersion = "b6267-50"
 IKLcppVersion = "IKLpr624"
 EsoboldVersion = "RMv1.15.9m"
 CudaSpecifics = "Cu128_Ar86_SMC2_DmmvX32Y1"