diff options
Diffstat (limited to 'src/graph/TypeLoader.cpp')
| -rw-r--r-- | src/graph/TypeLoader.cpp | 68 |
1 files changed, 20 insertions, 48 deletions
diff --git a/src/graph/TypeLoader.cpp b/src/graph/TypeLoader.cpp index 81a405b961..e1248fbb6b 100644 --- a/src/graph/TypeLoader.cpp +++ b/src/graph/TypeLoader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -29,36 +29,11 @@ namespace arm_compute { -arm_compute::DataType data_type_from_name(const std::string &name) -{ - static const std::map<std::string, arm_compute::DataType> data_types = - { - { "f16", DataType::F16 }, - { "f32", DataType::F32 }, - { "qasymm8", DataType::QASYMM8 }, - }; - -#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED - try - { -#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ - return data_types.at(arm_compute::utility::tolower(name)); - -#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED - } - catch(const std::out_of_range &) - { - throw std::invalid_argument(name); - } -#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ -} - arm_compute::DataLayout data_layout_from_name(const std::string &name) { - static const std::map<std::string, arm_compute::DataLayout> data_layouts = - { - { "nhwc", DataLayout::NHWC }, - { "nchw", DataLayout::NCHW }, + static const std::map<std::string, arm_compute::DataLayout> data_layouts = { + {"nhwc", DataLayout::NHWC}, + {"nchw", DataLayout::NCHW}, }; #ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED @@ -69,7 +44,7 @@ arm_compute::DataLayout data_layout_from_name(const std::string &name) #ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED } - catch(const std::out_of_range &) + catch (const std::out_of_range &) { throw std::invalid_argument(name); } @@ -79,11 +54,10 @@ namespace graph { Target target_from_name(const std::string &name) { - static const std::map<std::string, Target> targets = - { - { "neon", Target::NEON }, - { "cl", Target::CL }, - { "gc", Target::GC }, + static const std::map<std::string, Target> targets = { + {"neon", Target::NEON}, + {"cl", Target::CL}, + {"clvk", Target::CLVK}, }; #ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED @@ -94,7 +68,7 @@ Target target_from_name(const std::string &name) #ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED } - catch(const std::out_of_range &) + catch (const std::out_of_range &) { throw std::invalid_argument(name); } @@ -103,12 +77,11 @@ Target target_from_name(const std::string &name) ConvolutionMethod Convolution_method_from_name(const std::string &name) { - static const std::map<std::string, ConvolutionMethod> methods = - { - { "default", ConvolutionMethod::Default }, - { "direct", ConvolutionMethod::Direct }, - { "gemm", ConvolutionMethod::GEMM }, - { "winograd", ConvolutionMethod::Winograd }, + static const std::map<std::string, ConvolutionMethod> methods = { + {"default", ConvolutionMethod::Default}, + {"direct", ConvolutionMethod::Direct}, + {"gemm", ConvolutionMethod::GEMM}, + {"winograd", ConvolutionMethod::Winograd}, }; #ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED @@ -119,7 +92,7 @@ ConvolutionMethod Convolution_method_from_name(const std::string &name) #ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED } - catch(const std::out_of_range &) + catch (const std::out_of_range &) { throw std::invalid_argument(name); } @@ -128,10 +101,9 @@ ConvolutionMethod Convolution_method_from_name(const std::string &name) DepthwiseConvolutionMethod depthwise_convolution_method_from_name(const std::string &name) { - static const std::map<std::string, DepthwiseConvolutionMethod> methods = - { - { "default", DepthwiseConvolutionMethod::Default }, - { "optimized3x3", DepthwiseConvolutionMethod::Optimized3x3 }, + static const std::map<std::string, DepthwiseConvolutionMethod> methods = { + {"default", DepthwiseConvolutionMethod::Default}, + {"optimized3x3", DepthwiseConvolutionMethod::Optimized3x3}, }; #ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED @@ -142,7 +114,7 @@ DepthwiseConvolutionMethod depthwise_convolution_method_from_name(const std::str #ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED } - catch(const std::out_of_range &) + catch (const std::out_of_range &) { throw std::invalid_argument(name); } |