diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-05-31 18:53:52 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:52:54 +0000 |
commit | df473eab0ab8a52e6b58e0f6442b39ba4c1d68ea (patch) | |
tree | 5c96fcc41cf079849b6f392bc266b82c43a4766b /arm_compute | |
parent | 087eaf67dc4be4234a7fcfc3b109c1e4f5e7dd5e (diff) | |
download | ComputeLibrary-df473eab0ab8a52e6b58e0f6442b39ba4c1d68ea.tar.gz |
COMPMID-1182: printf doesn't work
Change-Id: I013d57f6e2becbd6d2d7700ce5fbbeca670443c4
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/133735
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Diffstat (limited to 'arm_compute')
-rw-r--r-- | arm_compute/graph/backends/CL/CLDeviceBackend.h | 5 | ||||
-rw-r--r-- | arm_compute/graph/backends/GLES/GCDeviceBackend.h | 3 | ||||
-rw-r--r-- | arm_compute/graph/detail/ExecutionHelpers.h | 2 | ||||
-rw-r--r-- | arm_compute/runtime/CL/CLScheduler.h | 48 |
4 files changed, 6 insertions, 52 deletions
diff --git a/arm_compute/graph/backends/CL/CLDeviceBackend.h b/arm_compute/graph/backends/CL/CLDeviceBackend.h index ab39d0fb1b..0b45dfe479 100644 --- a/arm_compute/graph/backends/CL/CLDeviceBackend.h +++ b/arm_compute/graph/backends/CL/CLDeviceBackend.h @@ -63,8 +63,9 @@ public: std::shared_ptr<arm_compute::IMemoryManager> create_memory_manager(MemoryManagerAffinity affinity) override; private: - CLTuner _tuner; /**< CL kernel tuner */ - CLBufferAllocator _allocator; /**< CL buffer affinity allocator */ + bool _initialized; /**< Flag that specifies if the backend has been default initialized */ + CLTuner _tuner; /**< CL kernel tuner */ + std::unique_ptr<CLBufferAllocator> _allocator; /**< CL buffer affinity allocator */ }; } // namespace backends } // namespace graph diff --git a/arm_compute/graph/backends/GLES/GCDeviceBackend.h b/arm_compute/graph/backends/GLES/GCDeviceBackend.h index dc0e2b07dc..ba789221e3 100644 --- a/arm_compute/graph/backends/GLES/GCDeviceBackend.h +++ b/arm_compute/graph/backends/GLES/GCDeviceBackend.h @@ -53,7 +53,8 @@ public: std::shared_ptr<arm_compute::IMemoryManager> create_memory_manager(MemoryManagerAffinity affinity) override; private: - GCBufferAllocator _allocator; /**< GLES buffer affinity allocator */ + bool _initialized; /**< Flag that specifies if the backend has been default initialized */ + GCBufferAllocator _allocator; /**< GLES buffer affinity allocator */ }; } // namespace backends } // namespace graph diff --git a/arm_compute/graph/detail/ExecutionHelpers.h b/arm_compute/graph/detail/ExecutionHelpers.h index 27cae4b8ab..23dd207695 100644 --- a/arm_compute/graph/detail/ExecutionHelpers.h +++ b/arm_compute/graph/detail/ExecutionHelpers.h @@ -39,8 +39,6 @@ class INode; namespace detail { -/** Initializes the available backends **/ -void default_initialize_backends(); /** Validates all nodes * * @param[in] g Graph to validate diff --git a/arm_compute/runtime/CL/CLScheduler.h b/arm_compute/runtime/CL/CLScheduler.h index 26b459c42d..bdd779bd91 100644 --- a/arm_compute/runtime/CL/CLScheduler.h +++ b/arm_compute/runtime/CL/CLScheduler.h @@ -32,16 +32,6 @@ #include "arm_compute/core/Types.h" #include "arm_compute/runtime/CL/ICLTuner.h" -#if defined(ARM_COMPUTE_DEBUG_ENABLED) -namespace -{ -void printf_callback(const char *buffer, unsigned int len, size_t complete, void *user_data) -{ - printf("%.*s", len, buffer); -} -} -#endif /* defined(ARM_COMPUTE_DEBUG_ENABLED) */ - namespace arm_compute { class ICLKernel; @@ -68,43 +58,7 @@ public: * * @param[in] cl_tuner (Optional) Pointer to ICLTuner (default=nullptr) */ - void default_init(ICLTuner *cl_tuner = nullptr) - { - if(!_is_initialised) - { -#if defined(ARM_COMPUTE_DEBUG_ENABLED) - bool is_cl_arm_printf_supported = false; - - //query devices in the context for cl_arm_printf support - std::vector<cl::Device> def_platform_devices; - cl::Platform::getDefault().getDevices(CL_DEVICE_TYPE_DEFAULT, &def_platform_devices); - is_cl_arm_printf_supported = device_supports_extension(def_platform_devices[0], "cl_arm_printf"); - - if(is_cl_arm_printf_supported) - { - // Create a cl_context with a printf_callback and user specified buffer size. - cl_context_properties properties[] = - { - // Enable a printf callback function for this context. - CL_PRINTF_CALLBACK_ARM, reinterpret_cast<cl_context_properties>(printf_callback), - // Request a minimum printf buffer size of 4MB for devices in the - // context that support this extension. - CL_PRINTF_BUFFERSIZE_ARM, static_cast<cl_context_properties>(0x100000), - CL_CONTEXT_PLATFORM, reinterpret_cast<cl_context_properties>(cl::Platform::get()()), - 0 - }; - cl::Context::setDefault(cl::Context(CL_DEVICE_TYPE_DEFAULT, properties)); - } -#endif // defined(ARM_COMPUTE_DEBUG_ENABLED) - - CLKernelLibrary::get().init("./cl_kernels/", cl::Context::getDefault(), cl::Device::getDefault()); - init(cl::Context::getDefault(), cl::CommandQueue::getDefault(), cl::Device::getDefault(), cl_tuner); - } - else - { - _cl_tuner = cl_tuner; - } - } + void default_init(ICLTuner *cl_tuner = nullptr); /** Schedule the execution of the passed kernel if possible. * * @param[in] kernel Kernel to execute. |