Merge branch 'master' of v9.git.n.xiaomi.com:deep-computing/mace into...

Merge branch 'master' of v9.git.n.xiaomi.com:deep-computing/mace into compatible_with_opencl_1.1_and_1.2

.gitlab-ci.yml

 stages:
+  - cpplint
   - ops_test
   - ops_benchmark
-  - cpplint
 
 cpplint:
   stage: cpplint
-  only:
-    - master
   script:
     - curl -o cpplint.py https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py
     - python cpplint.py --linelength=80 --counting=detailed $(find mace -name *.h -or -name *.cc)
 
 ops_test:
   stage: ops_test
-  only:
-    - master
   script:
     - FAILURE_PATTERN="FAILED\|Aborted" tools/bazel-adb-run.sh //mace/ops:ops_test
 
 ops_benchmark:
   stage: ops_benchmark
-  only:
-    - master
   script:
     - FAILURE_PATTERN="Aborted" tools/bazel-adb-run.sh //mace/ops:ops_benchmark --pattern=.*CONV.*

mace/core/testing/test_benchmark_main.cc

@@ -7,6 +7,7 @@
 #include "gflags/gflags.h"
 #include "mace/core/testing/test_benchmark.h"
 #include "mace/public/mace.h"
+#include "mace/public/mace_runtime.h"
 
 DEFINE_string(pattern, "all", "op benchmark pattern, eg:.*CONV.*");
 DEFINE_int32(gpu_perf_hint, 3, "0:DEFAULT/1:LOW/2:NORMAL/3:HIGH");