diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-07-30 12:05:25 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:54:54 +0000 |
| commit | 415a2bfef929439783dfdba03fd67e9701c4822c (patch) | |
| tree | 1068a197ea9830e0d154ff3a348644f21a4af1e6 /utils | |
| parent | 68a3f56627b04acdefebe67d645727dd83889766 (diff) | |
| download | ComputeLibrary-415a2bfef929439783dfdba03fd67e9701c4822c.tar.gz | |
COMPMID-1432: Enable by default NHWC in graph examples
Change-Id: I2240b6a6430cb1d261458343b2900cc1f16ac414
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/141861
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/CommonGraphOptions.cpp | 15 | ||||
| -rw-r--r-- | utils/CommonGraphOptions.h | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/utils/CommonGraphOptions.cpp b/utils/CommonGraphOptions.cpp index 2e5d787448..4247b2d3e5 100644 --- a/utils/CommonGraphOptions.cpp +++ b/utils/CommonGraphOptions.cpp @@ -148,7 +148,7 @@ CommonGraphOptions::CommonGraphOptions(CommandLineParser &parser) target = parser.add_option<EnumOption<Target>>("target", supported_targets, Target::NEON); data_type = parser.add_option<EnumOption<DataType>>("type", supported_data_types, DataType::F32); - data_layout = parser.add_option<EnumOption<DataLayout>>("layout", supported_data_layouts, DataLayout::NCHW); + data_layout = parser.add_option<EnumOption<DataLayout>>("layout", supported_data_layouts); help->set_help("Show this help message"); threads->set_help("Number of threads to use"); @@ -172,11 +172,14 @@ CommonGraphParams consume_common_graph_parameters(CommonGraphOptions &options) auto validation_range = parse_validation_range(options.validation_range->value()); CommonGraphParams common_params; - common_params.help = options.help->is_set() ? options.help->value() : false; - common_params.threads = options.threads->value(); - common_params.target = options.target->value(); - common_params.data_type = options.data_type->value(); - common_params.data_layout = options.data_layout->value(); + common_params.help = options.help->is_set() ? options.help->value() : false; + common_params.threads = options.threads->value(); + common_params.target = options.target->value(); + common_params.data_type = options.data_type->value(); + if(options.data_layout->is_set()) + { + common_params.data_layout = options.data_layout->value(); + } common_params.enable_tuner = options.enable_tuner->is_set() ? options.enable_tuner->value() : false; common_params.fast_math_hint = options.fast_math_hint->is_set() ? fast_math_hint_value : FastMathHint::Disabled; common_params.data_path = options.data_path->value(); diff --git a/utils/CommonGraphOptions.h b/utils/CommonGraphOptions.h index 23c3cc7c30..921889d7c7 100644 --- a/utils/CommonGraphOptions.h +++ b/utils/CommonGraphOptions.h @@ -91,7 +91,7 @@ struct CommonGraphParams int threads{ 0 }; arm_compute::graph::Target target{ arm_compute::graph::Target::NEON }; arm_compute::DataType data_type{ DataType::F32 }; - arm_compute::DataLayout data_layout{ DataLayout::NCHW }; + arm_compute::DataLayout data_layout{ DataLayout::NHWC }; bool enable_tuner{ false }; arm_compute::graph::FastMathHint fast_math_hint{ arm_compute::graph::FastMathHint::Disabled }; std::string data_path{}; |