diff options
author | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2021-06-30 08:39:44 +0000 |
---|---|---|
committer | SiCong Li <sicong.li@arm.com> | 2021-06-30 14:03:17 +0000 |
commit | c63b722591ff23c8c6fe5fb8ef8c8516d40f03aa (patch) | |
tree | cbcf05d2daf6cf0b4f5f73d289cdd0356a57b7b9 /src/core/CL/CLKernelLibrary.cpp | |
parent | 4a578b923ed000c67fe0bc1433f945aea634ca9c (diff) | |
download | ComputeLibrary-c63b722591ff23c8c6fe5fb8ef8c8516d40f03aa.tar.gz |
Revert "Rework OpenCL Depthwise Convolution"
This reverts commit 561c176598cd14245e2e7918fdf136d1c888d1da.
Reason for revert: <validation>
Change-Id: I6f2d61c27520439bb538e9265736532104b24cf8
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5127
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core/CL/CLKernelLibrary.cpp')
-rw-r--r-- | src/core/CL/CLKernelLibrary.cpp | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/src/core/CL/CLKernelLibrary.cpp b/src/core/CL/CLKernelLibrary.cpp index d8983fcae9..bbd4009389 100644 --- a/src/core/CL/CLKernelLibrary.cpp +++ b/src/core/CL/CLKernelLibrary.cpp @@ -22,13 +22,16 @@ * SOFTWARE. */ #include "arm_compute/core/CL/CLKernelLibrary.h" + #include "arm_compute/core/Error.h" #include "src/core/gpu/cl/ClKernelLibrary.h" + #include <algorithm> #include <array> #include <fstream> #include <utility> #include <vector> + namespace arm_compute { CLKernelLibrary::CLKernelLibrary() @@ -36,99 +39,123 @@ CLKernelLibrary::CLKernelLibrary() { opencl_is_available(); // Make sure the OpenCL symbols are initialised *before* the CLKernelLibrary is built } + CLKernelLibrary &CLKernelLibrary::get() { static CLKernelLibrary _kernel_library; return _kernel_library; } + Kernel CLKernelLibrary::create_kernel(const std::string &kernel_name, const std::set<std::string> &build_options_set) const { - const opencl::ClKernelLibrary &klib = opencl::ClKernelLibrary::get(); - const std::string program_name = klib.program_name(kernel_name); - auto program = klib.program(program_name); - const std::string &kernel_path = CLKernelLibrary::get().get_kernel_path(); + const opencl::ClKernelLibrary &klib = opencl::ClKernelLibrary::get(); + + const std::string program_name = klib.program_name(kernel_name); + auto program = klib.program(program_name); + const std::string &kernel_path = CLKernelLibrary::get().get_kernel_path(); + return _compile_context.create_kernel(kernel_name, program_name, program.program, kernel_path, build_options_set, program.is_binary); } + std::string CLKernelLibrary::get_program_name(const std::string &kernel_name) const { return opencl::ClKernelLibrary::get().program_name(kernel_name); } + void CLKernelLibrary::init(std::string kernel_path, cl::Context context, cl::Device device) { _compile_context = CLCompileContext(context, device); opencl::ClKernelLibrary::get().set_kernel_path(kernel_path); } + void CLKernelLibrary::set_kernel_path(const std::string &kernel_path) { opencl::ClKernelLibrary::get().set_kernel_path(kernel_path); } + cl::Context &CLKernelLibrary::context() { return _compile_context.context(); } + const cl::Device &CLKernelLibrary::get_device() { return _compile_context.get_device(); } + void CLKernelLibrary::set_device(cl::Device device) { _compile_context.set_device(device); } + void CLKernelLibrary::set_context(cl::Context context) { _compile_context.set_context(context); } + std::string CLKernelLibrary::get_kernel_path() { return opencl::ClKernelLibrary::get().kernel_path(); } + void CLKernelLibrary::clear_programs_cache() { _compile_context.clear_programs_cache(); } + const std::map<std::string, cl::Program> &CLKernelLibrary::get_built_programs() const { return _compile_context.get_built_programs(); } + void CLKernelLibrary::add_built_program(const std::string &built_program_name, const cl::Program &program) { _compile_context.add_built_program(built_program_name, program); } + bool CLKernelLibrary::fp16_supported() const { return _compile_context.fp16_supported(); } + bool CLKernelLibrary::int64_base_atomics_supported() const { return _compile_context.int64_base_atomics_supported(); } + bool CLKernelLibrary::is_wbsm_supported() { return _compile_context.is_wbsm_supported(); } + std::pair<std::string, bool> CLKernelLibrary::get_program(const std::string &program_name) const { auto program_info = opencl::ClKernelLibrary::get().program(program_name); return std::make_pair(std::move(program_info.program), program_info.is_binary); } + size_t CLKernelLibrary::max_local_workgroup_size(const cl::Kernel &kernel) const { return _compile_context.max_local_workgroup_size(kernel); } + cl::NDRange CLKernelLibrary::default_ndrange() const { return _compile_context.default_ndrange(); } + std::string CLKernelLibrary::get_device_version() { return _compile_context.get_device_version(); } + cl_uint CLKernelLibrary::get_num_compute_units() { return _compile_context.get_num_compute_units(); } + CLCompileContext &CLKernelLibrary::get_compile_context() { return _compile_context; } -} // namespace arm_compute
\ No newline at end of file +} // namespace arm_compute |