From e36182cd8c5dd5c6d0aa1f77cf5cdca87e8bb1f0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 21 Nov 2014 23:35:19 +0000
Subject: [PATCH] cleaned up data parsing a lot. probably nothing broken?
---
src/opencl.c | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/src/opencl.c b/src/opencl.c
index fc7310c..981067a 100644
--- a/src/opencl.c
+++ b/src/opencl.c
@@ -4,18 +4,23 @@
#include <string.h>
#include <time.h>
#include <unistd.h>
-//#include <clBLAS.h>
+
+#ifdef CLBLAS
+#include <clBLAS.h>
+#endif
#include "opencl.h"
#include "utils.h"
+#include "activations.h"
cl_info cl = {0};
void check_error(cl_info info)
{
- clFinish(cl.queue);
+ // clFinish(cl.queue);
if (info.error != CL_SUCCESS) {
printf("\n Error number %d", info.error);
+ abort();
exit(1);
}
}
@@ -69,6 +74,8 @@
printf(" DEVICE_MAX_CLOCK_FREQUENCY = %u\n", (unsigned int)buf_uint);
clGetDeviceInfo(devices[i], CL_DEVICE_GLOBAL_MEM_SIZE, sizeof(buf_ulong), &buf_ulong, NULL);
printf(" DEVICE_GLOBAL_MEM_SIZE = %llu\n", (unsigned long long)buf_ulong);
+ clGetDeviceInfo(devices[i], CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof(buf_ulong), &buf_ulong, NULL);
+ printf(" DEVICE_MAX_MEM_ALLOC_SIZE = %llu\n", (unsigned long long)buf_ulong);
clGetDeviceInfo(devices[i], CL_DEVICE_MAX_WORK_GROUP_SIZE, sizeof(buf_ulong), &buf_ulong, NULL);
printf(" DEVICE_MAX_WORK_GROUP_SIZE = %llu\n", (unsigned long long)buf_ulong);
cl_uint items;
@@ -81,7 +88,7 @@
}
int index = getpid()%num_devices;
- index = 1;
+ index = 0;
printf("%d rand, %d devices, %d index\n", getpid(), num_devices, index);
info.device = devices[index];
fprintf(stderr, "Found %d device(s)\n", num_devices);
@@ -95,24 +102,14 @@
check_error(info);
info.queue = clCreateCommandQueue(info.context, info.device, 0, &info.error);
check_error(info);
- for(i = 0; i < NUM_QUEUES; ++i){
- info.queues[i] = clCreateCommandQueue(info.context, info.device, 0, &info.error);
- check_error(info);
- }
- //info.error = clblasSetup();
+ #ifdef CLBLAS
+ info.error = clblasSetup();
+ #endif
check_error(info);
info.initialized = 1;
return info;
}
-void wait_for_queues()
-{
- int i;
- for(i = 0; i < NUM_QUEUES; ++i){
- clFinish(cl.queues[i]);
- }
-}
-
cl_program cl_fprog(char *filename, char *options, cl_info info)
{
size_t srcsize;
@@ -158,21 +155,31 @@
void cl_read_array(cl_mem mem, float *x, int n)
{
cl_setup();
- clEnqueueReadBuffer(cl.queue, mem, CL_TRUE, 0, sizeof(float)*n,x,0,0,0);
+ cl.error = clEnqueueReadBuffer(cl.queue, mem, CL_TRUE, 0, sizeof(float)*n,x,0,0,0);
check_error(cl);
}
+float cl_checksum(cl_mem mem, int n)
+{
+
+ float *x = calloc(n, sizeof(float));
+ cl_read_array(mem, x, n);
+ float sum = sum_array(x, n);
+ free(x);
+ return sum;
+}
+
void cl_write_array(cl_mem mem, float *x, int n)
{
cl_setup();
- clEnqueueWriteBuffer(cl.queue, mem, CL_TRUE, 0,sizeof(float)*n,x,0,0,0);
+ cl.error = clEnqueueWriteBuffer(cl.queue, mem, CL_TRUE, 0,sizeof(float)*n,x,0,0,0);
check_error(cl);
}
void cl_copy_array(cl_mem src, cl_mem dst, int n)
{
cl_setup();
- clEnqueueCopyBuffer(cl.queue, src, dst, 0, 0, sizeof(float)*n,0,0,0);
+ cl.error = clEnqueueCopyBuffer(cl.queue, src, dst, 0, 0, sizeof(float)*n,0,0,0);
check_error(cl);
}
@@ -186,6 +193,7 @@
return sub;
}
+
cl_mem cl_make_array(float *x, int n)
{
cl_setup();
@@ -193,6 +201,7 @@
CL_MEM_READ_WRITE|CL_MEM_COPY_HOST_PTR,
sizeof(float)*n, x, &cl.error);
check_error(cl);
+ activate_array_ongpu(mem, n, LINEAR);
return mem;
}
--
Gitblit v1.10.0