From ff67f0347653c35c67ddbafad8dc76bbd868047e Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 03 Dec 2014 16:48:07 +0000
Subject: [PATCH] Starting on server/client
---
src/convolutional_layer.c | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/src/convolutional_layer.c b/src/convolutional_layer.c
index 1587ae8..77e6483 100644
--- a/src/convolutional_layer.c
+++ b/src/convolutional_layer.c
@@ -304,7 +304,7 @@
const size_t global_size[] = {layer.n};
- clEnqueueNDRangeKernel(queue, kernel, 1, 0, global_size, 0, 0, 0, 0);
+ cl.error = clEnqueueNDRangeKernel(queue, kernel, 1, 0, global_size, 0, 0, 0, 0);
check_error(cl);
}
@@ -336,9 +336,9 @@
cl.error = clSetKernelArg(kernel, i++, sizeof(layer.output_cl), (void*) &layer.output_cl);
check_error(cl);
- const size_t global_size[] = {layer.batch, layer.n*size};
+ const size_t global_size[] = {layer.n*size, layer.batch};
- clEnqueueNDRangeKernel(queue, kernel, 2, 0, global_size, 0, 0, 0, 0);
+ cl.error = clEnqueueNDRangeKernel(queue, kernel, 2, 0, global_size, 0, 0, 0, 0);
check_error(cl);
}
@@ -369,11 +369,9 @@
for(i = 0; i < layer.batch; ++i){
cl_mem a = layer.filters_cl;
- cl_mem b = cl_sub_array(layer.col_image_cl, i*k*n, k*n);
- cl_mem c = cl_sub_array(layer.output_cl, i*m*n, m*n);
- gemm_ongpu(0,0,m,n,k,1.,a,k,b,n,1.,c,n);
- clReleaseMemObject(b);
- clReleaseMemObject(c);
+ cl_mem b = layer.col_image_cl;
+ cl_mem c = layer.output_cl;
+ gemm_ongpu_offset(0,0,m,n,k,1.,a,0,k,b,i*k*n,n,1.,c,i*m*n,n);
}
#ifdef TIMEIT
clFinish(cl.queue);
@@ -396,16 +394,12 @@
learn_bias_convolutional_layer_ongpu(layer);
for(i = 0; i < layer.batch; ++i){
- cl_mem a = cl_sub_array(layer.delta_cl,i*m*k, m*k);
- cl_mem b = cl_sub_array(layer.col_image_cl,i*k*n, k*n);
+ cl_mem a = layer.delta_cl;
+ cl_mem b = layer.col_image_cl;
cl_mem c = layer.filter_updates_cl;
- gemm_ongpu(0,1,m,n,k,1,a,k,b,k,1,c,n);
-
- clReleaseMemObject(a);
- clReleaseMemObject(b);
+ gemm_ongpu_offset(0,1,m,n,k,1,a,i*m*k,k,b,i*k*n,k,1,c,0,n);
}
- //cl_read_array(layer.delta_cl, layer.delta, m*k*layer.batch);
if(delta_cl){
m = layer.size*layer.size*layer.c;
@@ -415,12 +409,10 @@
for(i = 0; i < layer.batch; ++i){
cl_mem a = layer.filters_cl;
- cl_mem b = cl_sub_array(layer.delta_cl, i*k*n, k*n);
- cl_mem c = cl_sub_array(layer.col_image_cl, i*m*n, m*n);
+ cl_mem b = layer.delta_cl;
+ cl_mem c = layer.col_image_cl;
- gemm_ongpu(1,0,m,n,k,1,a,m,b,n,0,c,n);
- clReleaseMemObject(b);
- clReleaseMemObject(c);
+ gemm_ongpu_offset(1,0,m,n,k,1,a,0,m,b,i*k*n,n,0,c,i*m*n,n);
}
scal_ongpu(layer.batch*layer.h*layer.w*layer.c,0,delta_cl, 1);
--
Gitblit v1.10.0