Merge branch 'cpu-bug' into 'master'

Fix bug: load opencl so when run on cpu.

See merge request !360

mace/core/mace.cc

@@ -176,7 +176,9 @@ MaceStatus MaceEngine::Impl::Run(
       LOG(FATAL) << "Net run failed";
     }
   }
-  OpenCLRuntime::Global()->SaveBuiltCLProgram();
+  if (device_type_ == OPENCL) {
+    OpenCLRuntime::Global()->SaveBuiltCLProgram();
+  }
   for (auto &output : *outputs) {
     Tensor *output_tensor =
         ws_->GetTensor(MakeString("mace_output_node_", output.first + ":0"));

mace/tools/validation/mace_run.cc

@@ -308,7 +308,9 @@ bool RunModel(const std::vector<std::string> &input_names,
   printf("time %11.3f %11.3f %11.3f %11.3f %11.3f\n", create_net_millis,
          mace_engine_ctor_millis, init_millis, warmup_millis, model_run_millis);
 
-  WriteOpenCLPlatformInfo(kernel_file_path);
+  if (device_type == DeviceType::OPENCL) {
+    WriteOpenCLPlatformInfo(kernel_file_path);
+  }
 
   for (size_t i = 0; i < output_count; ++i) {
     std::string output_name =