From 0f645836f193e75c4c3b718369e6fab15b5d19c5 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 11 Feb 2015 03:41:03 +0000
Subject: [PATCH] Detection is back, baby\!
---
src/activations.c | 56 ++++++++++++++------------------------------------------
1 files changed, 14 insertions(+), 42 deletions(-)
diff --git a/src/activations.c b/src/activations.c
index 04b27c9..48dce87 100644
--- a/src/activations.c
+++ b/src/activations.c
@@ -40,6 +40,13 @@
float relu_activate(float x){return x*(x>0);}
float ramp_activate(float x){return x*(x>0)+.1*x;}
float tanh_activate(float x){return (exp(2*x)-1)/(exp(2*x)+1);}
+//float tanh_activate(float x){return x - (x*x*x)/3;}
+
+float linear_gradient(float x){return 1;}
+float sigmoid_gradient(float x){return (1-x)*x;}
+float relu_gradient(float x){return (x>0);}
+float ramp_gradient(float x){return (x>0)+.1;}
+float tanh_gradient(float x){return 1-x*x;}
float activate(float x, ACTIVATION a)
{
@@ -66,19 +73,19 @@
}
}
-
-float gradient(float x, ACTIVATION a){
+float gradient(float x, ACTIVATION a)
+{
switch(a){
case LINEAR:
- return 1;
+ return linear_gradient(x);
case SIGMOID:
- return (1.-x)*x;
+ return sigmoid_gradient(x);
case RELU:
- return (x>0);
+ return relu_gradient(x);
case RAMP:
- return (x>0) + .1;
+ return ramp_gradient(x);
case TANH:
- return 1-x*x;
+ return tanh_gradient(x);
}
return 0;
}
@@ -91,38 +98,3 @@
}
}
-#ifdef GPU
-
-#include "opencl.h"
-#include <math.h>
-
-cl_kernel get_activation_kernel()
-{
- static int init = 0;
- static cl_kernel kernel;
- if(!init){
- kernel = get_kernel("src/activations.cl", "activate_array", 0);
- init = 1;
- }
- return kernel;
-}
-
-
-void activate_array_ongpu(cl_mem x, int n, ACTIVATION a)
-{
- cl_setup();
- cl_kernel kernel = get_activation_kernel();
- cl_command_queue queue = cl.queue;
-
- cl_uint i = 0;
- cl.error = clSetKernelArg(kernel, i++, sizeof(x), (void*) &x);
- cl.error = clSetKernelArg(kernel, i++, sizeof(n), (void*) &n);
- cl.error = clSetKernelArg(kernel, i++, sizeof(a), (void*) &a);
- check_error(cl);
-
- size_t gsize = n;
-
- clEnqueueNDRangeKernel(queue, kernel, 1, 0, &gsize, 0, 0, 0, 0);
- check_error(cl);
-}
-#endif
--
Gitblit v1.10.0