fix bug: cl on Mi Note3, dana, ci script

N/A
Signed-off-by: NLuxuhui <luxuhui@xiaomi.com>

.gitlab-ci.yml

@@ -60,13 +60,6 @@ bazel_build:
   only:
     - triggers
 
-cmake_build:
-  stage: build
-  script:
-    - sh tools/cmake-build-standalone-lib.sh
-  only:
-    - triggers
-
 build_android_demo:
   stage: build
   script:

mace/ops/opencl/cl/lpnorm.cl

@@ -65,12 +65,11 @@ __kernel void lpnorm(OUT_OF_RANGE_PARAMS
 
   const int chan_blks = global_size_dim0;
   const int width = global_size_dim1;
-  const int hb = global_size_dim2;
+  const int pos = mad24(chan_blk_idx, width, width_idx);
+  DATA_TYPE4 in_data = READ_IMAGET(input, SAMPLER, (int2)(pos, hb_idx));
   const int hb_base = mul24(hb_idx / height, height);
   DATA_TYPE4 total = compute_total(input, hb_base, chan_blks, width, height,
                                    hb_idx, chan_blk_idx);
-  const int pos = mad24(chan_blk_idx, width, width_idx);
-  DATA_TYPE4 in_data = READ_IMAGET(input, SAMPLER, (int2)(pos, hb_idx));
 
 #if PARAM_P == 1
     in_data = in_data / (total + eps);

mace/ops/opencl/cl/mvnorm.cl

@@ -51,12 +51,12 @@ __kernel void mvnorm_mean(OUT_OF_RANGE_PARAMS
   const int chan_blks = global_size_dim0;
   const int width = global_size_dim1;
 
-  DATA_TYPE4 mean = compute_mean_image(input, width_idx,
-                                       hb_idx, chan_blks, height, width);
   const int pos = mad24(chan_blk_idx, width, width_idx);
   DATA_TYPE4 in_data = READ_IMAGET(input, SAMPLER, (int2)(pos, hb_idx));
-  in_data -= mean;
 
+  DATA_TYPE4 mean = compute_mean_image(input, width_idx,
+                                       hb_idx, chan_blks, height, width);
+  in_data -= mean;
   WRITE_IMAGET(output, (int2)(pos, hb_idx), in_data);
 }
 
@@ -80,10 +80,10 @@ __kernel void mvnorm_vn_step1(OUT_OF_RANGE_PARAMS
   const int chan_blks = global_size_dim0;
   const int width = global_size_dim1;
 
-  DATA_TYPE4 mean = compute_mean_image(input, width_idx,
-                                       hb_idx, chan_blks, height, width);
   const int pos = mad24(chan_blk_idx, width, width_idx);
   DATA_TYPE4 in_data = READ_IMAGET(input, SAMPLER, (int2)(pos, hb_idx));
+  DATA_TYPE4 mean = compute_mean_image(input, width_idx,
+                                       hb_idx, chan_blks, height, width);
   in_data = in_data - mean;
   DATA_TYPE4 pow_data  = in_data * in_data;
   if (hb_idx == 0 && width_idx == 0) {

tools/dana/dana_cli.py

@@ -179,7 +179,7 @@ class DanaCli:
         except Exception as e:
             print("Http error, url=%s\npost_data=%s\n%s" %
                   (request_url, json_data, e))
-            exit(1)
+            return False
         result = response.decode()
         if len(result) < 30 and "successfull" in result:
             return True