Merge branch 'fix_cpu_openmp' into 'master'

Fix Android OpenMP does not work issue

See merge request !479

mace/tools/validation/BUILD

@@ -4,7 +4,7 @@ load("//mace:mace.bzl", "if_openmp_enabled", "if_android")
 cc_binary(
     name = "mace_run",
     srcs = ["mace_run.cc"],
-    copts = if_openmp_enabled(["-fopenmp"]) + if_android([
+    copts = if_android([
         "-DMACE_ENABLE_OPENCL",
     ]),
     linkopts = if_openmp_enabled(["-fopenmp"]),

mace/tools/validation/mace_run.cc

@@ -386,7 +386,6 @@ int Main(int argc, char **argv) {
   }
 
   bool ret = false;
-#pragma omp parallel for
   for (int i = 0; i < FLAGS_restart_round; ++i) {
     VLOG(0) << "restart round " << i;
     ret =