diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2017-11-02 12:17:56 +0000 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | 388d3ec5289d5aa7415d6599137a74c4e5eaeeaf (patch) | |
tree | 87ea366d4cc9564d5bfcc454043a9493a5cb7bfc /arm_compute/core | |
parent | 3faea25fe0bcb9f72bfe3da185085ed634d1b162 (diff) | |
download | ComputeLibrary-388d3ec5289d5aa7415d6599137a74c4e5eaeeaf.tar.gz |
COMPMID-556: Support beta for all softmax data types.
Change-Id: I4c0ca033dc53829fb7ac3dd7c7469d143be74e73
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/94251
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'arm_compute/core')
-rw-r--r-- | arm_compute/core/CL/CLKernelLibrary.h | 35 | ||||
-rw-r--r-- | arm_compute/core/CL/kernels/CLSoftmaxLayerKernel.h | 2 | ||||
-rw-r--r-- | arm_compute/core/Helpers.inl | 2 | ||||
-rw-r--r-- | arm_compute/core/Utils.h | 2 |
4 files changed, 38 insertions, 3 deletions
diff --git a/arm_compute/core/CL/CLKernelLibrary.h b/arm_compute/core/CL/CLKernelLibrary.h index fc131cdcfe..d433a740ac 100644 --- a/arm_compute/core/CL/CLKernelLibrary.h +++ b/arm_compute/core/CL/CLKernelLibrary.h @@ -33,6 +33,41 @@ namespace arm_compute { +/** Build options */ +class CLBuildOptions +{ + using StringSet = std::set<std::string>; + +public: + /** Default constructor. */ + CLBuildOptions(); + /** Adds option to the existing build option list + * + * @param[in] option Option to add + */ + void add_option(std::string option); + /** Adds option if a given condition is true; + * + * @param[in] cond Condition to check + * @param[in] option Option to add if condition is true + */ + void add_option_if(bool cond, std::string option); + /** Adds first option if condition is true else the second one + * + * @param[in] cond Condition to check + * @param[in] option_true Option to add if condition is true + * @param[in] option_false Option to add if condition is false + */ + void add_option_if_else(bool cond, std::string option_true, std::string option_false); + /** Gets the current options list set + * + * @return Build options set + */ + StringSet options() const; + +private: + StringSet _build_opts; /**< Build options set */ +}; /** Program class */ class Program { diff --git a/arm_compute/core/CL/kernels/CLSoftmaxLayerKernel.h b/arm_compute/core/CL/kernels/CLSoftmaxLayerKernel.h index 60d555019d..1e079cbb06 100644 --- a/arm_compute/core/CL/kernels/CLSoftmaxLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLSoftmaxLayerKernel.h @@ -60,7 +60,7 @@ public: * * @param[in] input Source tensor. Data types supported: QS8/QS16/F16/F32 * @param[in] max Max values tensor. Data types supported: same as @p input - * @param[in] beta A scaling factor for the exponent. QS8/QS16/F16 only support a beta value of 1. + * @param[in] beta A scaling factor for the exponent. * @param[out] output Destination tensor. Data types supported: same as @p input * @param[out] sum Sum of 1D logits tensor. Data types supported: same as @p input */ diff --git a/arm_compute/core/Helpers.inl b/arm_compute/core/Helpers.inl index 1a27684c9c..acdb9567db 100644 --- a/arm_compute/core/Helpers.inl +++ b/arm_compute/core/Helpers.inl @@ -263,7 +263,7 @@ inline bool set_fixed_point_position_if_zero(ITensorInfo &info, int fixed_point_ inline bool set_quantization_info_if_empty(ITensorInfo &info, QuantizationInfo quantization_info) { - if(info.quantization_info().empty() && (is_data_type_assymetric(info.data_type()))) + if(info.quantization_info().empty() && (is_data_type_quantized_assymetric(info.data_type()))) { info.set_quantization_info(quantization_info); return true; diff --git a/arm_compute/core/Utils.h b/arm_compute/core/Utils.h index 8e15a0a988..a77df030e6 100644 --- a/arm_compute/core/Utils.h +++ b/arm_compute/core/Utils.h @@ -755,7 +755,7 @@ inline bool is_data_type_fixed_point(DataType dt) * * @return True if data type is of symmetric quantized type, else false. */ -inline bool is_data_type_assymetric(DataType dt) +inline bool is_data_type_quantized_assymetric(DataType dt) { switch(dt) { |