From e2220551b7a64b929650ba9a60529c31e70c13c5 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 20 Jul 2018 13:23:44 +0100 Subject: COMPMID-1367: Enable NHWC in graph examples Change-Id: Iabc54a3a1bdcd46a9a921cda39c7c85fef672b72 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/141449 Reviewed-by: Giorgio Arena Reviewed-by: Anthony Barbier Tested-by: Jenkins --- arm_compute/graph/Types.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'arm_compute/graph/Types.h') diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h index c5b7fb1c51..f22f50ac82 100644 --- a/arm_compute/graph/Types.h +++ b/arm_compute/graph/Types.h @@ -96,33 +96,33 @@ enum class Target /** Supported Element-wise operations */ enum class EltwiseOperation { - ADD, /**< Arithmetic addition */ - SUB, /**< Arithmetic subtraction */ - MUL /**< Arithmetic multiplication */ + Add, /**< Arithmetic addition */ + Sub, /**< Arithmetic subtraction */ + Mul /**< Arithmetic multiplication */ }; /** Supported Convolution layer methods */ enum class ConvolutionMethod { - DEFAULT, /**< Default approach using internal heuristics */ + Default, /**< Default approach using internal heuristics */ GEMM, /**< GEMM based convolution */ - DIRECT, /**< Deep direct convolution */ - WINOGRAD /**< Winograd based convolution */ + Direct, /**< Deep direct convolution */ + Winograd /**< Winograd based convolution */ }; /** Supported Depthwise Convolution layer methods */ enum class DepthwiseConvolutionMethod { - DEFAULT, /**< Default approach using internal heuristics */ - GEMV, /**< Generic GEMV based depthwise convolution */ - OPTIMIZED_3x3, /**< Optimized 3x3 direct depthwise convolution */ + Default, /**< Default approach using internal heuristics */ + GEMV, /**< Generic GEMV based depthwise convolution */ + Optimized3x3, /**< Optimized 3x3 direct depthwise convolution */ }; /** Enable or disable fast math for Convolution layer */ enum class FastMathHint { - ENABLED, /**< Fast math enabled for Convolution layer */ - DISABLED, /**< Fast math disabled for Convolution layer */ + Enabled, /**< Fast math enabled for Convolution layer */ + Disabled, /**< Fast math disabled for Convolution layer */ }; /** Supported nodes */ @@ -131,9 +131,9 @@ enum class NodeType ActivationLayer, BatchNormalizationLayer, ChannelShuffleLayer, + ConcatenateLayer, ConvolutionLayer, DeconvolutionLayer, - DepthConcatenateLayer, DepthwiseConvolutionLayer, EltwiseLayer, FlattenLayer, -- cgit v1.2.1