remove direct include of cuda_fp16

Author: am17an

ggml/src/ggml-cuda/conv2d-transpose.cu

@@ -1,5 +1,3 @@
-#include <cuda_fp16.h>
-
 #include <algorithm>
 
 #include "conv2d-transpose.cuh"

ggml/src/ggml-cuda/ggml-cuda.cu

@@ -11,11 +11,8 @@
 #include "ggml-cuda/clamp.cuh"
 #include "ggml-cuda/concat.cuh"
 #include "ggml-cuda/conv-transpose-1d.cuh"
-<<<<<<< HEAD
 #include "ggml-cuda/conv2d-dw.cuh"
-=======
 #include "ggml-cuda/conv2d-transpose.cuh"
->>>>>>> a6196ee7 (CUDA: add conv_2d_transpose)
 #include "ggml-cuda/convert.cuh"
 #include "ggml-cuda/count-equal.cuh"
 #include "ggml-cuda/cpy.cuh"
@@ -2315,13 +2312,11 @@ static bool ggml_cuda_compute_forward(ggml_backend_cuda_context & ctx, struct gg
         case GGML_OP_IM2COL:
             ggml_cuda_op_im2col(ctx, dst);
             break;
-<<<<<<< HEAD
         case GGML_OP_CONV_2D_DW:
             ggml_cuda_op_conv2d_dw(ctx, dst);
-=======
+            break;
         case GGML_OP_CONV_TRANSPOSE_2D:
             ggml_cuda_conv_2d_transpose_p0(ctx, dst);
->>>>>>> a6196ee7 (CUDA: add conv_2d_transpose)
             break;
         case GGML_OP_CONV_TRANSPOSE_1D:
             ggml_cuda_op_conv_transpose_1d(ctx,dst);
@@ -3222,11 +3217,8 @@ static bool ggml_backend_cuda_device_supports_op(ggml_backend_dev_t dev, const g
             return op->src[0]->nb[0] == ggml_type_size(op->src[0]->type) && ggml_is_contiguous_2(op->src[0]);
         }
         case GGML_OP_IM2COL:
-<<<<<<< HEAD
         case GGML_OP_CONV_2D_DW:
-=======
         case GGML_OP_CONV_TRANSPOSE_2D:
->>>>>>> a6196ee7 (CUDA: add conv_2d_transpose)
         case GGML_OP_POOL_2D:
         case GGML_OP_SUM:
         case GGML_OP_SUM_ROWS: