aboutsummaryrefslogtreecommitdiff
path: root/delegate/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'delegate/src/test')
-rw-r--r--delegate/src/test/ActivationTestHelper.hpp8
-rw-r--r--delegate/src/test/ArmnnDelegateTest.cpp2
-rw-r--r--delegate/src/test/ComparisonTestHelper.hpp8
-rw-r--r--delegate/src/test/ConvolutionTestHelper.hpp16
-rw-r--r--delegate/src/test/ElementwiseBinaryTestHelper.hpp8
-rw-r--r--delegate/src/test/ElementwiseUnaryTestHelper.hpp8
-rw-r--r--delegate/src/test/FullyConnectedTestHelper.hpp8
-rw-r--r--delegate/src/test/Pooling2dTestHelper.hpp8
-rw-r--r--delegate/src/test/QuantizationTestHelper.hpp8
-rw-r--r--delegate/src/test/RedefineTestHelper.hpp12
-rw-r--r--delegate/src/test/ResizeTestHelper.hpp8
-rw-r--r--delegate/src/test/TransposeTestHelper.hpp8
12 files changed, 51 insertions, 51 deletions
diff --git a/delegate/src/test/ActivationTestHelper.hpp b/delegate/src/test/ActivationTestHelper.hpp
index 04da3ccc49..2368a36931 100644
--- a/delegate/src/test/ActivationTestHelper.hpp
+++ b/delegate/src/test/ActivationTestHelper.hpp
@@ -38,16 +38,16 @@ std::vector<char> CreateActivationTfLiteModel(tflite::BuiltinOperator activation
tensorType);
// create operator
- const std::vector<int> operatorInputs{{0}};
- const std::vector<int> operatorOutputs{{1}};
+ const std::vector<int> operatorInputs{0};
+ const std::vector<int> operatorOutputs{1};
flatbuffers::Offset <Operator> unaryOperator =
CreateOperator(flatBufferBuilder,
0,
flatBufferBuilder.CreateVector<int32_t>(operatorInputs.data(), operatorInputs.size()),
flatBufferBuilder.CreateVector<int32_t>(operatorOutputs.data(), operatorOutputs.size()));
- const std::vector<int> subgraphInputs{{0}};
- const std::vector<int> subgraphOutputs{{1}};
+ const std::vector<int> subgraphInputs{0};
+ const std::vector<int> subgraphOutputs{1};
flatbuffers::Offset <SubGraph> subgraph =
CreateSubGraph(flatBufferBuilder,
flatBufferBuilder.CreateVector(tensors.data(), tensors.size()),
diff --git a/delegate/src/test/ArmnnDelegateTest.cpp b/delegate/src/test/ArmnnDelegateTest.cpp
index 050fe45ca0..84bc31172d 100644
--- a/delegate/src/test/ArmnnDelegateTest.cpp
+++ b/delegate/src/test/ArmnnDelegateTest.cpp
@@ -7,10 +7,10 @@
#include <doctest/doctest.h>
#include <armnn_delegate.hpp>
-#include "ElementwiseUnaryTestHelper.hpp"
#include "tensorflow/lite/kernels/builtin_op_kernels.h"
#include <tensorflow/lite/interpreter.h>
+#include <tensorflow/lite/kernels/register.h>
namespace armnnDelegate
{
diff --git a/delegate/src/test/ComparisonTestHelper.hpp b/delegate/src/test/ComparisonTestHelper.hpp
index 21fc3a83a4..c9ccb778ac 100644
--- a/delegate/src/test/ComparisonTestHelper.hpp
+++ b/delegate/src/test/ComparisonTestHelper.hpp
@@ -107,8 +107,8 @@ std::vector<char> CreateComparisonTfLiteModel(tflite::BuiltinOperator comparison
default:
break;
}
- const std::vector<int32_t> operatorInputs{ {0, 1} };
- const std::vector<int32_t> operatorOutputs{{2}};
+ const std::vector<int32_t> operatorInputs{0, 1};
+ const std::vector<int32_t> operatorOutputs{2};
flatbuffers::Offset <Operator> comparisonOperator =
CreateOperator(flatBufferBuilder,
0,
@@ -117,8 +117,8 @@ std::vector<char> CreateComparisonTfLiteModel(tflite::BuiltinOperator comparison
operatorBuiltinOptionsType,
operatorBuiltinOptions);
- const std::vector<int> subgraphInputs{ {0, 1} };
- const std::vector<int> subgraphOutputs{{2}};
+ const std::vector<int> subgraphInputs{0, 1};
+ const std::vector<int> subgraphOutputs{2};
flatbuffers::Offset <SubGraph> subgraph =
CreateSubGraph(flatBufferBuilder,
flatBufferBuilder.CreateVector(tensors.data(), tensors.size()),
diff --git a/delegate/src/test/ConvolutionTestHelper.hpp b/delegate/src/test/ConvolutionTestHelper.hpp
index b3175174d2..b2a3c889e6 100644
--- a/delegate/src/test/ConvolutionTestHelper.hpp
+++ b/delegate/src/test/ConvolutionTestHelper.hpp
@@ -137,8 +137,8 @@ std::vector<char> CreateConv2dTfLiteModel(tflite::BuiltinOperator convolutionOpe
}
// create operator
- const std::vector<int> operatorInputs{{0, 1, 2}};
- const std::vector<int> operatorOutputs{{3}};
+ const std::vector<int> operatorInputs{0, 1, 2};
+ const std::vector<int> operatorOutputs{3};
flatbuffers::Offset <Operator> convolutionOperator =
CreateOperator(flatBufferBuilder,
0,
@@ -147,8 +147,8 @@ std::vector<char> CreateConv2dTfLiteModel(tflite::BuiltinOperator convolutionOpe
operatorBuiltinOptionsType,
operatorBuiltinOptions);
- const std::vector<int> subgraphInputs{ {0, 1, 2} };
- const std::vector<int> subgraphOutputs{{3}};
+ const std::vector<int> subgraphInputs{0, 1, 2};
+ const std::vector<int> subgraphOutputs{3};
flatbuffers::Offset <SubGraph> subgraph =
CreateSubGraph(flatBufferBuilder,
flatBufferBuilder.CreateVector(tensors.data(), tensors.size()),
@@ -363,8 +363,8 @@ std::vector<char> CreateTransposeConvTfLiteModel(tflite::TensorType tensorType,
CreateTransposeConvOptions(flatBufferBuilder, padding, strideX, strideY).Union();
// create operator
- const std::vector<int> operatorInputs{{0, 1, 2}};
- const std::vector<int> operatorOutputs{{3}};
+ const std::vector<int> operatorInputs{0, 1, 2};
+ const std::vector<int> operatorOutputs{3};
flatbuffers::Offset <Operator> convolutionOperator =
CreateOperator(flatBufferBuilder,
0,
@@ -373,8 +373,8 @@ std::vector<char> CreateTransposeConvTfLiteModel(tflite::TensorType tensorType,
operatorBuiltinOptionsType,
operatorBuiltinOptions);
- const std::vector<int> subgraphInputs{ {0, 1, 2} };
- const std::vector<int> subgraphOutputs{{3}};
+ const std::vector<int> subgraphInputs{0, 1, 2};
+ const std::vector<int> subgraphOutputs{3};
flatbuffers::Offset <SubGraph> subgraph =
CreateSubGraph(flatBufferBuilder,
flatBufferBuilder.CreateVector(tensors.data(), tensors.size()),
diff --git a/delegate/src/test/ElementwiseBinaryTestHelper.hpp b/delegate/src/test/ElementwiseBinaryTestHelper.hpp
index 60092726a2..0c096d85c3 100644
--- a/delegate/src/test/ElementwiseBinaryTestHelper.hpp
+++ b/delegate/src/test/ElementwiseBinaryTestHelper.hpp
@@ -109,8 +109,8 @@ std::vector<char> CreateElementwiseBinaryTfLiteModel(tflite::BuiltinOperator bin
default:
break;
}
- const std::vector<int32_t> operatorInputs{ {0, 1} };
- const std::vector<int32_t> operatorOutputs{{2}};
+ const std::vector<int32_t> operatorInputs{0, 1};
+ const std::vector<int32_t> operatorOutputs{2};
flatbuffers::Offset <Operator> elementwiseBinaryOperator =
CreateOperator(flatBufferBuilder,
0,
@@ -119,8 +119,8 @@ std::vector<char> CreateElementwiseBinaryTfLiteModel(tflite::BuiltinOperator bin
operatorBuiltinOptionsType,
operatorBuiltinOptions);
- const std::vector<int> subgraphInputs{ {0, 1} };
- const std::vector<int> subgraphOutputs{{2}};
+ const std::vector<int> subgraphInputs{0, 1};
+ const std::vector<int> subgraphOutputs{2};
flatbuffers::Offset <SubGraph> subgraph =
CreateSubGraph(flatBufferBuilder,
flatBufferBuilder.CreateVector(tensors.data(), tensors.size()),
diff --git a/delegate/src/test/ElementwiseUnaryTestHelper.hpp b/delegate/src/test/ElementwiseUnaryTestHelper.hpp
index 348c8abcef..2683339eb5 100644
--- a/delegate/src/test/ElementwiseUnaryTestHelper.hpp
+++ b/delegate/src/test/ElementwiseUnaryTestHelper.hpp
@@ -40,16 +40,16 @@ std::vector<char> CreateElementwiseUnaryTfLiteModel(tflite::BuiltinOperator unar
tensorType);
// create operator
- const std::vector<int> operatorInputs{{0}};
- const std::vector<int> operatorOutputs{{1}};
+ const std::vector<int> operatorInputs{0};
+ const std::vector<int> operatorOutputs{1};
flatbuffers::Offset <Operator> unaryOperator =
CreateOperator(flatBufferBuilder,
0,
flatBufferBuilder.CreateVector<int32_t>(operatorInputs.data(), operatorInputs.size()),
flatBufferBuilder.CreateVector<int32_t>(operatorOutputs.data(), operatorOutputs.size()));
- const std::vector<int> subgraphInputs{{0}};
- const std::vector<int> subgraphOutputs{{1}};
+ const std::vector<int> subgraphInputs{0};
+ const std::vector<int> subgraphOutputs{1};
flatbuffers::Offset <SubGraph> subgraph =
CreateSubGraph(flatBufferBuilder,
flatBufferBuilder.CreateVector(tensors.data(), tensors.size()),
diff --git a/delegate/src/test/FullyConnectedTestHelper.hpp b/delegate/src/test/FullyConnectedTestHelper.hpp
index 4b30424d86..1b6ca941b8 100644
--- a/delegate/src/test/FullyConnectedTestHelper.hpp
+++ b/delegate/src/test/FullyConnectedTestHelper.hpp
@@ -111,8 +111,8 @@ std::vector<char> CreateFullyConnectedTfLiteModel(tflite::TensorType tensorType,
activationType,
FullyConnectedOptionsWeightsFormat_DEFAULT, false).Union();
- const std::vector<int> operatorInputs{ {0, 1, 2} };
- const std::vector<int> operatorOutputs{ {3} };
+ const std::vector<int> operatorInputs{0, 1, 2};
+ const std::vector<int> operatorOutputs{3};
flatbuffers::Offset <Operator> fullyConnectedOperator =
CreateOperator(flatBufferBuilder,
0,
@@ -120,8 +120,8 @@ std::vector<char> CreateFullyConnectedTfLiteModel(tflite::TensorType tensorType,
flatBufferBuilder.CreateVector<int32_t>(operatorOutputs.data(), operatorOutputs.size()),
operatorBuiltinOptionsType, operatorBuiltinOptions);
- const std::vector<int> subgraphInputs{ {0, 1, 2} };
- const std::vector<int> subgraphOutputs{ {3} };
+ const std::vector<int> subgraphInputs{0, 1, 2};
+ const std::vector<int> subgraphOutputs{3};
flatbuffers::Offset <SubGraph> subgraph =
CreateSubGraph(flatBufferBuilder,
flatBufferBuilder.CreateVector(tensors.data(), tensors.size()),
diff --git a/delegate/src/test/Pooling2dTestHelper.hpp b/delegate/src/test/Pooling2dTestHelper.hpp
index c2c7be7955..b5d36b0231 100644
--- a/delegate/src/test/Pooling2dTestHelper.hpp
+++ b/delegate/src/test/Pooling2dTestHelper.hpp
@@ -75,8 +75,8 @@ std::vector<char> CreatePooling2dTfLiteModel(
filterHeight,
fusedActivation).Union();
- const std::vector<int32_t> operatorInputs{{0}};
- const std::vector<int32_t> operatorOutputs{{1}};
+ const std::vector<int32_t> operatorInputs{0};
+ const std::vector<int32_t> operatorOutputs{1};
flatbuffers::Offset <Operator> poolingOperator =
CreateOperator(flatBufferBuilder,
0,
@@ -85,8 +85,8 @@ std::vector<char> CreatePooling2dTfLiteModel(
operatorBuiltinOptionsType,
operatorBuiltinOptions);
- const std::vector<int> subgraphInputs{{0}};
- const std::vector<int> subgraphOutputs{{1}};
+ const std::vector<int> subgraphInputs{0};
+ const std::vector<int> subgraphOutputs{1};
flatbuffers::Offset <SubGraph> subgraph =
CreateSubGraph(flatBufferBuilder,
flatBufferBuilder.CreateVector(tensors.data(), tensors.size()),
diff --git a/delegate/src/test/QuantizationTestHelper.hpp b/delegate/src/test/QuantizationTestHelper.hpp
index 2843e43233..e4155040cd 100644
--- a/delegate/src/test/QuantizationTestHelper.hpp
+++ b/delegate/src/test/QuantizationTestHelper.hpp
@@ -78,8 +78,8 @@ std::vector<char> CreateQuantizationTfLiteModel(tflite::BuiltinOperator quantiza
break;
}
- const std::vector<int32_t> operatorInputs{ {0} };
- const std::vector<int32_t> operatorOutputs{{1}};
+ const std::vector<int32_t> operatorInputs{0};
+ const std::vector<int32_t> operatorOutputs{1};
flatbuffers::Offset <Operator> quantizationOperator =
CreateOperator(flatBufferBuilder,
0,
@@ -88,8 +88,8 @@ std::vector<char> CreateQuantizationTfLiteModel(tflite::BuiltinOperator quantiza
operatorBuiltinOptionsType,
operatorBuiltinOptions);
- const std::vector<int> subgraphInputs{ {0} };
- const std::vector<int> subgraphOutputs{{1}};
+ const std::vector<int> subgraphInputs{0};
+ const std::vector<int> subgraphOutputs{1};
flatbuffers::Offset <SubGraph> subgraph =
CreateSubGraph(flatBufferBuilder,
flatBufferBuilder.CreateVector(tensors.data(), tensors.size()),
diff --git a/delegate/src/test/RedefineTestHelper.hpp b/delegate/src/test/RedefineTestHelper.hpp
index 42fc4c878c..ca8246c3a6 100644
--- a/delegate/src/test/RedefineTestHelper.hpp
+++ b/delegate/src/test/RedefineTestHelper.hpp
@@ -68,8 +68,8 @@ std::vector<char> CreateRedefineTfLiteModel(
if (useOption)
{
tensors = { inputTensor, outputTensor};
- operatorInputs = {{0}};
- subgraphInputs = {{0}};
+ operatorInputs = {0};
+ subgraphInputs = {0};
operatorBuiltinOptions = CreateReshapeOptions(
flatBufferBuilder,
flatBufferBuilder.CreateVector(targetShape.data(), targetShape.size())).Union();
@@ -87,15 +87,15 @@ std::vector<char> CreateRedefineTfLiteModel(
2,
flatBufferBuilder.CreateString("shape"));
tensors = { inputTensor, outputTensor, shapeTensor };
- operatorInputs = {{ 0, 2 }};
- subgraphInputs = {{ 0, 2 }};
+ operatorInputs = {0, 2};
+ subgraphInputs = {0, 2};
operatorBuiltinOptions = CreateReshapeOptions(flatBufferBuilder).Union();
}
// create operator
tflite::BuiltinOptions operatorBuiltinOptionsType = BuiltinOptions_ReshapeOptions;
- const std::vector<int32_t> operatorOutputs{{1}};
+ const std::vector<int32_t> operatorOutputs{1};
flatbuffers::Offset <Operator> redefineOperator =
CreateOperator(flatBufferBuilder,
0,
@@ -104,7 +104,7 @@ std::vector<char> CreateRedefineTfLiteModel(
operatorBuiltinOptionsType,
operatorBuiltinOptions);
- const std::vector<int> subgraphOutputs{{1}};
+ const std::vector<int> subgraphOutputs{1};
flatbuffers::Offset <SubGraph> subgraph =
CreateSubGraph(flatBufferBuilder,
flatBufferBuilder.CreateVector(tensors.data(), tensors.size()),
diff --git a/delegate/src/test/ResizeTestHelper.hpp b/delegate/src/test/ResizeTestHelper.hpp
index 1e9d3bcb3b..030b2a7a4a 100644
--- a/delegate/src/test/ResizeTestHelper.hpp
+++ b/delegate/src/test/ResizeTestHelper.hpp
@@ -80,8 +80,8 @@ std::vector<char> CreateResizeTfLiteModel(tflite::BuiltinOperator operatorCode,
break;
}
- const std::vector<int> operatorInputs{{0, 1}};
- const std::vector<int> operatorOutputs{{2}};
+ const std::vector<int> operatorInputs{0, 1};
+ const std::vector<int> operatorOutputs{2};
flatbuffers::Offset <Operator> resizeOperator =
CreateOperator(flatBufferBuilder,
0,
@@ -90,8 +90,8 @@ std::vector<char> CreateResizeTfLiteModel(tflite::BuiltinOperator operatorCode,
operatorBuiltinOptionsType,
operatorBuiltinOption);
- const std::vector<int> subgraphInputs{{0, 1}};
- const std::vector<int> subgraphOutputs{{2}};
+ const std::vector<int> subgraphInputs{0, 1};
+ const std::vector<int> subgraphOutputs{2};
flatbuffers::Offset <SubGraph> subgraph =
CreateSubGraph(flatBufferBuilder,
flatBufferBuilder.CreateVector(tensors.data(), tensors.size()),
diff --git a/delegate/src/test/TransposeTestHelper.hpp b/delegate/src/test/TransposeTestHelper.hpp
index d63a854fbf..1d55273b9f 100644
--- a/delegate/src/test/TransposeTestHelper.hpp
+++ b/delegate/src/test/TransposeTestHelper.hpp
@@ -45,8 +45,8 @@ std::vector<char> CreateTransposeTfLiteModel(tflite::TensorType tensorType,
flatBufferBuilder.CreateVector<int32_t>(outputTensorShape.data(),
outputTensorShape.size()),
tensorType);
- const std::vector<int32_t> operatorInputs{ {0, 1} };
- const std::vector<int32_t> operatorOutputs{{2}};
+ const std::vector<int32_t> operatorInputs{0, 1};
+ const std::vector<int32_t> operatorOutputs{2};
flatbuffers::Offset <Operator> transposeOperator =
CreateOperator(flatBufferBuilder,
0,
@@ -54,8 +54,8 @@ std::vector<char> CreateTransposeTfLiteModel(tflite::TensorType tensorType,
flatBufferBuilder.CreateVector<int32_t>(operatorOutputs.data(), operatorOutputs.size()),
BuiltinOptions_TransposeOptions,
CreateTransposeOptions(flatBufferBuilder).Union());
- const std::vector<int> subgraphInputs{ {0, 1} };
- const std::vector<int> subgraphOutputs{{2}};
+ const std::vector<int> subgraphInputs{0, 1};
+ const std::vector<int> subgraphOutputs{2};
flatbuffers::Offset <SubGraph> subgraph =
CreateSubGraph(flatBufferBuilder,
flatBufferBuilder.CreateVector(tensors.data(), tensors.size()),
generated by cgit v1.2.1 (git 2.23.0) at 2024-07-04 11:01:38 +0000