From b7464582810d0d723c71ac40fcde1a1d05c45587 Mon Sep 17 00:00:00 2001 From: 0cc4m Date: Wed, 26 Apr 2023 18:38:31 +0200 Subject: [PATCH] Use c compiler for opencl files --- Makefile | 2 +- ggml-opencl.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index b056a01d0..e7f0b1b36 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,7 @@ ifdef LLAMA_CLBLAST LDFLAGS += -lclblast -lOpenCL OBJS += ggml-opencl.o ggml-opencl.o: ggml-opencl.c ggml-opencl.h - $(CXX) $(CXXFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@ endif ifdef LLAMA_GPROF CFLAGS += -pg diff --git a/ggml-opencl.c b/ggml-opencl.c index 08e8df811..e4ee289c3 100644 --- a/ggml-opencl.c +++ b/ggml-opencl.c @@ -29,35 +29,35 @@ cl_mem cl_buffer_a, cl_buffer_qb, cl_buffer_b, cl_buffer_c; size_t cl_size_a = 0, cl_size_qb = 0, cl_size_b = 0, cl_size_c = 0; cl_program build_program_from_source(cl_context ctx, cl_device_id dev, const char* program_buffer) { - cl_program program; + cl_program p; char *program_log; size_t program_size, log_size; int err; program_size = strlen(program_buffer); - program = clCreateProgramWithSource(ctx, 1, + p = clCreateProgramWithSource(ctx, 1, (const char**)&program_buffer, &program_size, &err); if(err < 0) { fprintf(stderr, "OpenCL error creating program"); exit(1); } - err = clBuildProgram(program, 0, NULL, NULL, NULL, NULL); + err = clBuildProgram(p, 0, NULL, NULL, NULL, NULL); if(err < 0) { - clGetProgramBuildInfo(program, dev, CL_PROGRAM_BUILD_LOG, + clGetProgramBuildInfo(p, dev, CL_PROGRAM_BUILD_LOG, 0, NULL, &log_size); program_log = (char*) malloc(log_size + 1); program_log[log_size] = '\0'; - clGetProgramBuildInfo(program, dev, CL_PROGRAM_BUILD_LOG, + clGetProgramBuildInfo(p, dev, CL_PROGRAM_BUILD_LOG, log_size + 1, program_log, NULL); printf("%s\n", program_log); free(program_log); exit(1); } - return program; + return p; } void ggml_cl_init(void) {