Merge pull request #1110 from codeWorm2015/opencl

 update fusion conv

src/operators/kernel/cl/cl_kernel/cl_common.h

@@ -12,11 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#pragma once;
-
 #pragma OPENCL EXTENSION cl_khr_fp16 : enable
 
-inline hafl4 activation(half4 in
+inline half4 activation(half4 in
 #ifdef PRELU
                         ,
                         half4 prelu_alpha
@@ -28,7 +26,7 @@ inline hafl4 activation(half4 in
 #endif
 
 #ifdef RELU
-  fmax(in, 0.0);
+  output = fmax(in, (half4)(0.0f));
 #endif
   return output;
 }

src/operators/kernel/cl/cl_kernel/conv_add_bn_relu_kernel.cl

@@ -12,10 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#pragma OPENCL EXTENSION cl_khr_fp16 : enable
 
 #define BIASE
 #define BATCH_NORM
+#define RELU
+
+#include "cl_kernel/cl_common.h"
 
 __kernel void conv_3x3(__private const int global_size_dim0,
                                               __private const int global_size_dim1,