From f466d75f85938b96dd14675ec091193bdce12122 Mon Sep 17 00:00:00 2001 From: SiCongLi Date: Mon, 1 Mar 2021 15:26:18 +0000 Subject: Add QASYMM8_SIGNED support to graph examples via graph mutator Related to COMPMID-4279 Signed-off-by: SiCongLi Change-Id: I6c737536b4e614cc9975003acca766803f55bf0b Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5206 Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins --- examples/graph_deepspeech_v0_4_1.cpp | 11 ++++++----- examples/graph_inception_v3.cpp | 16 +++++++++------- examples/graph_inception_v4.cpp | 13 +++++++------ examples/graph_mobilenet.cpp | 1 - examples/graph_resnet50.cpp | 13 +++++++------ examples/graph_resnet_v2_50.cpp | 13 +++++++------ examples/graph_squeezenet.cpp | 13 +++++++------ examples/graph_squeezenet_v1_1.cpp | 13 +++++++------ examples/graph_srcnn955.cpp | 13 +++++++------ examples/graph_vgg16.cpp | 13 +++++++------ examples/graph_vgg19.cpp | 13 +++++++------ examples/graph_vgg_vdsr.cpp | 13 +++++++------ 12 files changed, 78 insertions(+), 67 deletions(-) (limited to 'examples') diff --git a/examples/graph_deepspeech_v0_4_1.cpp b/examples/graph_deepspeech_v0_4_1.cpp index a5658625c7..da163b6493 100644 --- a/examples/graph_deepspeech_v0_4_1.cpp +++ b/examples/graph_deepspeech_v0_4_1.cpp @@ -208,11 +208,12 @@ public: // Finalize graph GraphConfig config; - config.num_threads = common_params.threads; - config.use_tuner = common_params.enable_tuner; - config.tuner_file = common_params.tuner_file; - config.mlgo_file = common_params.mlgo_file; - config.convert_to_uint8 = (common_params.data_type == DataType::QASYMM8); + config.num_threads = common_params.threads; + config.use_tuner = common_params.enable_tuner; + config.tuner_file = common_params.tuner_file; + config.mlgo_file = common_params.mlgo_file; + config.use_synthetic_type = arm_compute::is_data_type_quantized(common_params.data_type); + config.synthetic_type = common_params.data_type; graph.finalize(common_params.target, config); diff --git a/examples/graph_inception_v3.cpp b/examples/graph_inception_v3.cpp index 8ceeb5c68e..928efb9124 100644 --- a/examples/graph_inception_v3.cpp +++ b/examples/graph_inception_v3.cpp @@ -22,6 +22,8 @@ * SOFTWARE. */ #include "arm_compute/graph.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/core/Utils.h" #include "support/ToolchainSupport.h" #include "utils/CommonGraphOptions.h" #include "utils/GraphUtils.h" @@ -197,13 +199,13 @@ public: // Finalize graph GraphConfig config; - config.num_threads = common_params.threads; - config.use_tuner = common_params.enable_tuner; - config.tuner_mode = common_params.tuner_mode; - config.tuner_file = common_params.tuner_file; - config.mlgo_file = common_params.mlgo_file; - config.convert_to_uint8 = (common_params.data_type == DataType::QASYMM8); - + config.num_threads = common_params.threads; + config.use_tuner = common_params.enable_tuner; + config.tuner_mode = common_params.tuner_mode; + config.tuner_file = common_params.tuner_file; + config.mlgo_file = common_params.mlgo_file; + config.use_synthetic_type = arm_compute::is_data_type_quantized(common_params.data_type); + config.synthetic_type = common_params.data_type; graph.finalize(common_params.target, config); return true; diff --git a/examples/graph_inception_v4.cpp b/examples/graph_inception_v4.cpp index cafa5c9f10..0c67215136 100644 --- a/examples/graph_inception_v4.cpp +++ b/examples/graph_inception_v4.cpp @@ -152,12 +152,13 @@ public: // Finalize graph GraphConfig config; - config.num_threads = common_params.threads; - config.use_tuner = common_params.enable_tuner; - config.tuner_mode = common_params.tuner_mode; - config.tuner_file = common_params.tuner_file; - config.mlgo_file = common_params.mlgo_file; - config.convert_to_uint8 = (common_params.data_type == DataType::QASYMM8); + config.num_threads = common_params.threads; + config.use_tuner = common_params.enable_tuner; + config.tuner_mode = common_params.tuner_mode; + config.tuner_file = common_params.tuner_file; + config.mlgo_file = common_params.mlgo_file; + config.use_synthetic_type = arm_compute::is_data_type_quantized(common_params.data_type); + config.synthetic_type = common_params.data_type; // Load the precompiled kernels from a file into the kernel library, in this way the next time they are needed // compilation won't be required. diff --git a/examples/graph_mobilenet.cpp b/examples/graph_mobilenet.cpp index 09b6e6e097..4d4e17715d 100644 --- a/examples/graph_mobilenet.cpp +++ b/examples/graph_mobilenet.cpp @@ -101,7 +101,6 @@ public: config.tuner_mode = common_params.tuner_mode; config.tuner_file = common_params.tuner_file; config.mlgo_file = common_params.mlgo_file; - config.mlgo_file = common_params.mlgo_file; graph.finalize(common_params.target, config); diff --git a/examples/graph_resnet50.cpp b/examples/graph_resnet50.cpp index b585284c60..5834d9be77 100644 --- a/examples/graph_resnet50.cpp +++ b/examples/graph_resnet50.cpp @@ -111,12 +111,13 @@ public: // Finalize graph GraphConfig config; - config.num_threads = common_params.threads; - config.use_tuner = common_params.enable_tuner; - config.tuner_mode = common_params.tuner_mode; - config.tuner_file = common_params.tuner_file; - config.mlgo_file = common_params.mlgo_file; - config.convert_to_uint8 = (common_params.data_type == DataType::QASYMM8); + config.num_threads = common_params.threads; + config.use_tuner = common_params.enable_tuner; + config.tuner_mode = common_params.tuner_mode; + config.tuner_file = common_params.tuner_file; + config.mlgo_file = common_params.mlgo_file; + config.use_synthetic_type = arm_compute::is_data_type_quantized(common_params.data_type); + config.synthetic_type = common_params.data_type; graph.finalize(common_params.target, config); diff --git a/examples/graph_resnet_v2_50.cpp b/examples/graph_resnet_v2_50.cpp index 472bf02b47..cd4e6fd6df 100644 --- a/examples/graph_resnet_v2_50.cpp +++ b/examples/graph_resnet_v2_50.cpp @@ -114,12 +114,13 @@ public: // Finalize graph GraphConfig config; - config.num_threads = common_params.threads; - config.use_tuner = common_params.enable_tuner; - config.tuner_mode = common_params.tuner_mode; - config.tuner_file = common_params.tuner_file; - config.mlgo_file = common_params.mlgo_file; - config.convert_to_uint8 = (common_params.data_type == DataType::QASYMM8); + config.num_threads = common_params.threads; + config.use_tuner = common_params.enable_tuner; + config.tuner_mode = common_params.tuner_mode; + config.tuner_file = common_params.tuner_file; + config.mlgo_file = common_params.mlgo_file; + config.use_synthetic_type = arm_compute::is_data_type_quantized(common_params.data_type); + config.synthetic_type = common_params.data_type; graph.finalize(common_params.target, config); diff --git a/examples/graph_squeezenet.cpp b/examples/graph_squeezenet.cpp index 3d32794e8d..82d95143be 100644 --- a/examples/graph_squeezenet.cpp +++ b/examples/graph_squeezenet.cpp @@ -164,12 +164,13 @@ public: // Finalize graph GraphConfig config; - config.num_threads = common_params.threads; - config.use_tuner = common_params.enable_tuner; - config.tuner_mode = common_params.tuner_mode; - config.tuner_file = common_params.tuner_file; - config.mlgo_file = common_params.mlgo_file; - config.convert_to_uint8 = (common_params.data_type == DataType::QASYMM8); + config.num_threads = common_params.threads; + config.use_tuner = common_params.enable_tuner; + config.tuner_mode = common_params.tuner_mode; + config.tuner_file = common_params.tuner_file; + config.mlgo_file = common_params.mlgo_file; + config.use_synthetic_type = arm_compute::is_data_type_quantized(common_params.data_type); + config.synthetic_type = common_params.data_type; graph.finalize(common_params.target, config); diff --git a/examples/graph_squeezenet_v1_1.cpp b/examples/graph_squeezenet_v1_1.cpp index 6d4ffee994..1a7d752d50 100644 --- a/examples/graph_squeezenet_v1_1.cpp +++ b/examples/graph_squeezenet_v1_1.cpp @@ -164,12 +164,13 @@ public: // Finalize graph GraphConfig config; - config.num_threads = common_params.threads; - config.use_tuner = common_params.enable_tuner; - config.tuner_mode = common_params.tuner_mode; - config.tuner_file = common_params.tuner_file; - config.mlgo_file = common_params.mlgo_file; - config.convert_to_uint8 = (common_params.data_type == DataType::QASYMM8); + config.num_threads = common_params.threads; + config.use_tuner = common_params.enable_tuner; + config.tuner_mode = common_params.tuner_mode; + config.tuner_file = common_params.tuner_file; + config.mlgo_file = common_params.mlgo_file; + config.use_synthetic_type = arm_compute::is_data_type_quantized(common_params.data_type); + config.synthetic_type = common_params.data_type; graph.finalize(common_params.target, config); diff --git a/examples/graph_srcnn955.cpp b/examples/graph_srcnn955.cpp index f4ffc02130..ccad0b65e4 100644 --- a/examples/graph_srcnn955.cpp +++ b/examples/graph_srcnn955.cpp @@ -115,12 +115,13 @@ public: // Finalize graph GraphConfig config; - config.num_threads = common_params.threads; - config.use_tuner = common_params.enable_tuner; - config.tuner_mode = common_params.tuner_mode; - config.tuner_file = common_params.tuner_file; - config.mlgo_file = common_params.mlgo_file; - config.convert_to_uint8 = (common_params.data_type == DataType::QASYMM8); + config.num_threads = common_params.threads; + config.use_tuner = common_params.enable_tuner; + config.tuner_mode = common_params.tuner_mode; + config.tuner_file = common_params.tuner_file; + config.mlgo_file = common_params.mlgo_file; + config.use_synthetic_type = arm_compute::is_data_type_quantized(common_params.data_type); + config.synthetic_type = common_params.data_type; graph.finalize(common_params.target, config); diff --git a/examples/graph_vgg16.cpp b/examples/graph_vgg16.cpp index 83e663798b..3e453b3626 100644 --- a/examples/graph_vgg16.cpp +++ b/examples/graph_vgg16.cpp @@ -212,12 +212,13 @@ public: // Finalize graph GraphConfig config; - config.num_threads = common_params.threads; - config.use_tuner = common_params.enable_tuner; - config.tuner_mode = common_params.tuner_mode; - config.tuner_file = common_params.tuner_file; - config.mlgo_file = common_params.mlgo_file; - config.convert_to_uint8 = (common_params.data_type == DataType::QASYMM8); + config.num_threads = common_params.threads; + config.use_tuner = common_params.enable_tuner; + config.tuner_mode = common_params.tuner_mode; + config.tuner_file = common_params.tuner_file; + config.mlgo_file = common_params.mlgo_file; + config.use_synthetic_type = arm_compute::is_data_type_quantized(common_params.data_type); + config.synthetic_type = common_params.data_type; graph.finalize(common_params.target, config); diff --git a/examples/graph_vgg19.cpp b/examples/graph_vgg19.cpp index 03f7e1606c..d79aa01326 100644 --- a/examples/graph_vgg19.cpp +++ b/examples/graph_vgg19.cpp @@ -223,12 +223,13 @@ public: // Finalize graph GraphConfig config; - config.num_threads = common_params.threads; - config.use_tuner = common_params.enable_tuner; - config.tuner_mode = common_params.tuner_mode; - config.tuner_file = common_params.tuner_file; - config.mlgo_file = common_params.mlgo_file; - config.convert_to_uint8 = (common_params.data_type == DataType::QASYMM8); + config.num_threads = common_params.threads; + config.use_tuner = common_params.enable_tuner; + config.tuner_mode = common_params.tuner_mode; + config.tuner_file = common_params.tuner_file; + config.mlgo_file = common_params.mlgo_file; + config.use_synthetic_type = arm_compute::is_data_type_quantized(common_params.data_type); + config.synthetic_type = common_params.data_type; graph.finalize(common_params.target, config); diff --git a/examples/graph_vgg_vdsr.cpp b/examples/graph_vgg_vdsr.cpp index bdb898081d..226edcd15b 100644 --- a/examples/graph_vgg_vdsr.cpp +++ b/examples/graph_vgg_vdsr.cpp @@ -136,12 +136,13 @@ public: // Finalize graph GraphConfig config; - config.num_threads = common_params.threads; - config.use_tuner = common_params.enable_tuner; - config.tuner_mode = common_params.tuner_mode; - config.tuner_file = common_params.tuner_file; - config.mlgo_file = common_params.mlgo_file; - config.convert_to_uint8 = (common_params.data_type == DataType::QASYMM8); + config.num_threads = common_params.threads; + config.use_tuner = common_params.enable_tuner; + config.tuner_mode = common_params.tuner_mode; + config.tuner_file = common_params.tuner_file; + config.mlgo_file = common_params.mlgo_file; + config.use_synthetic_type = arm_compute::is_data_type_quantized(common_params.data_type); + config.synthetic_type = common_params.data_type; graph.finalize(common_params.target, config); -- cgit v1.2.1