Merge branch 'master' into 'master'

Fix the omp_num_threads bug

See merge request !926

mace/core/runtime/cpu/cpu_runtime.cc

@@ -223,7 +223,7 @@ MaceStatus CPURuntime::SetOpenMPThreadsAndAffinityPolicy(
       }
       ++cores_to_use;
     }
-    num_threads_hint = cores_to_use;
+    num_threads_hint = std::min(num_threads_hint, cores_to_use);
   } else {
     cores_to_use = num_threads_hint;
   }