Merge pull request #1019 from codeWorm2015/opencl

update cl headers

src/framework/cl/cl_deleter.h

@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 
-#include "framework/cl/open_cl/cl.h"
+#include "framework/cl/CL/cl.h"
 
 struct CLKernelDeleter {
   template <class T>

src/framework/cl/cl_engine.cpp

@@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
+#include "framework/cl/CL/cl.h"
 #include "framework/cl/cl_tool.h"
 #include "framework/cl/cl_engine.h"
-#include "framework/cl/cl_header/cl.h"
 
 #include <cstdlib>
 #include <cstring>
@@ -71,11 +71,6 @@ bool CLEngine::SetPlatform() {
   }
 }
 
-//bool CLEngine::SetClContext() {
-//  context_.reset(clCreateContext(NULL, 1, devices_, NULL, NULL, NULL));
-//  return true;
-//}
-
 bool CLEngine::SetClDeviceId() {
   cl_uint numDevices = 0;
   devices_ = NULL;
@@ -92,6 +87,11 @@ bool CLEngine::SetClDeviceId() {
   return false;
 }
 
+//bool CLEngine::SetClContext() {
+//  context_.reset(clCreateContext(NULL, 1, devices_, NULL, NULL, NULL));
+//  return true;
+//}
+
 //bool CLEngine::LoadKernelFromFile(const char *kernel_file) {
 //  size_t size;
 //  char *str;

src/framework/cl/cl_engine.h

@@ -20,7 +20,7 @@ limitations under the License. */
 
 #include "common/enforce.h"
 #include "framework/cl/cl_deleter.h"
-#include "framework/cl/open_cl/cl.h"
+#include "framework/cl/CL/cl.h"
 
 namespace paddle_mobile {
 namespace framework {

src/framework/cl/cl_image.h

@@ -16,7 +16,7 @@ limitations under the License. */
 
 #include "framework/ddim.h"
 #include "framework/tensor.h"
-#include "framework/cl/open_cl/cl.h"
+#include "framework/cl/CL/cl.h"
 
 namespace paddle_mobile {
 namespace framework {

src/framework/cl/cl_scope.h

@@ -21,7 +21,7 @@ limitations under the License. */
 #include "framework/cl/cl_tool.h"
 #include "framework/cl/cl_engine.h"
 #include "framework/cl/cl_deleter.h"
-#include "framework/cl/open_cl/cl.h"
+#include "framework/cl/CL/cl.h"
 
 namespace paddle_mobile {
 namespace framework {

src/framework/cl/cl_tensor.h

@@ -21,7 +21,7 @@ limitations under the License. */
 #include "framework/tensor_base.h"
 #include "framework/cl/cl_engine.h"
 #include "framework/cl/cl_deleter.h"
-#include "framework/cl/open_cl/cl.h"
+#include "framework/cl/CL/cl.h"
 
 namespace paddle_mobile {
 namespace framework {

src/framework/cl/cl_tool.cpp

+/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. */
+
+#include "cl_tool.h"
+
+namespace paddle_mobile {
+namespace framework {
+
+const char *opencl_error_to_str(cl_int error) {
+#define CASE_CL_CONSTANT(NAME) case NAME: return #NAME;
+  // Suppose that no combinations are possible.
+  switch (error) {
+    CASE_CL_CONSTANT(CL_SUCCESS)
+    CASE_CL_CONSTANT(CL_DEVICE_NOT_FOUND)
+    CASE_CL_CONSTANT(CL_DEVICE_NOT_AVAILABLE)
+    CASE_CL_CONSTANT(CL_COMPILER_NOT_AVAILABLE)
+    CASE_CL_CONSTANT(CL_MEM_OBJECT_ALLOCATION_FAILURE)
+    CASE_CL_CONSTANT(CL_OUT_OF_RESOURCES)
+    CASE_CL_CONSTANT(CL_OUT_OF_HOST_MEMORY)
+    CASE_CL_CONSTANT(CL_PROFILING_INFO_NOT_AVAILABLE)
+    CASE_CL_CONSTANT(CL_MEM_COPY_OVERLAP)
+    CASE_CL_CONSTANT(CL_IMAGE_FORMAT_MISMATCH)
+    CASE_CL_CONSTANT(CL_IMAGE_FORMAT_NOT_SUPPORTED)
+    CASE_CL_CONSTANT(CL_BUILD_PROGRAM_FAILURE)
+    CASE_CL_CONSTANT(CL_MAP_FAILURE)
+    CASE_CL_CONSTANT(CL_MISALIGNED_SUB_BUFFER_OFFSET)
+    CASE_CL_CONSTANT(CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST)
+    CASE_CL_CONSTANT(CL_INVALID_VALUE)
+    CASE_CL_CONSTANT(CL_INVALID_DEVICE_TYPE)
+    CASE_CL_CONSTANT(CL_INVALID_PLATFORM)
+    CASE_CL_CONSTANT(CL_INVALID_DEVICE)
+    CASE_CL_CONSTANT(CL_INVALID_CONTEXT)
+    CASE_CL_CONSTANT(CL_INVALID_QUEUE_PROPERTIES)
+    CASE_CL_CONSTANT(CL_INVALID_COMMAND_QUEUE)
+    CASE_CL_CONSTANT(CL_INVALID_HOST_PTR)
+    CASE_CL_CONSTANT(CL_INVALID_MEM_OBJECT)
+    CASE_CL_CONSTANT(CL_INVALID_IMAGE_FORMAT_DESCRIPTOR)
+    CASE_CL_CONSTANT(CL_INVALID_IMAGE_SIZE)
+    CASE_CL_CONSTANT(CL_INVALID_SAMPLER)
+    CASE_CL_CONSTANT(CL_INVALID_BINARY)
+    CASE_CL_CONSTANT(CL_INVALID_BUILD_OPTIONS)
+    CASE_CL_CONSTANT(CL_INVALID_PROGRAM)
+    CASE_CL_CONSTANT(CL_INVALID_PROGRAM_EXECUTABLE)
+    CASE_CL_CONSTANT(CL_INVALID_KERNEL_NAME)
+    CASE_CL_CONSTANT(CL_INVALID_KERNEL_DEFINITION)
+    CASE_CL_CONSTANT(CL_INVALID_KERNEL)
+    CASE_CL_CONSTANT(CL_INVALID_ARG_INDEX)
+    CASE_CL_CONSTANT(CL_INVALID_ARG_VALUE)
+    CASE_CL_CONSTANT(CL_INVALID_ARG_SIZE)
+    CASE_CL_CONSTANT(CL_INVALID_KERNEL_ARGS)
+    CASE_CL_CONSTANT(CL_INVALID_WORK_DIMENSION)
+    CASE_CL_CONSTANT(CL_INVALID_WORK_GROUP_SIZE)
+    CASE_CL_CONSTANT(CL_INVALID_WORK_ITEM_SIZE)
+    CASE_CL_CONSTANT(CL_INVALID_GLOBAL_OFFSET)
+    CASE_CL_CONSTANT(CL_INVALID_EVENT_WAIT_LIST)
+    CASE_CL_CONSTANT(CL_INVALID_EVENT)
+    CASE_CL_CONSTANT(CL_INVALID_OPERATION)
+    CASE_CL_CONSTANT(CL_INVALID_GL_OBJECT)
+    CASE_CL_CONSTANT(CL_INVALID_BUFFER_SIZE)
+    CASE_CL_CONSTANT(CL_INVALID_MIP_LEVEL)
+    CASE_CL_CONSTANT(CL_INVALID_GLOBAL_WORK_SIZE)
+    CASE_CL_CONSTANT(CL_INVALID_PROPERTY)
+
+    default:
+      return "UNKNOWN ERROR CODE";
+  }
+#undef CASE_CL_CONSTANT
+}
+
+}
+}

src/framework/cl/cl_tool.h

@@ -14,11 +14,13 @@ limitations under the License. */
 
 #pragma once
 
-#include "framework/cl/cl_header/cl.h"
+#include "framework/cl/CL/cl.h"
 
 namespace paddle_mobile {
 namespace framework {
 
+const char* opencl_error_to_str (cl_int error);
+
 #define CL_CHECK_ERRORS(ERR)                                                          \
         if(ERR != CL_SUCCESS)                                                             \
         {                                                                                 \