vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

opencl: fix compiler warnings with GCC and Clang

Browse source 
Still getting the warning about clCreateCmdQueue being obsolete.
Will fix that separately.
This commit is contained in:
Max Krasnyansky 2024-12-12 12:31:55 -08:00
parent 3bc085b359
commit c971a1885d
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ggml/src/ggml-opencl/ggml-opencl.cpp
View file

@ -1,8 +1,10 @@
#define CL_TARGET_OPENCL_VERSION 220 #define CL_TARGET_OPENCL_VERSION 220
// suppress warnings in CL headers for GCC and Clang // suppress warnings in CL headers for GCC and Clang
#pragma GCC diagnostic ignored "-Wgnu-anonymous-struct"
#pragma GCC diagnostic ignored "-Woverlength-strings" #pragma GCC diagnostic ignored "-Woverlength-strings"
#ifdef __clang__
#pragma GCC diagnostic ignored "-Wgnu-anonymous-struct"
#endif
#include "ggml-opencl.h" #include "ggml-opencl.h"
#include "ggml-backend.h" #include "ggml-backend.h"
@ -1163,9 +1165,7 @@ static void * ggml_backend_opencl_buffer_get_base(ggml_backend_buffer_t buffer)
static void ggml_backend_opencl_buffer_init_tensor(ggml_backend_buffer_t buffer, ggml_tensor * tensor) { static void ggml_backend_opencl_buffer_init_tensor(ggml_backend_buffer_t buffer, ggml_tensor * tensor) {
ggml_backend_opencl_buffer_context * ctx = (ggml_backend_opencl_buffer_context *) buffer->context; ggml_backend_opencl_buffer_context * ctx = (ggml_backend_opencl_buffer_context *) buffer->context;
ggml_backend_opencl_context * backend_ctx = ggml_cl2_init(buffer->buft->device);
(ggml_backend_opencl_context *)ggml_cl2_init(buffer->buft->device);
cl_context context = backend_ctx->context;
if (tensor->view_src != nullptr) { if (tensor->view_src != nullptr) {
GGML_ASSERT(tensor->view_src->buffer->buft == buffer->buft); GGML_ASSERT(tensor->view_src->buffer->buft == buffer->buft);
@ -3604,8 +3604,9 @@ static void ggml_cl_soft_max(ggml_backend_t backend, const ggml_tensor * src0, c
const int ne02 = src0 ? src0->ne[2] : 0; const int ne02 = src0 ? src0->ne[2] : 0;
const int ne03 = src0 ? src0->ne[3] : 0; const int ne03 = src0 ? src0->ne[3] : 0;
const float scale = ((float *) dst->op_params)[0]; float scale, max_bias;
const float max_bias = ((float *) dst->op_params)[1]; memcpy(&scale, dst->op_params + 0, sizeof(float));
memcpy(&max_bias, dst->op_params + 1, sizeof(float));
const int nrows_x = ggml_nrows(src0); const int nrows_x = ggml_nrows(src0);
const int nrows_y = src0->ne[1]; const int nrows_y = src0->ne[1];
@ -3845,10 +3846,6 @@ bool ggml_cl_compute_forward(ggml_backend_t backend, struct ggml_tensor * tensor
func = ggml_cl_cpy; func = ggml_cl_cpy;
break; break;
case GGML_OP_DUP: case GGML_OP_DUP:
if (!any_on_device) {
return false;
}
func = ggml_cl_dup;
case GGML_OP_CONT: case GGML_OP_CONT:
if (!any_on_device) { if (!any_on_device) {
return false; return false;