From 4c5469b192665c94118a8a558787cb9cec2d0765 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 21 May 2019 13:32:43 +0100 Subject: COMPMID-2225: Add interface support for new quantized data types. Add support for: -QSYMM8, 8-bit quantized symmetric -QSYMM8_PER_CHANNEL, 8-bit quantized symmetric with per channel quantization Change-Id: I00c4ff98e44af37419470af61419ee95d0de2463 Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/1236 Tested-by: Arm Jenkins Reviewed-by: Gian Marco Iodice Comments-Addressed: Arm Jenkins --- tests/validate_examples/graph_convolution.cpp | 39 ++++++++++------------ .../graph_depthwiseconvolution.cpp | 37 ++++++++++---------- tests/validate_examples/graph_fully_connected.cpp | 25 ++++++-------- tests/validate_examples/graph_validate_utils.h | 9 ++--- 4 files changed, 51 insertions(+), 59 deletions(-) (limited to 'tests/validate_examples') diff --git a/tests/validate_examples/graph_convolution.cpp b/tests/validate_examples/graph_convolution.cpp index b17cb2efdd..1ab6691e57 100644 --- a/tests/validate_examples/graph_convolution.cpp +++ b/tests/validate_examples/graph_convolution.cpp @@ -158,30 +158,27 @@ public: */ void consume_parameters(ExampleParams &common_params) { - common_params.input.width = width->value(); - common_params.input.height = height->value(); - common_params.input.fm = channels->value(); - common_params.input.batch = batch->value(); - common_params.input.quant_info.scale = scale->value(); - common_params.input.quant_info.offset = offset->value(); - common_params.input.npy = input_npy->value(); - common_params.input.range_low = input_range_low->value(); - common_params.input.range_high = input_range_high->value(); - - common_params.weights.width = weights_width->value(); - common_params.weights.height = weights_height->value(); - common_params.weights.fm = OFM->value(); - common_params.weights.npy = weights_npy->value(); - common_params.weights.quant_info.scale = weights_scale->value(); - common_params.weights.quant_info.offset = weights_offset->value(); - common_params.weights.range_low = weights_range_low->value(); - common_params.weights.range_high = weights_range_high->value(); + common_params.input.width = width->value(); + common_params.input.height = height->value(); + common_params.input.fm = channels->value(); + common_params.input.batch = batch->value(); + common_params.input.quant_info = QuantizationInfo(scale->value(), offset->value()); + common_params.input.npy = input_npy->value(); + common_params.input.range_low = input_range_low->value(); + common_params.input.range_high = input_range_high->value(); + + common_params.weights.width = weights_width->value(); + common_params.weights.height = weights_height->value(); + common_params.weights.fm = OFM->value(); + common_params.weights.npy = weights_npy->value(); + common_params.weights.quant_info = QuantizationInfo(weights_scale->value(), weights_offset->value()); + common_params.weights.range_low = weights_range_low->value(); + common_params.weights.range_high = weights_range_high->value(); common_params.bias.npy = bias_npy->value(); - common_params.output.quant_info.scale = output_scale->value(); - common_params.output.quant_info.offset = output_offset->value(); - common_params.output.npy = output_npy->value(); + common_params.output.quant_info = QuantizationInfo(output_scale->value(), output_offset->value()); + common_params.output.npy = output_npy->value(); common_params.convolution.padding_mode = padding_mode->value(); common_params.convolution.padding_top = padding_top->value(); diff --git a/tests/validate_examples/graph_depthwiseconvolution.cpp b/tests/validate_examples/graph_depthwiseconvolution.cpp index 1f5627a10d..3ea33e1deb 100644 --- a/tests/validate_examples/graph_depthwiseconvolution.cpp +++ b/tests/validate_examples/graph_depthwiseconvolution.cpp @@ -158,29 +158,26 @@ public: */ void consume_parameters(ExampleParams &common_params) { - common_params.input.width = width->value(); - common_params.input.height = height->value(); - common_params.input.fm = channels->value(); - common_params.input.batch = batch->value(); - common_params.input.quant_info.scale = scale->value(); - common_params.input.quant_info.offset = offset->value(); - common_params.input.npy = input_npy->value(); - common_params.input.range_low = input_range_low->value(); - common_params.input.range_high = input_range_high->value(); - - common_params.weights.width = weights_width->value(); - common_params.weights.height = weights_height->value(); - common_params.weights.npy = weights_npy->value(); - common_params.weights.range_low = weights_range_low->value(); - common_params.weights.range_high = weights_range_high->value(); - common_params.weights.quant_info.scale = weights_scale->value(); - common_params.weights.quant_info.offset = weights_offset->value(); + common_params.input.width = width->value(); + common_params.input.height = height->value(); + common_params.input.fm = channels->value(); + common_params.input.batch = batch->value(); + common_params.input.quant_info = QuantizationInfo(scale->value(), offset->value()); + common_params.input.npy = input_npy->value(); + common_params.input.range_low = input_range_low->value(); + common_params.input.range_high = input_range_high->value(); + + common_params.weights.width = weights_width->value(); + common_params.weights.height = weights_height->value(); + common_params.weights.npy = weights_npy->value(); + common_params.weights.range_low = weights_range_low->value(); + common_params.weights.range_high = weights_range_high->value(); + common_params.weights.quant_info = QuantizationInfo(weights_scale->value(), weights_offset->value()); common_params.bias.npy = bias_npy->value(); - common_params.output.quant_info.scale = output_scale->value(); - common_params.output.quant_info.offset = output_offset->value(); - common_params.output.npy = output_npy->value(); + common_params.output.quant_info = QuantizationInfo(output_scale->value(), output_offset->value()); + common_params.output.npy = output_npy->value(); common_params.convolution.padding_mode = padding_mode->value(); common_params.convolution.padding_top = padding_top->value(); diff --git a/tests/validate_examples/graph_fully_connected.cpp b/tests/validate_examples/graph_fully_connected.cpp index dfa15edd6d..645fa8b124 100644 --- a/tests/validate_examples/graph_fully_connected.cpp +++ b/tests/validate_examples/graph_fully_connected.cpp @@ -102,20 +102,17 @@ public: */ void consume_parameters(ExampleParams &common_params) { - common_params.input.width = width->value(); - common_params.input.batch = batch->value(); - common_params.input.quant_info.scale = input_scale->value(); - common_params.input.quant_info.offset = input_offset->value(); - common_params.input.range_low = input_range_low->value(); - common_params.input.range_high = input_range_high->value(); - - common_params.weights.quant_info.scale = weights_scale->value(); - common_params.weights.quant_info.offset = weights_offset->value(); - common_params.weights.range_low = weights_range_low->value(); - common_params.weights.range_high = weights_range_high->value(); - - common_params.output.quant_info.scale = output_scale->value(); - common_params.output.quant_info.offset = output_offset->value(); + common_params.input.width = width->value(); + common_params.input.batch = batch->value(); + common_params.input.quant_info = QuantizationInfo(input_scale->value(), input_offset->value()); + common_params.input.range_low = input_range_low->value(); + common_params.input.range_high = input_range_high->value(); + + common_params.weights.quant_info = QuantizationInfo(weights_scale->value(), weights_offset->value()); + common_params.weights.range_low = weights_range_low->value(); + common_params.weights.range_high = weights_range_high->value(); + + common_params.output.quant_info = QuantizationInfo(output_scale->value(), output_offset->value()); common_params.data_type = data_type->value(); common_params.fully_connected.num_outputs = num_outputs->value(); diff --git a/tests/validate_examples/graph_validate_utils.h b/tests/validate_examples/graph_validate_utils.h index 485d3c1409..13cc4fa683 100644 --- a/tests/validate_examples/graph_validate_utils.h +++ b/tests/validate_examples/graph_validate_utils.h @@ -453,16 +453,17 @@ public: { ARM_COMPUTE_ERROR_ON(tensor.data_type() != arm_compute::DataType::QASYMM8); - std::mt19937 gen(seed); + const UniformQuantizationInfo qinfo = tensor.quantization_info().uniform(); - uint8_t qasymm8_low = tensor.quantization_info().quantize(low, RoundingPolicy::TO_NEAREST_UP); - uint8_t qasymm8_high = tensor.quantization_info().quantize(high, RoundingPolicy::TO_NEAREST_UP); + uint8_t qasymm8_low = quantize_qasymm8(low, qinfo); + uint8_t qasymm8_high = quantize_qasymm8(high, qinfo); + std::mt19937 gen(seed); std::uniform_int_distribution distribution(qasymm8_low, qasymm8_high); for(int i = 0; i < tensor.num_elements(); ++i) { - tensor[i] = tensor.quantization_info().quantize(distribution(gen), RoundingPolicy::TO_NEAREST_UP); + tensor[i] = quantize_qasymm8(distribution(gen), qinfo); } } /** Fill S32 tensor with Random values. -- cgit v1.2.1