diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2017-10-02 18:51:47 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | e2c82fee3b6d38f6e79412c78176792b817defd0 (patch) | |
tree | aa6821e33cfe8001c33086191c81c18d66ac7837 /arm_compute/graph/Types.h | |
parent | 48a60f9f7b0b7b5cf38253b7a2ac576aac43ef78 (diff) | |
download | ComputeLibrary-e2c82fee3b6d38f6e79412c78176792b817defd0.tar.gz |
COMPMID-550: Adds support for branches.
Change-Id: I778007c9221ce3156400284c4039b90245eb2b7f
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/90043
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'arm_compute/graph/Types.h')
-rw-r--r-- | arm_compute/graph/Types.h | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h index e48ff84abf..c4396412a7 100644 --- a/arm_compute/graph/Types.h +++ b/arm_compute/graph/Types.h @@ -32,19 +32,20 @@ namespace arm_compute { namespace graph { -using arm_compute::ITensor; -using arm_compute::TensorInfo; -using arm_compute::SubTensorInfo; -using arm_compute::DataType; -using arm_compute::Coordinates; -using arm_compute::TensorShape; -using arm_compute::PadStrideInfo; -using arm_compute::WeightsInfo; using arm_compute::ActivationLayerInfo; +using arm_compute::Coordinates; +using arm_compute::DataType; +using arm_compute::DimensionRoundingType; +using arm_compute::ITensorInfo; using arm_compute::NormType; using arm_compute::NormalizationLayerInfo; +using arm_compute::PadStrideInfo; using arm_compute::PoolingLayerInfo; using arm_compute::PoolingType; +using arm_compute::SubTensorInfo; +using arm_compute::TensorInfo; +using arm_compute::TensorShape; +using arm_compute::WeightsInfo; /**< Execution hint to the graph executor */ enum class TargetHint @@ -54,12 +55,18 @@ enum class TargetHint NEON /**< Run node on a NEON capable device */ }; -/**< Convolution method hint to the graph executor */ +/** Convolution method hint to the graph executor */ enum class ConvolutionMethodHint { GEMM, /**< Convolution using GEMM */ DIRECT /**< Direct convolution */ }; + +/** Branch layer merging method */ +enum class BranchMergeMethod +{ + DEPTH_CONCATENATE /**< Concatenate across depth */ +}; } // namespace graph } // namespace arm_compute #endif /*__ARM_COMPUTE_GRAPH_TYPES_H__*/ |