Merge pull request opencv#9284 from ipuustin:dnn-opencl-fixes

alalek · alalek · commit bab4bc0968db · 2017-08-01T13:06:01.000Z
diff --git a/modules/dnn/src/opencl/activations.cl b/modules/dnn/src/opencl/activations.cl
@@ -21,13 +21,13 @@ __kernel void TanHForward(const int count, __global T* in, __global T* out) {
 __kernel void SigmoidForward(const int count, __global const T* in, __global T* out) {
   int index = get_global_id(0);
   if(index < count)
-  out[index] = 1. / (1. + exp(-in[index]));
+  out[index] = 1.0f / (1.0f + exp(-in[index]));
 }
 
 __kernel void BNLLForward(const int n, __global const T* in, __global T* out) {
   int index = get_global_id(0);
   if (index < n) {
-    out[index] = in[index] > 0 ? in[index] + log(1. + exp(-in[index])) : log(1. + exp(in[index]));
+    out[index] = in[index] > 0 ? in[index] + log(1.0f + exp(-in[index])) : log(1.0f + exp(in[index]));
   }
 }
 
@@ -41,4 +41,4 @@ __kernel void PowForward(const int n, __global const T* in, __global T* out, con
   int index = get_global_id(0);
   if (index < n)
     out[index] = pow(shift + scale * in[index], power);
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,13 @@ __kernel void TanHForward(const int count, __global T* in, __global T* out) {`
`21`	`21`	`__kernel void SigmoidForward(const int count, __global const T* in, __global T* out) {`
`22`	`22`	`int index = get_global_id(0);`
`23`	`23`	`if(index < count)`
`24`		`- out[index] = 1. / (1. + exp(-in[index]));`
	`24`	`+ out[index] = 1.0f / (1.0f + exp(-in[index]));`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`__kernel void BNLLForward(const int n, __global const T* in, __global T* out) {`
`28`	`28`	`int index = get_global_id(0);`
`29`	`29`	`if (index < n) {`
`30`		`- out[index] = in[index] > 0 ? in[index] + log(1. + exp(-in[index])) : log(1. + exp(in[index]));`
	`30`	`+ out[index] = in[index] > 0 ? in[index] + log(1.0f + exp(-in[index])) : log(1.0f + exp(in[index]));`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -41,4 +41,4 @@ __kernel void PowForward(const int n, __global const T* in, __global T* out, con`
`41`	`41`	`int index = get_global_id(0);`
`42`	`42`	`if (index < n)`
`43`	`43`	`out[index] = pow(shift + scale * in[index], power);`
`44`		`-}`
	`44`	`+}`