diff options
Diffstat (limited to 'arm_compute/core')
-rw-r--r-- | arm_compute/core/CL/CLTypes.h | 13 | ||||
-rw-r--r-- | arm_compute/core/CL/ICLKernel.h | 9 | ||||
-rw-r--r-- | arm_compute/core/CL/kernels/CLDirectConvolutionLayerKernel.h | 4 | ||||
-rw-r--r-- | arm_compute/core/utils/misc/Signal.h | 99 |
4 files changed, 122 insertions, 3 deletions
diff --git a/arm_compute/core/CL/CLTypes.h b/arm_compute/core/CL/CLTypes.h index a9d5fdd063..14c31fa396 100644 --- a/arm_compute/core/CL/CLTypes.h +++ b/arm_compute/core/CL/CLTypes.h @@ -60,5 +60,16 @@ enum class CLVersion CL20, /* the OpenCL 2.0 and above */ UNKNOWN /* unkown version */ }; -} + +/** OpenCL device options */ +struct CLDeviceOptions +{ + std::string name; /**< Device name */ + std::string extensions; /**< List of supported extensions */ + std::string ddk_version; /**< DDK version */ + GPUTarget gpu_target; /**< GPU target architecture/instance */ + size_t num_cores; /**< Number of cores */ + size_t cache_size; /**< Cache size */ +}; +} // namespace arm_compute #endif /* __ARM_COMPUTE_CL_TYPES_H__ */ diff --git a/arm_compute/core/CL/ICLKernel.h b/arm_compute/core/CL/ICLKernel.h index c7d0c2156b..e6700cd61e 100644 --- a/arm_compute/core/CL/ICLKernel.h +++ b/arm_compute/core/CL/ICLKernel.h @@ -198,6 +198,15 @@ public: _lws_hint = lws_hint; } + /** Return the Local-Workgroup-Size hint + * + * @return Current lws hint + */ + cl::NDRange lws_hint() const + { + return _lws_hint; + } + /** Get the configuration ID * * @note The configuration ID can be used by the caller to distinguish different calls of the same OpenCL kernel diff --git a/arm_compute/core/CL/kernels/CLDirectConvolutionLayerKernel.h b/arm_compute/core/CL/kernels/CLDirectConvolutionLayerKernel.h index d47b7da213..eb1bf58b1b 100644 --- a/arm_compute/core/CL/kernels/CLDirectConvolutionLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLDirectConvolutionLayerKernel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -88,7 +88,7 @@ public: void run(const Window &window, cl::CommandQueue &queue) override; BorderSize border_size() const override; -private: +public: const ICLTensor *_input; const ICLTensor *_biases; const ICLTensor *_weights; diff --git a/arm_compute/core/utils/misc/Signal.h b/arm_compute/core/utils/misc/Signal.h new file mode 100644 index 0000000000..71f13951b9 --- /dev/null +++ b/arm_compute/core/utils/misc/Signal.h @@ -0,0 +1,99 @@ +/* + * Copyright (c) 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_MISC_SIGNAL_H__ +#define __ARM_COMPUTE_MISC_SIGNAL_H__ + +#include <functional> + +namespace arm_compute +{ +namespace utils +{ +namespace signal +{ +namespace detail +{ +/** Base signal class */ +template <typename SignalType> +class SignalImpl; + +/** Signal class function specialization */ +template <typename ReturnType, typename... Args> +class SignalImpl<ReturnType(Args...)> +{ +public: + using Callback = std::function<ReturnType(Args...)>; + +public: + /** Default Constructor */ + SignalImpl() = default; + + /** Connects signal + * + * @param[in] cb Callback to connect the signal with + */ + void connect(const Callback &cb) + { + _cb = cb; + } + + /** Disconnects the signal */ + void disconnect() + { + _cb = nullptr; + } + + /** Checks if the signal is connected + * + * @return True if there is a connection else false + */ + bool connected() const + { + return (_cb != nullptr); + } + + /** Calls the connected callback + * + * @param[in] args Callback arguments + */ + void operator()(Args &&... args) + { + if(_cb) + { + _cb(std::forward<Args>(args)...); + } + } + +private: + Callback _cb{}; /**< Signal callback */ +}; +} // namespace detail + +/** Signal alias */ +template <class T> +using Signal = detail::SignalImpl<T>; +} // namespace signal +} // namespace utils +} // namespace arm_compute +#endif /* __ARM_COMPUTE_MISC_SIGNAL_H__ */ |