Merge pull request #7 from Tencent/restyled/pull-1871

Restyled/pull 1871

Author: Timen

src/layer/x86/convolution_x86.cpp

@@ -632,7 +632,7 @@ int Convolution_x86::forward(const Mat& bottom_blob, Mat& top_blob, const Option
                 activation->forward_inplace(top_blob, opt);
             }
         }
-        
+
         else if (kernel_w == 3 && kernel_h == 3 && dilation_w == 1 && dilation_h == 1 && stride_w == 1 && stride_h == 1)
         {
             if (opt.use_fp16_storage)

src/layer/x86/innerproduct_x86.cpp

@@ -469,7 +469,8 @@ int InnerProduct_x86::forward_fp16(const Mat& bottom_blob, Mat& top_blob,
                 w6 += 8;
                 w7 += 8;
             }
-            if (remain != 0){
+            if (remain != 0)
+            {
                 unsigned short fp16_weights[8][8] = {{0}};
                 float _m_f[8] = {0};
                 int i = 0;
@@ -523,8 +524,6 @@ int InnerProduct_x86::forward_fp16(const Mat& bottom_blob, Mat& top_blob,
                 __m256 _w7 = loadfp16(fp16_weights[7]);
                 _sum7 = _mm256_fmadd_ps(_m, _w7, _sum7);
             }
-            
-
         }
         __m256 _sums = HorizontalSums(_sum0, _sum1, _sum2, _sum3, _sum4, _sum5,
                                       _sum6, _sum7);
@@ -591,7 +590,8 @@ int InnerProduct_x86::forward_fp16(const Mat& bottom_blob, Mat& top_blob,
                 w2 += 8;
                 w3 += 8;
             }
-            if (remain != 0){
+            if (remain != 0)
+            {
                 unsigned short fp16_weights[4][8] = {{0}};
                 float _m_f[8] = {0};
                 int i = 0;
@@ -660,7 +660,8 @@ int InnerProduct_x86::forward_fp16(const Mat& bottom_blob, Mat& top_blob,
                 m += 8;
                 w += 8;
             }
-            if (remain != 0){
+            if (remain != 0)
+            {
                 unsigned short fp16_weights[8] = {0};
                 float _m_f[8] = {0};
                 int i = 0;
@@ -676,7 +677,6 @@ int InnerProduct_x86::forward_fp16(const Mat& bottom_blob, Mat& top_blob,
 
                 __m256 _w = loadfp16(fp16_weights);
                 _sum = _mm256_fmadd_ps(_m, _w, _sum);
-
             }
         }