diff options
Diffstat (limited to 'compiler/mir/include')
-rw-r--r-- | compiler/mir/include/mir/Graph.h | 4 | ||||
-rw-r--r-- | compiler/mir/include/mir/Quantization.h | 2 | ||||
-rw-r--r-- | compiler/mir/include/mir/ShapeRange.h | 2 | ||||
-rw-r--r-- | compiler/mir/include/mir/TensorType.h | 2 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/AvgPool2DOp.h | 2 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/ConcatOp.h | 2 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/Conv2DOp.h | 4 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/Deconv2DOp.h | 4 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/DepthwiseConv2DOp.h | 4 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/FullyConnectedOp.h | 4 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/GatherOp.h | 2 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/MaxPool2DOp.h | 2 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/PadOp.h | 2 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/ReduceMeanOp.h | 2 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/ReduceOp.h | 2 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/ResizeOp.h | 4 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/SliceOp.h | 2 | ||||
-rw-r--r-- | compiler/mir/include/mir/ops/SqueezeOp.h | 2 |
18 files changed, 26 insertions, 22 deletions
diff --git a/compiler/mir/include/mir/Graph.h b/compiler/mir/include/mir/Graph.h index bf94cfb14..37bfdb361 100644 --- a/compiler/mir/include/mir/Graph.h +++ b/compiler/mir/include/mir/Graph.h @@ -103,6 +103,10 @@ private: /** * @brief Returns nodes of the graph sorted topologically. + * @note Sorting order priority + * 1) Graph input node (input index order) + * 2) Constant node (unordered - cannot predict order) + * 3) Ready node (unordered - cannot predict order) */ std::vector<Operation *> getSortedNodes(Graph *graph); diff --git a/compiler/mir/include/mir/Quantization.h b/compiler/mir/include/mir/Quantization.h index d266ee00d..901915a74 100644 --- a/compiler/mir/include/mir/Quantization.h +++ b/compiler/mir/include/mir/Quantization.h @@ -26,7 +26,7 @@ public: AffineQuantization() = default; AffineQuantization(float scale, int zero_point) - : _scale(scale), _zero_point(zero_point), _empty(false) + : _scale(scale), _zero_point(zero_point), _empty(false) { } diff --git a/compiler/mir/include/mir/ShapeRange.h b/compiler/mir/include/mir/ShapeRange.h index a450bf090..70b29715f 100644 --- a/compiler/mir/include/mir/ShapeRange.h +++ b/compiler/mir/include/mir/ShapeRange.h @@ -26,7 +26,7 @@ namespace mir { class ShapeIter - : public std::iterator<std::forward_iterator_tag, Index, std::size_t, Index *, Index &> + : public std::iterator<std::forward_iterator_tag, Index, std::size_t, Index *, Index &> { public: ShapeIter &operator++() diff --git a/compiler/mir/include/mir/TensorType.h b/compiler/mir/include/mir/TensorType.h index 98797d687..b94a26eeb 100644 --- a/compiler/mir/include/mir/TensorType.h +++ b/compiler/mir/include/mir/TensorType.h @@ -34,7 +34,7 @@ public: } TensorType(DataType element_type, const Shape &shape, const AffineQuantization &quant) - : _element_type(element_type), _shape(shape), _quantization(quant) + : _element_type(element_type), _shape(shape), _quantization(quant) { } diff --git a/compiler/mir/include/mir/ops/AvgPool2DOp.h b/compiler/mir/include/mir/ops/AvgPool2DOp.h index 47fe058ee..37fb66437 100644 --- a/compiler/mir/include/mir/ops/AvgPool2DOp.h +++ b/compiler/mir/include/mir/ops/AvgPool2DOp.h @@ -32,7 +32,7 @@ class AvgPool2DOp : public Operation { public: AvgPool2DOp(Output *arg, const AvgPool2DOpAttributes &attributes) - : Operation(Type::avgPool2D, {arg}), _attributes(attributes) + : Operation(Type::avgPool2D, {arg}), _attributes(attributes) { inferOutputTypes(); } diff --git a/compiler/mir/include/mir/ops/ConcatOp.h b/compiler/mir/include/mir/ops/ConcatOp.h index 4f46d4449..d1f9142fa 100644 --- a/compiler/mir/include/mir/ops/ConcatOp.h +++ b/compiler/mir/include/mir/ops/ConcatOp.h @@ -31,7 +31,7 @@ class ConcatOp : public Operation { public: ConcatOp(const std::vector<Output *> &args, int32_t axis) - : Operation(Type::concat, args), _axis(axis) + : Operation(Type::concat, args), _axis(axis) { inferOutputTypes(); } diff --git a/compiler/mir/include/mir/ops/Conv2DOp.h b/compiler/mir/include/mir/ops/Conv2DOp.h index ec818dae5..f8590a947 100644 --- a/compiler/mir/include/mir/ops/Conv2DOp.h +++ b/compiler/mir/include/mir/ops/Conv2DOp.h @@ -30,13 +30,13 @@ class Conv2DOp : public Operation { public: Conv2DOp(Output *input, Output *kernel, const Conv2DOpAttributes &attributes) - : Operation(Type::conv2D, {input, kernel}), _attributes(attributes) + : Operation(Type::conv2D, {input, kernel}), _attributes(attributes) { inferOutputTypes(); } Conv2DOp(Output *input, Output *kernel, Output *bias, const Conv2DOpAttributes &attributes) - : Operation(Type::conv2D, {input, kernel, bias}), _attributes(attributes) + : Operation(Type::conv2D, {input, kernel, bias}), _attributes(attributes) { inferOutputTypes(); } diff --git a/compiler/mir/include/mir/ops/Deconv2DOp.h b/compiler/mir/include/mir/ops/Deconv2DOp.h index a7b548028..9565eeb37 100644 --- a/compiler/mir/include/mir/ops/Deconv2DOp.h +++ b/compiler/mir/include/mir/ops/Deconv2DOp.h @@ -33,14 +33,14 @@ class DeConv2DOp : public Operation { public: DeConv2DOp(Output *input, Output *kernel, const Deconv2DOpAttributes &attributes) - : Operation(Type::deConv2D, {input, kernel}), _attributes(attributes) + : Operation(Type::deConv2D, {input, kernel}), _attributes(attributes) { inferOutputTypes(); } DeConv2DOp(Output *input, Output *kernel, const Deconv2DOpAttributes &attributes, const Shape &output_shape) - : Operation(Type::deConv2D, {input, kernel}), _attributes(attributes) + : Operation(Type::deConv2D, {input, kernel}), _attributes(attributes) { assert(input->getElementType() == kernel->getElementType()); setOutputType(0, {input->getElementType(), output_shape}); diff --git a/compiler/mir/include/mir/ops/DepthwiseConv2DOp.h b/compiler/mir/include/mir/ops/DepthwiseConv2DOp.h index 347b8e94f..558d60a4a 100644 --- a/compiler/mir/include/mir/ops/DepthwiseConv2DOp.h +++ b/compiler/mir/include/mir/ops/DepthwiseConv2DOp.h @@ -30,14 +30,14 @@ class DepthwiseConv2DOp : public Operation { public: DepthwiseConv2DOp(Output *input, Output *kernel, const Conv2DOpAttributes &attributes) - : Operation(Type::depthwiseConv, {input, kernel}), _attributes(attributes) + : Operation(Type::depthwiseConv, {input, kernel}), _attributes(attributes) { inferOutputTypes(); } DepthwiseConv2DOp(Output *input, Output *kernel, Output *bias, const Conv2DOpAttributes &attributes) - : Operation(Type::depthwiseConv, {input, kernel, bias}), _attributes(attributes) + : Operation(Type::depthwiseConv, {input, kernel, bias}), _attributes(attributes) { inferOutputTypes(); } diff --git a/compiler/mir/include/mir/ops/FullyConnectedOp.h b/compiler/mir/include/mir/ops/FullyConnectedOp.h index 589c42df9..f937df539 100644 --- a/compiler/mir/include/mir/ops/FullyConnectedOp.h +++ b/compiler/mir/include/mir/ops/FullyConnectedOp.h @@ -29,13 +29,13 @@ class FullyConnectedOp : public Operation { public: FullyConnectedOp(Output *input, Output *weights) - : Operation(Type::fullyConnected, {input, weights}) + : Operation(Type::fullyConnected, {input, weights}) { inferOutputTypes(); } FullyConnectedOp(Output *input, Output *weights, Output *bias) - : Operation(Type::fullyConnected, {input, weights, bias}) + : Operation(Type::fullyConnected, {input, weights, bias}) { inferOutputTypes(); } diff --git a/compiler/mir/include/mir/ops/GatherOp.h b/compiler/mir/include/mir/ops/GatherOp.h index 899c9f169..58ea04074 100644 --- a/compiler/mir/include/mir/ops/GatherOp.h +++ b/compiler/mir/include/mir/ops/GatherOp.h @@ -33,7 +33,7 @@ class GatherOp : public Operation { public: GatherOp(Output *data, Output *indices, int32_t axis) - : Operation(Type::gather, {data, indices}), _axis(axis) + : Operation(Type::gather, {data, indices}), _axis(axis) { inferOutputTypes(); } diff --git a/compiler/mir/include/mir/ops/MaxPool2DOp.h b/compiler/mir/include/mir/ops/MaxPool2DOp.h index 7c5df4a53..4345cfc18 100644 --- a/compiler/mir/include/mir/ops/MaxPool2DOp.h +++ b/compiler/mir/include/mir/ops/MaxPool2DOp.h @@ -32,7 +32,7 @@ class MaxPool2DOp : public Operation { public: MaxPool2DOp(Output *arg, const MaxPool2DOpAttributes &attributes) - : Operation(Type::maxPool2D, {arg}), _attributes(attributes) + : Operation(Type::maxPool2D, {arg}), _attributes(attributes) { inferOutputTypes(); } diff --git a/compiler/mir/include/mir/ops/PadOp.h b/compiler/mir/include/mir/ops/PadOp.h index 76453acec..d229a97bd 100644 --- a/compiler/mir/include/mir/ops/PadOp.h +++ b/compiler/mir/include/mir/ops/PadOp.h @@ -29,7 +29,7 @@ class PadOp : public Operation { public: PadOp(Output *arg, const PadOpAttributes &attributes) - : Operation(Type::pad, {arg}), _attributes(attributes) + : Operation(Type::pad, {arg}), _attributes(attributes) { assert(_attributes.padding_before.size() == _attributes.padding_after.size()); inferOutputTypes(); diff --git a/compiler/mir/include/mir/ops/ReduceMeanOp.h b/compiler/mir/include/mir/ops/ReduceMeanOp.h index add47ac75..5759b845e 100644 --- a/compiler/mir/include/mir/ops/ReduceMeanOp.h +++ b/compiler/mir/include/mir/ops/ReduceMeanOp.h @@ -29,7 +29,7 @@ class ReduceMeanOp : public ReduceOp { public: ReduceMeanOp(Output *arg, const std::vector<int> &reduction_dims, bool keep_dims) - : ReduceOp(Type::reduceMean, arg, reduction_dims, keep_dims) + : ReduceOp(Type::reduceMean, arg, reduction_dims, keep_dims) { } diff --git a/compiler/mir/include/mir/ops/ReduceOp.h b/compiler/mir/include/mir/ops/ReduceOp.h index 0f46a4596..5204a0903 100644 --- a/compiler/mir/include/mir/ops/ReduceOp.h +++ b/compiler/mir/include/mir/ops/ReduceOp.h @@ -29,7 +29,7 @@ class ReduceOp : public Operation { protected: ReduceOp(Type type, Output *arg, const std::vector<int> &reduction_dims, bool keep_dims) - : Operation(type, {arg}), _reduction_dims(reduction_dims), _keep_dims(keep_dims) + : Operation(type, {arg}), _reduction_dims(reduction_dims), _keep_dims(keep_dims) { inferOutputTypes(); } diff --git a/compiler/mir/include/mir/ops/ResizeOp.h b/compiler/mir/include/mir/ops/ResizeOp.h index 51e1b0b76..62743e396 100644 --- a/compiler/mir/include/mir/ops/ResizeOp.h +++ b/compiler/mir/include/mir/ops/ResizeOp.h @@ -40,7 +40,7 @@ public: }; ResizeOp(Output *arg, ResizeMethod mode, const std::vector<float> &scales) - : Operation(Type::resizeIm, {arg}), _mode(mode), _scales(scales) + : Operation(Type::resizeIm, {arg}), _mode(mode), _scales(scales) { // Infer output shape based on given scales. auto &input_shape = getInputShape(0); @@ -61,7 +61,7 @@ public: } ResizeOp(Output *arg, ResizeMethod mode, const Shape &output_shape) - : Operation(Type::resizeIm, {arg}), _mode(mode) + : Operation(Type::resizeIm, {arg}), _mode(mode) { // Calculate scales based on given shape. auto &input_shape = getInputShape(0); diff --git a/compiler/mir/include/mir/ops/SliceOp.h b/compiler/mir/include/mir/ops/SliceOp.h index 6370de4fa..1627d4b82 100644 --- a/compiler/mir/include/mir/ops/SliceOp.h +++ b/compiler/mir/include/mir/ops/SliceOp.h @@ -28,7 +28,7 @@ class SliceOp : public Operation { public: SliceOp(Output *arg, const Shape &starts, const Shape &sizes) - : Operation(Type::slice, {arg}), _starts(starts), _sizes(sizes) + : Operation(Type::slice, {arg}), _starts(starts), _sizes(sizes) { inferOutputTypes(); } diff --git a/compiler/mir/include/mir/ops/SqueezeOp.h b/compiler/mir/include/mir/ops/SqueezeOp.h index 8ef2a78bb..735b7d86d 100644 --- a/compiler/mir/include/mir/ops/SqueezeOp.h +++ b/compiler/mir/include/mir/ops/SqueezeOp.h @@ -29,7 +29,7 @@ class SqueezeOp : public Operation { public: SqueezeOp(Output *arg, const std::vector<std::int32_t> &dims_to_squeeze) - : Operation(Type::squeeze, {arg}), _dims_to_squeeze(dims_to_squeeze) + : Operation(Type::squeeze, {arg}), _dims_to_squeeze(dims_to_squeeze) { // Infer output shape. inferOutputTypes(); |