diff options
Diffstat (limited to 'tests/validation/reference')
-rw-r--r-- | tests/validation/reference/ConcatenateLayer.cpp | 9 | ||||
-rw-r--r-- | tests/validation/reference/Convolution3d.h | 22 | ||||
-rw-r--r-- | tests/validation/reference/DeconvolutionLayer.cpp | 2 | ||||
-rw-r--r-- | tests/validation/reference/DepthConcatenateLayer.cpp | 20 | ||||
-rw-r--r-- | tests/validation/reference/DepthwiseConvolutionLayer.cpp | 27 | ||||
-rw-r--r-- | tests/validation/reference/DepthwiseConvolutionLayer.h | 2 | ||||
-rw-r--r-- | tests/validation/reference/DequantizationLayer.cpp | 6 | ||||
-rw-r--r-- | tests/validation/reference/FullyConnectedLayer.cpp | 16 | ||||
-rw-r--r-- | tests/validation/reference/Im2Col.cpp | 6 | ||||
-rw-r--r-- | tests/validation/reference/QuantizationLayer.cpp | 11 | ||||
-rw-r--r-- | tests/validation/reference/QuantizationLayer.h | 2 | ||||
-rw-r--r-- | tests/validation/reference/Scale.cpp | 6 |
12 files changed, 72 insertions, 57 deletions
diff --git a/tests/validation/reference/ConcatenateLayer.cpp b/tests/validation/reference/ConcatenateLayer.cpp index af818a576c..6c90d74a0f 100644 --- a/tests/validation/reference/ConcatenateLayer.cpp +++ b/tests/validation/reference/ConcatenateLayer.cpp @@ -72,10 +72,13 @@ SimpleTensor<T> widthconcatenate_layer(const std::vector<SimpleTensor<T>> &srcs, const int offset = u * height * depth + d * height + r; if(src.data_type() == DataType::QASYMM8 && src.quantization_info() != dst.quantization_info()) { - std::transform(src_ptr, src_ptr + width, dst_ptr + width_offset + offset * width_out, [src, dst](T t) + const UniformQuantizationInfo iq_info = src.quantization_info().uniform(); + const UniformQuantizationInfo oq_info = dst.quantization_info().uniform(); + + std::transform(src_ptr, src_ptr + width, dst_ptr + width_offset + offset * width_out, [&](T t) { - const float dequantized_input = src.quantization_info().dequantize(t); - return dst.quantization_info().quantize(dequantized_input, RoundingPolicy::TO_NEAREST_UP); + const float dequantized_input = dequantize_qasymm8(t, iq_info); + return quantize_qasymm8(dequantized_input, oq_info); }); src_ptr += width; } diff --git a/tests/validation/reference/Convolution3d.h b/tests/validation/reference/Convolution3d.h index 2e5fefd99a..30be25f504 100644 --- a/tests/validation/reference/Convolution3d.h +++ b/tests/validation/reference/Convolution3d.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -9,14 +9,14 @@ * 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: - *asymm_int_mult + * * 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, asymm_int_multDAMAGES OR OTHER + * 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. @@ -101,12 +101,16 @@ inline void convolution3d(const SimpleTensor<T> &in, const SimpleTensor<T> &weig const TB *b_ptr = bias.data() + b_offset; T *out_ptr = out.data() + o_offset; - const int input_offset = -in.quantization_info().offset; - const float input_scale = in.quantization_info().scale; - const int weights_offset = -weights.quantization_info().offset; - const float weights_scale = weights.quantization_info().scale; - const int output_offset = out.quantization_info().offset; - const float output_scale = out.quantization_info().scale; + const UniformQuantizationInfo iq_info = in.quantization_info().uniform(); + const UniformQuantizationInfo wq_info = weights.quantization_info().uniform(); + const UniformQuantizationInfo oq_info = out.quantization_info().uniform(); + + const int input_offset = -iq_info.offset; + const float input_scale = iq_info.scale; + const int weights_offset = -wq_info.offset; + const float weights_scale = wq_info.scale; + const int output_offset = oq_info.offset; + const float output_scale = oq_info.scale; int output_multiplier = 0; int output_shift = 0; diff --git a/tests/validation/reference/DeconvolutionLayer.cpp b/tests/validation/reference/DeconvolutionLayer.cpp index 916792479f..af59830722 100644 --- a/tests/validation/reference/DeconvolutionLayer.cpp +++ b/tests/validation/reference/DeconvolutionLayer.cpp @@ -68,7 +68,7 @@ SimpleTensor<T> deconvolution_layer(const SimpleTensor<T> &src, const SimpleTens if(src.data_type() == DataType::QASYMM8) { - const uint8_t quantized_zero = src.quantization_info().offset; + const uint8_t quantized_zero = src.quantization_info().uniform().offset; std::fill_n(scaled.data(), scaled.num_elements(), quantized_zero); } else diff --git a/tests/validation/reference/DepthConcatenateLayer.cpp b/tests/validation/reference/DepthConcatenateLayer.cpp index 22271a0d10..d6e6e78187 100644 --- a/tests/validation/reference/DepthConcatenateLayer.cpp +++ b/tests/validation/reference/DepthConcatenateLayer.cpp @@ -55,6 +55,7 @@ SimpleTensor<T> depthconcatenate_layer(const std::vector<SimpleTensor<T>> &srcs, { return tensor.quantization_info() != dst.quantization_info(); }; + if(srcs[0].data_type() == DataType::QASYMM8 && std::any_of(srcs.cbegin(), srcs.cend(), have_different_quantization_info)) { for(int b = 0; b < batches; ++b) @@ -64,11 +65,14 @@ SimpleTensor<T> depthconcatenate_layer(const std::vector<SimpleTensor<T>> &srcs, int slice = 0; for(const auto &src : srcs) { - auto ptr_slice = static_cast<T *>(dst(Coordinates(0, 0, slice, b))); - const auto num_elems_in_slice((dst.num_elements() / depth_out) * src.shape().z()); - std::transform(ptr_slice, ptr_slice + num_elems_in_slice, ptr_slice, [src, dst](T) + auto ptr_slice = static_cast<T *>(dst(Coordinates(0, 0, slice, b))); + const auto num_elems_in_slice((dst.num_elements() / depth_out) * src.shape().z()); + const UniformQuantizationInfo iq_info = src.quantization_info().uniform(); + const UniformQuantizationInfo oq_info = dst.quantization_info().uniform(); + + std::transform(ptr_slice, ptr_slice + num_elems_in_slice, ptr_slice, [&](T) { - return dst.quantization_info().quantize(src.quantization_info().dequantize(0), RoundingPolicy::TO_NEAREST_UP); + return quantize_qasymm8(dequantize_qasymm8(0, iq_info), oq_info); }); slice += src.shape().z(); } @@ -102,10 +106,12 @@ SimpleTensor<T> depthconcatenate_layer(const std::vector<SimpleTensor<T>> &srcs, { if(src.data_type() == DataType::QASYMM8 && src.quantization_info() != dst.quantization_info()) { - std::transform(src_ptr, src_ptr + width, dst.data() + offset_to_first_element + d * out_stride_z + r * width_out, [src, dst](T t) + const UniformQuantizationInfo iq_info = src.quantization_info().uniform(); + const UniformQuantizationInfo oq_info = dst.quantization_info().uniform(); + std::transform(src_ptr, src_ptr + width, dst.data() + offset_to_first_element + d * out_stride_z + r * width_out, [&](T t) { - const float dequantized_input = src.quantization_info().dequantize(t); - return dst.quantization_info().quantize(dequantized_input, RoundingPolicy::TO_NEAREST_UP); + const float dequantized_input = dequantize_qasymm8(t, iq_info); + return quantize_qasymm8(dequantized_input, oq_info); }); src_ptr += width; } diff --git a/tests/validation/reference/DepthwiseConvolutionLayer.cpp b/tests/validation/reference/DepthwiseConvolutionLayer.cpp index 90ecffbbca..2192d681b6 100644 --- a/tests/validation/reference/DepthwiseConvolutionLayer.cpp +++ b/tests/validation/reference/DepthwiseConvolutionLayer.cpp @@ -50,7 +50,7 @@ namespace reference */ template <typename T, typename TB> SimpleTensor<T> depthwise_convolution(const SimpleTensor<T> &src, const SimpleTensor<T> &weights, const SimpleTensor<TB> &biases, const TensorShape &dst_shape, const PadStrideInfo &conv_info, - unsigned int depth_multiplier, const Size2D &dilation, QuantizationInfo out_quant_info) + unsigned int depth_multiplier, const Size2D &dilation, const QuantizationInfo &out_quant_info) { ARM_COMPUTE_UNUSED(out_quant_info); @@ -126,22 +126,19 @@ SimpleTensor<T> depthwise_convolution(const SimpleTensor<T> &src, const SimpleTe template <> SimpleTensor<uint8_t> depthwise_convolution(const SimpleTensor<uint8_t> &src, const SimpleTensor<uint8_t> &weights, const SimpleTensor<int32_t> &biases, const TensorShape &dst_shape, - const PadStrideInfo &conv_info, unsigned int depth_multiplier, const Size2D &dilation, QuantizationInfo out_quant_info) + const PadStrideInfo &conv_info, unsigned int depth_multiplier, const Size2D &dilation, const QuantizationInfo &out_quant_info) { // if no explicit quantization has been set you the same as src - if(out_quant_info == QuantizationInfo(0.0f, 0)) - { - out_quant_info = src.quantization_info(); - } - SimpleTensor<uint8_t> dst{ dst_shape, src.data_type(), 1, out_quant_info }; + const QuantizationInfo &dst_qinfo = out_quant_info.uniform().empty() ? src.quantization_info() : out_quant_info; + SimpleTensor<uint8_t> dst{ dst_shape, src.data_type(), 1, dst_qinfo }; // Create reference - const int input_offset = -src.quantization_info().offset; - const float input_scale = src.quantization_info().scale; - const int weights_offset = -weights.quantization_info().offset; - const float weights_scale = weights.quantization_info().scale; - const int output_offset = dst.quantization_info().offset; - const float output_scale = dst.quantization_info().scale; + const int input_offset = -src.quantization_info().uniform().offset; + const float input_scale = src.quantization_info().uniform().scale; + const int weights_offset = -weights.quantization_info().uniform().offset; + const float weights_scale = weights.quantization_info().uniform().scale; + const int output_offset = dst.quantization_info().uniform().offset; + const float output_scale = dst.quantization_info().uniform().scale; int output_multiplier; int output_shift; @@ -224,10 +221,10 @@ SimpleTensor<uint8_t> depthwise_convolution(const SimpleTensor<uint8_t> &src, co } template SimpleTensor<float> depthwise_convolution(const SimpleTensor<float> &src, const SimpleTensor<float> &weights, const SimpleTensor<float> &biases, const TensorShape &dst_shape, - const PadStrideInfo &conv_info, unsigned int depth_multiplier, const Size2D &dilation, QuantizationInfo out_quant_info); + const PadStrideInfo &conv_info, unsigned int depth_multiplier, const Size2D &dilation, const QuantizationInfo &out_quant_info); template SimpleTensor<half> depthwise_convolution(const SimpleTensor<half> &src, const SimpleTensor<half> &weights, const SimpleTensor<half> &biases, const TensorShape &dst_shape, - const PadStrideInfo &conv_info, unsigned int depth_multiplier, const Size2D &dilation, QuantizationInfo out_quant_info); + const PadStrideInfo &conv_info, unsigned int depth_multiplier, const Size2D &dilation, const QuantizationInfo &out_quant_info); } // namespace reference } // namespace validation } // namespace test diff --git a/tests/validation/reference/DepthwiseConvolutionLayer.h b/tests/validation/reference/DepthwiseConvolutionLayer.h index ac70de02ca..ee323fa8df 100644 --- a/tests/validation/reference/DepthwiseConvolutionLayer.h +++ b/tests/validation/reference/DepthwiseConvolutionLayer.h @@ -37,7 +37,7 @@ namespace reference { template <typename T, typename TB> SimpleTensor<T> depthwise_convolution(const SimpleTensor<T> &src, const SimpleTensor<T> &weights, const SimpleTensor<TB> &biases, const TensorShape &dst_shape, const PadStrideInfo &conv_info, - unsigned int depth_multiplier, const Size2D &dilation = Size2D(1U, 1U), QuantizationInfo out_quant_info = QuantizationInfo(0.0f, 0)); + unsigned int depth_multiplier, const Size2D &dilation = Size2D(1U, 1U), const QuantizationInfo &out_quant_info = QuantizationInfo(0.0f, 0)); } // namespace reference } // namespace validation } // namespace test diff --git a/tests/validation/reference/DequantizationLayer.cpp b/tests/validation/reference/DequantizationLayer.cpp index df50c14ec7..286a609d79 100644 --- a/tests/validation/reference/DequantizationLayer.cpp +++ b/tests/validation/reference/DequantizationLayer.cpp @@ -34,14 +34,14 @@ namespace reference template <typename T> SimpleTensor<T> dequantization_layer(const SimpleTensor<uint8_t> &src) { - const DataType dst_data_type = std::is_same<T, float>::value ? DataType::F32 : DataType::F16; - const QuantizationInfo &quantization_info = src.quantization_info(); + const DataType dst_data_type = std::is_same<T, float>::value ? DataType::F32 : DataType::F16; + const UniformQuantizationInfo &quantization_info = src.quantization_info().uniform(); SimpleTensor<T> dst{ src.shape(), dst_data_type }; for(int i = 0; i < src.num_elements(); ++i) { - dst[i] = static_cast<T>(quantization_info.dequantize(src[i])); + dst[i] = static_cast<T>(dequantize_qasymm8(src[i], quantization_info)); } return dst; diff --git a/tests/validation/reference/FullyConnectedLayer.cpp b/tests/validation/reference/FullyConnectedLayer.cpp index 07ddf6d308..cd84b9cfd1 100644 --- a/tests/validation/reference/FullyConnectedLayer.cpp +++ b/tests/validation/reference/FullyConnectedLayer.cpp @@ -67,12 +67,16 @@ void vector_matrix_multiply(const SimpleTensor<T> &src, const SimpleTensor<T> &w const TB *bias_ptr = bias.data(); T *dst_ptr = dst.data() + offset_dst; - const int input_offset = -src.quantization_info().offset; - const float input_scale = src.quantization_info().scale; - const int weights_offset = -weights.quantization_info().offset; - const float weights_scale = weights.quantization_info().scale; - const int output_offset = dst.quantization_info().offset; - const float output_scale = dst.quantization_info().scale; + const UniformQuantizationInfo iq_info = src.quantization_info().uniform(); + const UniformQuantizationInfo wq_info = weights.quantization_info().uniform(); + const UniformQuantizationInfo oq_info = dst.quantization_info().uniform(); + + const int input_offset = -iq_info.offset; + const float input_scale = iq_info.scale; + const int weights_offset = -wq_info.offset; + const float weights_scale = wq_info.scale; + const int output_offset = oq_info.offset; + const float output_scale = oq_info.scale; int output_multiplier = 0; int output_shift = 0; diff --git a/tests/validation/reference/Im2Col.cpp b/tests/validation/reference/Im2Col.cpp index 076b2aba07..4d63696e67 100644 --- a/tests/validation/reference/Im2Col.cpp +++ b/tests/validation/reference/Im2Col.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -50,7 +50,7 @@ void im2col_nchw(const SimpleTensor<T> &src, SimpleTensor<T> &dst, const Size2D const int src_channels = src.shape().z(); const int batches = src.shape().total_size_upper(3); const int dst_height = dst.shape().y(); - const int pad_val = is_data_type_quantized_asymmetric(src.data_type()) ? src.quantization_info().offset : 0; + const int pad_val = is_data_type_quantized_asymmetric(src.data_type()) ? src.quantization_info().uniform().offset : 0; int dst_idx = 0; // Compute width and height of the convolved tensors @@ -105,7 +105,7 @@ void im2col_nhwc(const SimpleTensor<T> &src, SimpleTensor<T> &dst, const Size2D const int batches = src.shape().total_size_upper(3); const int dst_width = has_bias ? dst.shape().x() - 1 : dst.shape().x(); const int dst_height = dst.shape().y(); - const int pad_val = is_data_type_quantized_asymmetric(src.data_type()) ? src.quantization_info().offset : 0; + const int pad_val = is_data_type_quantized_asymmetric(src.data_type()) ? src.quantization_info().uniform().offset : 0; // Compute width and height of the convolved tensors std::pair<unsigned int, unsigned int> convolved_dims = scaled_dimensions(src_width, src_height, kernel_dims.width, kernel_dims.height, conv_info); diff --git a/tests/validation/reference/QuantizationLayer.cpp b/tests/validation/reference/QuantizationLayer.cpp index 2f3348178c..182585abf9 100644 --- a/tests/validation/reference/QuantizationLayer.cpp +++ b/tests/validation/reference/QuantizationLayer.cpp @@ -34,24 +34,25 @@ namespace validation namespace reference { template <typename T> -SimpleTensor<uint8_t> quantization_layer(const SimpleTensor<T> &src, const QuantizationInfo quantization_info) +SimpleTensor<uint8_t> quantization_layer(const SimpleTensor<T> &src, const QuantizationInfo &quantization_info) { // Create reference SimpleTensor<uint8_t> dst{ src.shape(), DataType::QASYMM8, 1, quantization_info }; + const UniformQuantizationInfo qinfo = quantization_info.uniform(); for(int i = 0; i < src.num_elements(); ++i) { #ifdef __aarch64__ - dst[i] = quantization_info.quantize((src[i]), RoundingPolicy::TO_NEAREST_EVEN); + dst[i] = quantize_qasymm8((src[i]), qinfo, RoundingPolicy::TO_NEAREST_EVEN); #else // __aarch64__ - dst[i] = quantization_info.quantize((src[i]), RoundingPolicy::TO_ZERO); + dst[i] = quantize_qasymm8((src[i]), qinfo, RoundingPolicy::TO_ZERO); #endif // __aarch64__ } return dst; } -template SimpleTensor<uint8_t> quantization_layer(const SimpleTensor<half> &src, const QuantizationInfo quantization_info); -template SimpleTensor<uint8_t> quantization_layer(const SimpleTensor<float> &src, const QuantizationInfo quantization_info); +template SimpleTensor<uint8_t> quantization_layer(const SimpleTensor<half> &src, const QuantizationInfo &quantization_info); +template SimpleTensor<uint8_t> quantization_layer(const SimpleTensor<float> &src, const QuantizationInfo &quantization_info); } // namespace reference } // namespace validation } // namespace test diff --git a/tests/validation/reference/QuantizationLayer.h b/tests/validation/reference/QuantizationLayer.h index 2d136908af..462396f131 100644 --- a/tests/validation/reference/QuantizationLayer.h +++ b/tests/validation/reference/QuantizationLayer.h @@ -36,7 +36,7 @@ namespace validation namespace reference { template <typename T> -SimpleTensor<uint8_t> quantization_layer(const SimpleTensor<T> &src, const QuantizationInfo quantization_info); +SimpleTensor<uint8_t> quantization_layer(const SimpleTensor<T> &src, const QuantizationInfo &quantization_info); } // namespace reference } // namespace validation } // namespace test diff --git a/tests/validation/reference/Scale.cpp b/tests/validation/reference/Scale.cpp index 2f7bf2deb3..84f4fb83c1 100644 --- a/tests/validation/reference/Scale.cpp +++ b/tests/validation/reference/Scale.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -180,10 +180,10 @@ SimpleTensor<uint8_t> scale(const SimpleTensor<uint8_t> &src, float scale_x, flo SamplingPolicy sampling_policy, bool ceil_policy_scale) { SimpleTensor<uint8_t> dst; - if(src.quantization_info().scale != 0.f) + if(src.quantization_info().uniform().scale != 0.f) { SimpleTensor<float> src_tmp = convert_from_asymmetric(src); - float constant_border_value_f = scvt_f32_qasymm8(constant_border_value, src.quantization_info().scale, src.quantization_info().offset); + float constant_border_value_f = dequantize_qasymm8(constant_border_value, src.quantization_info()); SimpleTensor<float> dst_tmp = scale_core<float>(src_tmp, scale_x, scale_y, policy, border_mode, constant_border_value_f, sampling_policy, ceil_policy_scale); dst = convert_to_asymmetric(dst_tmp, src.quantization_info()); } |