Merge pull request #1271 from yangfei963158659/develop

repair bug of memory free and build cl path

src/framework/cl/cl_engine.h

@@ -90,8 +90,10 @@ class CLEngine {
 
   bool BuildProgram(cl_program program) {
     cl_int status;
-    status = clBuildProgram(program, 0, 0, "-cl-fast-relaxed-math -I cl_kernel",
-                            0, 0);
+    std::string path = "-cl-fast-relaxed-math -I " +
+                       CLEngine::Instance()->GetCLPath() + "/cl_kernel";
+
+    status = clBuildProgram(program, 0, 0, path.c_str(), 0, 0);
 
     CL_CHECK_ERRORS(status);
 

src/framework/executor.cpp

@@ -704,7 +704,7 @@ void Executor<GPU_CL, Precision::FP32>::InitCombineMemory() {
     }
   }
   if (self_alloc) {
-    delete origin_data;
+    delete data;
   }
   LOG(kLOG_INFO) << " end init combine memory ";
 }