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

mace/core/runtime/opencl/opencl_runtime.cc

@@ -158,7 +158,7 @@ void OpenCLRuntime::BuildProgram(const std::string &program_name,
                                               program,
                                               &is_opencl_binary);
   MACE_CHECK(found, "Program not found for ",
-                    is_opencl_binary ? "source: " : "binary: ",
+                    is_opencl_binary ? "binary: " : "source: ",
                     built_program_key);
 
   // Build program
@@ -174,7 +174,7 @@ void OpenCLRuntime::BuildProgram(const std::string &program_name,
       LOG(INFO) << "Program build log: " << build_log;
     }
     LOG(FATAL) << "Build program from "
-               << (is_opencl_binary ? "source: " : "binary: ")
+               << (is_opencl_binary ? "binary: " : "source: ")
                << built_program_key
                << " failed: " << ret;
   }

mace/python/tools/binary_codegen.py

@@ -34,7 +34,6 @@ def generate_cpp_source():
     key_size, = struct.unpack("i", binary_array[idx:idx+4])
     idx += 4
     key, = struct.unpack(str(key_size) + "s", binary_array[idx:idx+key_size])
-    key = ''.join([ "\\%03o" % ord(c) if not c.isalnum() else c for c in key])
     idx += key_size
     params_size, = struct.unpack("i", binary_array[idx:idx+4])
     idx += 4