Remove OpenCLEx codes (#4993)

- CLKernelLibraryEx includes OpenCL.h, not OpenCLEx.h
- There is no problem now

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/libs/ARMComputeEx/arm_compute/core/CL/OpenCLEx.h b/libs/ARMComputeEx/arm_compute/core/CL/OpenCLEx.h
deleted file mode 100644 (file)
index c0fc615..0000000
--- a/libs/ARMComputeEx/arm_compute/core/CL/OpenCLEx.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved
- * Copyright (c) 2016-2018 ARM Limited.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef __ARM_COMPUTE_OPENCLEX_H__
-#define __ARM_COMPUTE_OPENCLEX_H__
-
-#include <string>
-#include <utility>
-
-/* Configure the Khronos C++ wrapper to target OpenCL 1.2: */
-#ifndef ARM_COMPUTE_NO_EXCEPTIONS
-#define CL_HPP_ENABLE_EXCEPTIONS
-#endif // ARM_COMPUTE_NO_EXCEPTIONS
-#define CL_HPP_CL_1_2_DEFAULT_BUILD
-#define CL_HPP_TARGET_OPENCL_VERSION 110
-#define CL_HPP_MINIMUM_OPENCL_VERSION 110
-#include <CL/cl2.hpp>
-
-namespace arm_compute
-{
-/** Class for loading OpenCL symbols. */
-class CLSymbolsEx final
-{
-private:
-  CLSymbolsEx() = default;
-  void load_symbols(void *handle);
-
-public:
-  /**
-   * @brief Destroy the CLSymbolsEx object
-   */
-  ~CLSymbolsEx();
-  /** Get the static instance of CLSymbols.
-   *
-   * @return The static instance of CLSymbols.
-   */
-  static CLSymbolsEx &get();
-  /** Load symbols from the given OpenCL library path.
-   *
-   * @param[in] library Path to the OpenCL library.
-   *
-   * @return True if loading the library is successful.
-   */
-  bool load(const std::string &library);
-  /** Load symbols from any of the default OpenCL library names.
-   *
-   * @return True if loading any library is successful.
-   */
-  bool load_default();
-
-#define DECLARE_FUNCTION_PTR(func_name) std::function<decltype(func_name)> func_name##_ptr = nullptr
-
-  DECLARE_FUNCTION_PTR(clGetEventInfo);
-  DECLARE_FUNCTION_PTR(clSetEventCallback);
-
-#undef DECLARE_FUNCTION_PTR
-
-private:
-  std::pair<bool, bool> _loaded{false, false};
-  void *_handle{nullptr};
-};
-} // namespace arm_compute
-#endif /* __ARM_COMPUTE_OPENCLEX_H__ */

diff --git a/libs/ARMComputeEx/src/core/CL/OpenCLEx.cpp b/libs/ARMComputeEx/src/core/CL/OpenCLEx.cpp
deleted file mode 100644 (file)
index 24e96e7..0000000
--- a/libs/ARMComputeEx/src/core/CL/OpenCLEx.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved
- * Copyright (c) 2016-2018 ARM Limited.
- *
- * SPDX-License-Identifier: MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "arm_compute/core/CL/OpenCLEx.h"
-
-#include <dlfcn.h>
-#include <iostream>
-
-namespace arm_compute
-{
-
-CLSymbolsEx::~CLSymbolsEx()
-{
-  if (_handle != nullptr)
-  {
-    dlclose(_handle);
-  }
-}
-
-CLSymbolsEx &CLSymbolsEx::get()
-{
-  static CLSymbolsEx symbols;
-  return symbols;
-}
-
-bool CLSymbolsEx::load_default()
-{
-  static const std::vector<std::string> libraries{"libOpenCL.so", "libGLES_mali.so", "libmali.so"};
-
-  if (_loaded.first)
-  {
-    return _loaded.second;
-  }
-
-  // Indicate that default loading has been tried
-  _loaded.first = true;
-
-  for (const auto &lib : libraries)
-  {
-    if (load(lib))
-    {
-      return true;
-    }
-  }
-
-  std::cerr << "Couldn't find any OpenCL library.\n";
-  return false;
-}
-
-bool CLSymbolsEx::load(const std::string &library)
-{
-  void *handle = dlopen(library.c_str(), RTLD_LAZY | RTLD_LOCAL);
-
-  if (handle == nullptr)
-  {
-    std::cerr << "Can't load " << library << ": " << dlerror() << "\n";
-    // Set status of loading to failed
-    _loaded.second = false;
-    return false;
-  }
-
-#define LOAD_FUNCTION_PTR(func_name, handle) \
-  func_name##_ptr = reinterpret_cast<decltype(func_name) *>(dlsym(handle, #func_name));
-
-  LOAD_FUNCTION_PTR(clGetEventInfo, handle);
-  LOAD_FUNCTION_PTR(clSetEventCallback, handle);
-
-#undef LOAD_FUNCTION_PTR
-
-  // Don't call dlclose(handle) or all the symbols will be unloaded !
-
-  // Disable default loading and set status to successful
-  _loaded = std::make_pair(true, true);
-
-  // Workaround to avoid warning by handle lost without dlclose()
-  _handle = handle;
-
-  return true;
-}
-
-} // namespace arm_compute
-
-cl_int clGetEventInfo(cl_event event, cl_event_info param_name, size_t param_value_size,
-                      void *param_value, size_t *param_value_size_ret)
-{
-  arm_compute::CLSymbolsEx::get().load_default();
-  auto func = arm_compute::CLSymbolsEx::get().clGetEventInfo_ptr;
-  if (func != nullptr)
-  {
-    return func(event, param_name, param_value_size, param_value, param_value_size_ret);
-  }
-  else
-  {
-    return CL_OUT_OF_RESOURCES;
-  }
-}
-
-cl_int clSetEventCallback(cl_event event, cl_int command_exec_callback_type,
-                          void(CL_CALLBACK *pfn_ev_notify)(cl_event ev, cl_int ev_cmd_exec_status,
-                                                           void *user_data),
-                          void *user_data)
-{
-  arm_compute::CLSymbolsEx::get().load_default();
-  auto func = arm_compute::CLSymbolsEx::get().clSetEventCallback_ptr;
-  if (func != nullptr)
-  {
-    return func(event, command_exec_callback_type, pfn_ev_notify, user_data);
-  }
-  else
-  {
-    return CL_OUT_OF_RESOURCES;
-  }
-}