diff options
| author | Xusong Wang <xusongw@google.com> | 2020-03-05 16:50:03 -0800 |
|---|---|---|
| committer | Slava Shklyaev <slavash@google.com> | 2020-03-13 13:46:18 +0000 |
| commit | 8fcaf2dadbd667dd60931fff3c9d96dabff05974 (patch) | |
| tree | 73c13efddd28a94671e7d0c36933304e11b8dd15 | |
| parent | 2d655af6e1775a59ba7106d01f2456b7ae78ced1 (diff) | |
| download | ml-8fcaf2dadbd667dd60931fff3c9d96dabff05974.tar.gz | |
Use TestHalVersion instead of HalVersion in RGG.
Bug: 150805665
Test: NNT_static_fuzzing
Change-Id: Iade0b224e18d5c543008d53ac2ce5dc2a7f93726
Merged-In: Iade0b224e18d5c543008d53ac2ce5dc2a7f93726
(cherry picked from commit 66b29a6261eae9725b11feab1087ff2bd40f390e)
15 files changed, 199 insertions, 197 deletions
diff --git a/nn/runtime/test/fuzzing/OperationManager.h b/nn/runtime/test/fuzzing/OperationManager.h index d8ed649b5..76f72e02a 100644 --- a/nn/runtime/test/fuzzing/OperationManager.h +++ b/nn/runtime/test/fuzzing/OperationManager.h @@ -46,24 +46,22 @@ struct OperandSignature { std::function<void(RandomOperand*)> finalizer = nullptr; }; -enum class HalVersion : int32_t { V1_0 = 0, V1_1 = 1, V1_2 = 2 }; - // A filter applied to OperationSignatures. An OperationSignature is filtered out if the opType, all // of supportedDataTypes, all of supportedRanks, or the version does not match with any entry in the // corresponding vector in the filter. Use empty vector in the filter for "no filter". // // E.g. // - To get all 1.0 ADD operation signatures -// {.opcodes = {TestOperationType::ADD}, .versions = {HalVersion::V1_0}} +// {.opcodes = {TestOperationType::ADD}, .versions = {TestHalVersion::V1_0}} // // - To get all 1.0 and 1.1 operations with rank 2 or 4 -// {.ranks = {2, 4}, .versions = {HalVersion::V1_0, HalVersion::V1_1}} +// {.ranks = {2, 4}, .versions = {TestHalVersion::V1_0, TestHalVersion::V1_1}} // struct OperationFilter { std::vector<test_helper::TestOperationType> opcodes; std::vector<test_helper::TestOperandType> dataTypes; std::vector<uint32_t> ranks; - std::vector<HalVersion> versions; + std::vector<test_helper::TestHalVersion> versions; }; struct OperationSignature { @@ -73,7 +71,7 @@ struct OperationSignature { test_helper::TestOperationType opType; std::vector<test_helper::TestOperandType> supportedDataTypes; std::vector<uint32_t> supportedRanks; - HalVersion version; + test_helper::TestHalVersion version; // OperandSignatures for inputs and outputs. std::vector<OperandSignature> inputs; diff --git a/nn/runtime/test/fuzzing/TestRandomGraph.cpp b/nn/runtime/test/fuzzing/TestRandomGraph.cpp index 2b00eb8e7..74a2b2fae 100644 --- a/nn/runtime/test/fuzzing/TestRandomGraph.cpp +++ b/nn/runtime/test/fuzzing/TestRandomGraph.cpp @@ -410,7 +410,7 @@ class SingleOperationTest : public RandomGraphTest {}; #define TEST_SINGLE_OPERATION(operation, halVersion, criteria) \ TEST_P(SingleOperationTest, operation##_##halVersion) { \ OperationFilter filter = {.opcodes = {TestOperationType::operation}, \ - .versions = {HalVersion::halVersion}}; \ + .versions = {TestHalVersion::halVersion}}; \ OperationManager::get()->applyFilter(filter); \ mCriteria = (criteria); \ testRandomGraph(GraphSize::SINGLE, DimensionRange::WIDE); \ diff --git a/nn/runtime/test/fuzzing/operation_signatures/BoundingBox.cpp b/nn/runtime/test/fuzzing/operation_signatures/BoundingBox.cpp index 810b878c4..65271b571 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/BoundingBox.cpp +++ b/nn/runtime/test/fuzzing/operation_signatures/BoundingBox.cpp @@ -125,7 +125,7 @@ DEFINE_OPERATION_SIGNATURE(ROI_ALIGN_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -148,7 +148,7 @@ DEFINE_OPERATION_SIGNATURE(ROI_POOLING_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -211,7 +211,7 @@ DEFINE_OPERATION_SIGNATURE(HEATMAP_MAX_KEYPOINT_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, kInputRoiTensor, PARAMETER_CHOICE(TestOperandType::BOOL, true, false)}, .outputs = {OUTPUT_DEFAULT, kOutputRoiTensor}, diff --git a/nn/runtime/test/fuzzing/operation_signatures/Broadcast.cpp b/nn/runtime/test/fuzzing/operation_signatures/Broadcast.cpp index be5901780..0ecba0439 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/Broadcast.cpp +++ b/nn/runtime/test/fuzzing/operation_signatures/Broadcast.cpp @@ -61,7 +61,7 @@ static void broadcastOpConstructor(TestOperandType dataType, uint32_t rank, Rand .opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {1, 2, 3, 4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT, INPUT_DEFAULT, \ PARAMETER_CHOICE(TestOperandType::INT32, 0, 1, 2, 3)}, \ .outputs = {OUTPUT_DEFAULT}, \ @@ -85,7 +85,7 @@ DEFINE_BROADCAST_WITH_ACT_SIGNATURE(DIV, V1_2, TestOperandType::TENSOR_FLOAT16); DEFINE_OPERATION_SIGNATURE(op##_##ver){.opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {1, 2, 3, 4, 5}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT, INPUT_DEFAULT}, \ .outputs = {OUTPUT_DEFAULT}, \ .constructor = broadcastOpConstructor}; @@ -112,7 +112,7 @@ DEFINE_BROADCAST_SIGNATURE(LOGICAL_OR, V1_2, TestOperandType::TENSOR_BOOL8); .opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {1, 2, 3, 4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT, INPUT_DEFAULT}, \ .outputs = {OUTPUT_TYPED(TestOperandType::TENSOR_BOOL8)}, \ .constructor = broadcastOpConstructor}; diff --git a/nn/runtime/test/fuzzing/operation_signatures/ConcatSplit.cpp b/nn/runtime/test/fuzzing/operation_signatures/ConcatSplit.cpp index 753027b9a..8d04c784b 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/ConcatSplit.cpp +++ b/nn/runtime/test/fuzzing/operation_signatures/ConcatSplit.cpp @@ -50,7 +50,7 @@ DEFINE_OPERATION_SIGNATURE(CONCAT_2_V1_0){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_0, + .version = TestHalVersion::V1_0, .inputs = {INPUT_DEFAULT, INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::INT32)}, .outputs = {OUTPUT_DEFAULT}, .constructor = [](TestOperandType, uint32_t rank, RandomOperation* op) { @@ -62,7 +62,7 @@ DEFINE_OPERATION_SIGNATURE(CONCAT_3_V1_0){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_0, + .version = TestHalVersion::V1_0, .inputs = {INPUT_DEFAULT, INPUT_DEFAULT, INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::INT32)}, .outputs = {OUTPUT_DEFAULT}, @@ -75,7 +75,7 @@ DEFINE_OPERATION_SIGNATURE(CONCAT_2_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::INT32)}, .outputs = {OUTPUT_DEFAULT}, .constructor = [](TestOperandType, uint32_t rank, RandomOperation* op) { @@ -87,7 +87,7 @@ DEFINE_OPERATION_SIGNATURE(CONCAT_3_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, INPUT_DEFAULT, INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::INT32)}, .outputs = {OUTPUT_DEFAULT}, @@ -124,7 +124,7 @@ DEFINE_OPERATION_SIGNATURE(SPLIT_2_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_FLOAT16, TestOperandType::TENSOR_INT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::INT32), PARAMETER_CHOICE(TestOperandType::INT32, 2)}, .outputs = {OUTPUT_DEFAULT, OUTPUT_DEFAULT}, @@ -137,7 +137,7 @@ DEFINE_OPERATION_SIGNATURE(SPLIT_3_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_FLOAT16, TestOperandType::TENSOR_INT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::INT32), PARAMETER_CHOICE(TestOperandType::INT32, 3)}, .outputs = {OUTPUT_DEFAULT, OUTPUT_DEFAULT, OUTPUT_DEFAULT}, diff --git a/nn/runtime/test/fuzzing/operation_signatures/Convolutions.cpp b/nn/runtime/test/fuzzing/operation_signatures/Convolutions.cpp index f408eccaf..df2d048ec 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/Convolutions.cpp +++ b/nn/runtime/test/fuzzing/operation_signatures/Convolutions.cpp @@ -22,7 +22,7 @@ namespace android { namespace nn { namespace fuzzing_test { -static void conv2DExplicitConstructor(TestOperandType, uint32_t rank, HalVersion ver, +static void conv2DExplicitConstructor(TestOperandType, uint32_t rank, TestHalVersion ver, RandomOperation* op) { NN_FUZZER_CHECK(rank == 4); @@ -74,10 +74,10 @@ static void conv2DExplicitConstructor(TestOperandType, uint32_t rank, HalVersion strideWidth, dilationWidth, paddingLeft, paddingRight, &op->outputs[0]->dimensions[widthIndex]); - setConvFCScale(/*applyOutputScaleBound=*/ver == HalVersion::V1_0, op); + setConvFCScale(/*applyOutputScaleBound=*/ver == TestHalVersion::V1_0, op); } -static void conv2DImplicitConstructor(TestOperandType, uint32_t rank, HalVersion ver, +static void conv2DImplicitConstructor(TestOperandType, uint32_t rank, TestHalVersion ver, RandomOperation* op) { NN_FUZZER_CHECK(rank == 4); @@ -124,47 +124,47 @@ static void conv2DImplicitConstructor(TestOperandType, uint32_t rank, HalVersion strideWidth, dilationWidth, paddingScheme, &op->outputs[0]->dimensions[widthIndex]); - setConvFCScale(/*applyOutputScaleBound=*/ver == HalVersion::V1_0, op); + setConvFCScale(/*applyOutputScaleBound=*/ver == TestHalVersion::V1_0, op); } -#define DEFINE_CONV_2D_SIGNATURE(ver, ...) \ - DEFINE_OPERATION_SIGNATURE(CONV_2D_explicit_##ver){ \ - .opType = TestOperationType::CONV_2D, \ - .supportedDataTypes = {__VA_ARGS__}, \ - .supportedRanks = {4}, \ - .version = HalVersion::ver, \ - .inputs = \ - { \ - INPUT_DEFAULT, \ - INPUT_DEFAULT, \ - INPUT_BIAS, \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_CHOICE(TestOperandType::INT32, 0, 1, 2, 3), \ - }, \ - .outputs = {OUTPUT_DEFAULT}, \ - .constructor = std::bind(conv2DExplicitConstructor, _1, _2, HalVersion::ver, _3)}; \ - DEFINE_OPERATION_SIGNATURE(CONV_2D_implicit_##ver){ \ - .opType = TestOperationType::CONV_2D, \ - .supportedDataTypes = {__VA_ARGS__}, \ - .supportedRanks = {4}, \ - .version = HalVersion::ver, \ - .inputs = \ - { \ - INPUT_DEFAULT, \ - INPUT_DEFAULT, \ - INPUT_BIAS, \ - PARAMETER_CHOICE(TestOperandType::INT32, 1, 2), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_CHOICE(TestOperandType::INT32, 0, 1, 2, 3), \ - }, \ - .outputs = {OUTPUT_DEFAULT}, \ - .constructor = std::bind(conv2DImplicitConstructor, _1, _2, HalVersion::ver, _3)}; +#define DEFINE_CONV_2D_SIGNATURE(ver, ...) \ + DEFINE_OPERATION_SIGNATURE(CONV_2D_explicit_##ver){ \ + .opType = TestOperationType::CONV_2D, \ + .supportedDataTypes = {__VA_ARGS__}, \ + .supportedRanks = {4}, \ + .version = TestHalVersion::ver, \ + .inputs = \ + { \ + INPUT_DEFAULT, \ + INPUT_DEFAULT, \ + INPUT_BIAS, \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_CHOICE(TestOperandType::INT32, 0, 1, 2, 3), \ + }, \ + .outputs = {OUTPUT_DEFAULT}, \ + .constructor = std::bind(conv2DExplicitConstructor, _1, _2, TestHalVersion::ver, _3)}; \ + DEFINE_OPERATION_SIGNATURE(CONV_2D_implicit_##ver){ \ + .opType = TestOperationType::CONV_2D, \ + .supportedDataTypes = {__VA_ARGS__}, \ + .supportedRanks = {4}, \ + .version = TestHalVersion::ver, \ + .inputs = \ + { \ + INPUT_DEFAULT, \ + INPUT_DEFAULT, \ + INPUT_BIAS, \ + PARAMETER_CHOICE(TestOperandType::INT32, 1, 2), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_CHOICE(TestOperandType::INT32, 0, 1, 2, 3), \ + }, \ + .outputs = {OUTPUT_DEFAULT}, \ + .constructor = std::bind(conv2DImplicitConstructor, _1, _2, TestHalVersion::ver, _3)}; DEFINE_CONV_2D_SIGNATURE(V1_0, TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM); @@ -177,7 +177,7 @@ DEFINE_OPERATION_SIGNATURE(CONV_2D_explicit_layout_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -193,7 +193,7 @@ DEFINE_OPERATION_SIGNATURE(CONV_2D_explicit_layout_V1_2){ PARAMETER_CHOICE(TestOperandType::BOOL, true, false), }, .outputs = {OUTPUT_DEFAULT}, - .constructor = std::bind(conv2DExplicitConstructor, _1, _2, HalVersion::V1_2, _3)}; + .constructor = std::bind(conv2DExplicitConstructor, _1, _2, TestHalVersion::V1_2, _3)}; DEFINE_OPERATION_SIGNATURE(CONV_2D_implicit_layout_V1_2){ .opType = TestOperationType::CONV_2D, @@ -201,7 +201,7 @@ DEFINE_OPERATION_SIGNATURE(CONV_2D_implicit_layout_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -214,7 +214,7 @@ DEFINE_OPERATION_SIGNATURE(CONV_2D_implicit_layout_V1_2){ PARAMETER_CHOICE(TestOperandType::BOOL, true, false), }, .outputs = {OUTPUT_DEFAULT}, - .constructor = std::bind(conv2DImplicitConstructor, _1, _2, HalVersion::V1_2, _3)}; + .constructor = std::bind(conv2DImplicitConstructor, _1, _2, TestHalVersion::V1_2, _3)}; DEFINE_OPERATION_SIGNATURE(CONV_2D_explicit_dilation_V1_2){ .opType = TestOperationType::CONV_2D, @@ -222,7 +222,7 @@ DEFINE_OPERATION_SIGNATURE(CONV_2D_explicit_dilation_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -240,7 +240,7 @@ DEFINE_OPERATION_SIGNATURE(CONV_2D_explicit_dilation_V1_2){ PARAMETER_RANGE(TestOperandType::INT32, 1, 3), }, .outputs = {OUTPUT_DEFAULT}, - .constructor = std::bind(conv2DExplicitConstructor, _1, _2, HalVersion::V1_2, _3)}; + .constructor = std::bind(conv2DExplicitConstructor, _1, _2, TestHalVersion::V1_2, _3)}; DEFINE_OPERATION_SIGNATURE(CONV_2D_implicit_dilation_V1_2){ .opType = TestOperationType::CONV_2D, @@ -248,7 +248,7 @@ DEFINE_OPERATION_SIGNATURE(CONV_2D_implicit_dilation_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -263,9 +263,9 @@ DEFINE_OPERATION_SIGNATURE(CONV_2D_implicit_dilation_V1_2){ PARAMETER_RANGE(TestOperandType::INT32, 1, 3), }, .outputs = {OUTPUT_DEFAULT}, - .constructor = std::bind(conv2DImplicitConstructor, _1, _2, HalVersion::V1_2, _3)}; + .constructor = std::bind(conv2DImplicitConstructor, _1, _2, TestHalVersion::V1_2, _3)}; -static void depthwiseConv2DExplicitConstructor(TestOperandType, uint32_t rank, HalVersion ver, +static void depthwiseConv2DExplicitConstructor(TestOperandType, uint32_t rank, TestHalVersion ver, RandomOperation* op) { NN_FUZZER_CHECK(rank == 4); @@ -318,10 +318,10 @@ static void depthwiseConv2DExplicitConstructor(TestOperandType, uint32_t rank, H strideWidth, dilationWidth, paddingLeft, paddingRight, &op->outputs[0]->dimensions[widthIndex]); - setConvFCScale(/*applyOutputScaleBound=*/ver == HalVersion::V1_0, op); + setConvFCScale(/*applyOutputScaleBound=*/ver == TestHalVersion::V1_0, op); } -static void depthwiseConv2DImplicitConstructor(TestOperandType, uint32_t rank, HalVersion ver, +static void depthwiseConv2DImplicitConstructor(TestOperandType, uint32_t rank, TestHalVersion ver, RandomOperation* op) { NN_FUZZER_CHECK(rank == 4); @@ -370,51 +370,51 @@ static void depthwiseConv2DImplicitConstructor(TestOperandType, uint32_t rank, H strideWidth, dilationWidth, paddingScheme, &op->outputs[0]->dimensions[widthIndex]); - setConvFCScale(/*applyOutputScaleBound=*/ver == HalVersion::V1_0, op); + setConvFCScale(/*applyOutputScaleBound=*/ver == TestHalVersion::V1_0, op); } -#define DEFINE_DEPTHWISE_CONV_2D_SIGNATURE(ver, ...) \ - DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_explicit_##ver){ \ - .opType = TestOperationType::DEPTHWISE_CONV_2D, \ - .supportedDataTypes = {__VA_ARGS__}, \ - .supportedRanks = {4}, \ - .version = HalVersion::ver, \ - .inputs = \ - { \ - INPUT_DEFAULT, \ - INPUT_DEFAULT, \ - INPUT_BIAS, \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - RANDOM_INT_RANGE(1, 5), \ - PARAMETER_CHOICE(TestOperandType::INT32, 0, 1, 2, 3), \ - }, \ - .outputs = {OUTPUT_DEFAULT}, \ - .constructor = \ - std::bind(depthwiseConv2DExplicitConstructor, _1, _2, HalVersion::ver, _3)}; \ - DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_implicit_##ver){ \ - .opType = TestOperationType::DEPTHWISE_CONV_2D, \ - .supportedDataTypes = {__VA_ARGS__}, \ - .supportedRanks = {4}, \ - .version = HalVersion::ver, \ - .inputs = \ - { \ - INPUT_DEFAULT, \ - INPUT_DEFAULT, \ - INPUT_BIAS, \ - PARAMETER_CHOICE(TestOperandType::INT32, 1, 2), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ - RANDOM_INT_RANGE(1, 5), \ - PARAMETER_CHOICE(TestOperandType::INT32, 0, 1, 2, 3), \ - }, \ - .outputs = {OUTPUT_DEFAULT}, \ - .constructor = \ - std::bind(depthwiseConv2DImplicitConstructor, _1, _2, HalVersion::ver, _3)}; +#define DEFINE_DEPTHWISE_CONV_2D_SIGNATURE(ver, ...) \ + DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_explicit_##ver){ \ + .opType = TestOperationType::DEPTHWISE_CONV_2D, \ + .supportedDataTypes = {__VA_ARGS__}, \ + .supportedRanks = {4}, \ + .version = TestHalVersion::ver, \ + .inputs = \ + { \ + INPUT_DEFAULT, \ + INPUT_DEFAULT, \ + INPUT_BIAS, \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + RANDOM_INT_RANGE(1, 5), \ + PARAMETER_CHOICE(TestOperandType::INT32, 0, 1, 2, 3), \ + }, \ + .outputs = {OUTPUT_DEFAULT}, \ + .constructor = std::bind(depthwiseConv2DExplicitConstructor, _1, _2, \ + TestHalVersion::ver, _3)}; \ + DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_implicit_##ver){ \ + .opType = TestOperationType::DEPTHWISE_CONV_2D, \ + .supportedDataTypes = {__VA_ARGS__}, \ + .supportedRanks = {4}, \ + .version = TestHalVersion::ver, \ + .inputs = \ + { \ + INPUT_DEFAULT, \ + INPUT_DEFAULT, \ + INPUT_BIAS, \ + PARAMETER_CHOICE(TestOperandType::INT32, 1, 2), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + PARAMETER_RANGE(TestOperandType::INT32, 1, 3), \ + RANDOM_INT_RANGE(1, 5), \ + PARAMETER_CHOICE(TestOperandType::INT32, 0, 1, 2, 3), \ + }, \ + .outputs = {OUTPUT_DEFAULT}, \ + .constructor = std::bind(depthwiseConv2DImplicitConstructor, _1, _2, \ + TestHalVersion::ver, _3)}; DEFINE_DEPTHWISE_CONV_2D_SIGNATURE(V1_0, TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM); @@ -427,7 +427,7 @@ DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_explicit_layout_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -444,7 +444,8 @@ DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_explicit_layout_V1_2){ PARAMETER_CHOICE(TestOperandType::BOOL, true, false), }, .outputs = {OUTPUT_DEFAULT}, - .constructor = std::bind(depthwiseConv2DExplicitConstructor, _1, _2, HalVersion::V1_2, _3)}; + .constructor = std::bind(depthwiseConv2DExplicitConstructor, _1, _2, TestHalVersion::V1_2, + _3)}; DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_implicit_layout_V1_2){ .opType = TestOperationType::DEPTHWISE_CONV_2D, @@ -452,7 +453,7 @@ DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_implicit_layout_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -466,7 +467,8 @@ DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_implicit_layout_V1_2){ PARAMETER_CHOICE(TestOperandType::BOOL, true, false), }, .outputs = {OUTPUT_DEFAULT}, - .constructor = std::bind(depthwiseConv2DImplicitConstructor, _1, _2, HalVersion::V1_2, _3)}; + .constructor = std::bind(depthwiseConv2DImplicitConstructor, _1, _2, TestHalVersion::V1_2, + _3)}; DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_explicit_dilation_V1_2){ .opType = TestOperationType::DEPTHWISE_CONV_2D, @@ -474,7 +476,7 @@ DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_explicit_dilation_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -493,7 +495,8 @@ DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_explicit_dilation_V1_2){ PARAMETER_RANGE(TestOperandType::INT32, 1, 3), }, .outputs = {OUTPUT_DEFAULT}, - .constructor = std::bind(depthwiseConv2DExplicitConstructor, _1, _2, HalVersion::V1_2, _3)}; + .constructor = std::bind(depthwiseConv2DExplicitConstructor, _1, _2, TestHalVersion::V1_2, + _3)}; DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_implicit_dilation_V1_2){ .opType = TestOperationType::DEPTHWISE_CONV_2D, @@ -501,7 +504,7 @@ DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_implicit_dilation_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -517,7 +520,8 @@ DEFINE_OPERATION_SIGNATURE(DEPTHWISE_CONV_2D_implicit_dilation_V1_2){ PARAMETER_RANGE(TestOperandType::INT32, 1, 3), }, .outputs = {OUTPUT_DEFAULT}, - .constructor = std::bind(depthwiseConv2DImplicitConstructor, _1, _2, HalVersion::V1_2, _3)}; + .constructor = std::bind(depthwiseConv2DImplicitConstructor, _1, _2, TestHalVersion::V1_2, + _3)}; static void groupedConv2DExplicitConstructor(TestOperandType, uint32_t rank, RandomOperation* op) { NN_FUZZER_CHECK(rank == 4); @@ -630,7 +634,7 @@ DEFINE_OPERATION_SIGNATURE(GROUPED_CONV_2D_explicit_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -655,7 +659,7 @@ DEFINE_OPERATION_SIGNATURE(GROUPED_CONV_2D_implicit_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -766,7 +770,7 @@ DEFINE_OPERATION_SIGNATURE(TRANSPOSE_CONV_2D_explicit_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -790,7 +794,7 @@ DEFINE_OPERATION_SIGNATURE(TRANSPOSE_CONV_2D_implicit_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, diff --git a/nn/runtime/test/fuzzing/operation_signatures/Elementwise.cpp b/nn/runtime/test/fuzzing/operation_signatures/Elementwise.cpp index 4b6ce268e..b85176d2e 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/Elementwise.cpp +++ b/nn/runtime/test/fuzzing/operation_signatures/Elementwise.cpp @@ -24,7 +24,7 @@ namespace fuzzing_test { DEFINE_OPERATION_SIGNATURE(op##_##ver){.opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {1, 2, 3, 4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT}, \ .outputs = {OUTPUT_DEFAULT}, \ .constructor = sameShapeOpConstructor}; @@ -47,7 +47,7 @@ DEFINE_ELEMENTWISE_SIGNATURE(RELU6, V1_2, TestOperandType::TENSOR_FLOAT16); DEFINE_OPERATION_SIGNATURE(op##_##ver){.opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {1, 2, 3, 4, 5}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT}, \ .outputs = {OUTPUT_DEFAULT}, \ .constructor = sameShapeOpConstructor}; @@ -75,7 +75,7 @@ static void elementwiseOpWithDisconnectedOutput(TestOperandType type, uint32_t r DEFINE_OPERATION_SIGNATURE(op##_##ver){.opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {1, 2, 3, 4, 5}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT}, \ .outputs = {OUTPUT_DEFAULT}, \ .constructor = elementwiseOpWithDisconnectedOutput}; @@ -92,7 +92,7 @@ DEFINE_ELEMENTWISE_SIGNATURE_WITH_DISCONNECTED_OUTPUT(SQRT, V1_2, TestOperandTyp DEFINE_OPERATION_SIGNATURE(op##_##ver){.opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {1, 2, 3, 4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT}, \ .outputs = {OUTPUT_QUANT((s), (z))}, \ .constructor = sameDimensionOpConstructor}; @@ -110,7 +110,7 @@ DEFINE_ELEMENTWISE_WITH_QUANT_OUTPUT_SIGNATURE(TANH, V1_2, /*scale=*/1.f / 128, .opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {1, 2, 3, 4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT}, \ .outputs = {OUTPUT_TYPED(TestOperandType::outType)}, \ .constructor = sameDimensionOpConstructor}; @@ -134,7 +134,7 @@ DEFINE_ELEMENTWISE_WITH_TYPED_OUTPUT_SIGNATURE(QUANTIZE, V1_2, /*outType=*/TENSO .opType = TestOperationType::CAST, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {1, 2, 3, 4, 5}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT}, \ .outputs = {OUTPUT_TYPED(TestOperandType::outType)}, \ .constructor = sameDimensionOpConstructor}; diff --git a/nn/runtime/test/fuzzing/operation_signatures/FullyConnected.cpp b/nn/runtime/test/fuzzing/operation_signatures/FullyConnected.cpp index 9d727007a..1cb850fd7 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/FullyConnected.cpp +++ b/nn/runtime/test/fuzzing/operation_signatures/FullyConnected.cpp @@ -22,7 +22,7 @@ namespace android { namespace nn { namespace fuzzing_test { -static void fullyConnectedConstructor(TestOperandType, uint32_t rank, HalVersion ver, +static void fullyConnectedConstructor(TestOperandType, uint32_t rank, TestHalVersion ver, RandomOperation* op) { // Inputs, flattened to [batch_size, input_size] op->inputs[0]->dimensions.resize(rank); @@ -42,7 +42,7 @@ static void fullyConnectedConstructor(TestOperandType, uint32_t rank, HalVersion op->outputs[0]->dimensions = {numElements.exactDiv(op->inputs[1]->dimensions[1]), op->inputs[1]->dimensions[0]}; - setConvFCScale(/*applyOutputScaleBound=*/ver == HalVersion::V1_0, op); + setConvFCScale(/*applyOutputScaleBound=*/ver == TestHalVersion::V1_0, op); } DEFINE_OPERATION_SIGNATURE(signature_FULLY_CONNECTED_V1_0){ @@ -50,22 +50,22 @@ DEFINE_OPERATION_SIGNATURE(signature_FULLY_CONNECTED_V1_0){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {2, 3, 4}, - .version = HalVersion::V1_0, + .version = TestHalVersion::V1_0, .inputs = {INPUT_DEFAULT, INPUT_DEFAULT, INPUT_BIAS, PARAMETER_CHOICE(TestOperandType::INT32, 0, 1, 2, 3)}, .outputs = {OUTPUT_DEFAULT}, - .constructor = std::bind(fullyConnectedConstructor, _1, _2, HalVersion::V1_0, _3)}; + .constructor = std::bind(fullyConnectedConstructor, _1, _2, TestHalVersion::V1_0, _3)}; DEFINE_OPERATION_SIGNATURE(signature_FULLY_CONNECTED_V1_2){ .opType = TestOperationType::FULLY_CONNECTED, .supportedDataTypes = {TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, INPUT_DEFAULT, INPUT_BIAS, PARAMETER_CHOICE(TestOperandType::INT32, 0, 1, 2, 3)}, .outputs = {OUTPUT_DEFAULT}, - .constructor = std::bind(fullyConnectedConstructor, _1, _2, HalVersion::V1_2, _3)}; + .constructor = std::bind(fullyConnectedConstructor, _1, _2, TestHalVersion::V1_2, _3)}; } // namespace fuzzing_test } // namespace nn diff --git a/nn/runtime/test/fuzzing/operation_signatures/Normalization.cpp b/nn/runtime/test/fuzzing/operation_signatures/Normalization.cpp index 763ce0647..165776269 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/Normalization.cpp +++ b/nn/runtime/test/fuzzing/operation_signatures/Normalization.cpp @@ -33,7 +33,7 @@ DEFINE_OPERATION_SIGNATURE(SOFTMAX_V1_0){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {2, 4}, - .version = HalVersion::V1_0, + .version = TestHalVersion::V1_0, .inputs = {INPUT_DEFAULT, PARAMETER_FLOAT_RANGE(0.1, 10.0)}, .outputs = {OUTPUT_QUANT(1.f / 256, 0)}, .constructor = softmaxConstructor}; @@ -43,7 +43,7 @@ DEFINE_OPERATION_SIGNATURE(SOFTMAX_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 3}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_FLOAT_RANGE(0.1, 10.0)}, .outputs = {OUTPUT_QUANT(1.f / 256, 0)}, .constructor = softmaxConstructor}; @@ -52,7 +52,7 @@ DEFINE_OPERATION_SIGNATURE(SOFTMAX_float16_V1_2){ .opType = TestOperationType::SOFTMAX, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_FLOAT_RANGE(0.1, 10.0)}, .outputs = {OUTPUT_QUANT(1.f / 256, 0)}, .constructor = softmaxConstructor}; @@ -63,7 +63,7 @@ DEFINE_OPERATION_SIGNATURE(SOFTMAX_axis_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_FLOAT_RANGE(0.1, 10.0), PARAMETER_NONE(TestOperandType::INT32)}, .outputs = {OUTPUT_QUANT(1.f / 256, 0)}, @@ -84,7 +84,7 @@ DEFINE_OPERATION_SIGNATURE(L2_NORMALIZATION_V1_0){ .opType = TestOperationType::L2_NORMALIZATION, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32}, .supportedRanks = {4}, - .version = HalVersion::V1_0, + .version = TestHalVersion::V1_0, .inputs = {INPUT_DEFAULT}, .outputs = {OUTPUT_DEFAULT}, .constructor = l2normConstructor}; @@ -93,7 +93,7 @@ DEFINE_OPERATION_SIGNATURE(L2_NORMALIZATION_V1_2){ .opType = TestOperationType::L2_NORMALIZATION, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32}, .supportedRanks = {1, 2, 3}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT}, .outputs = {OUTPUT_DEFAULT}, .constructor = l2normConstructor}; @@ -103,7 +103,7 @@ DEFINE_OPERATION_SIGNATURE(L2_NORMALIZATION_type_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT}, .outputs = {OUTPUT_QUANT(1.f / 128, 128)}, .constructor = l2normConstructor}; @@ -113,7 +113,7 @@ DEFINE_OPERATION_SIGNATURE(L2_NORMALIZATION_axis_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_FLOAT16, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::INT32)}, .outputs = {OUTPUT_QUANT(1.f / 128, 128)}, .constructor = l2normConstructor}; @@ -131,7 +131,7 @@ DEFINE_OPERATION_SIGNATURE(LOCAL_RESPONSE_NORMALIZATION_V1_0){ .opType = TestOperationType::LOCAL_RESPONSE_NORMALIZATION, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32}, .supportedRanks = {4}, - .version = HalVersion::V1_0, + .version = TestHalVersion::V1_0, .inputs = { INPUT_DEFAULT, @@ -147,7 +147,7 @@ DEFINE_OPERATION_SIGNATURE(LOCAL_RESPONSE_NORMALIZATION_V1_2){ .opType = TestOperationType::LOCAL_RESPONSE_NORMALIZATION, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32}, .supportedRanks = {1, 2, 3}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -163,7 +163,7 @@ DEFINE_OPERATION_SIGNATURE(LOCAL_RESPONSE_NORMALIZATION_float16_V1_2){ .opType = TestOperationType::LOCAL_RESPONSE_NORMALIZATION, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -179,7 +179,7 @@ DEFINE_OPERATION_SIGNATURE(LOCAL_RESPONSE_NORMALIZATION_axis_V1_2){ .opType = TestOperationType::LOCAL_RESPONSE_NORMALIZATION, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -196,7 +196,7 @@ DEFINE_OPERATION_SIGNATURE(INSTANCE_NORMALIZATION_V1_2){ .opType = TestOperationType::INSTANCE_NORMALIZATION, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = { INPUT_DEFAULT, @@ -212,7 +212,7 @@ DEFINE_OPERATION_SIGNATURE(LOG_SOFTMAX_TENSOR_FLOAT32_V1_2){ .opType = TestOperationType::LOG_SOFTMAX, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_FLOAT_RANGE(0.1, 10.0), PARAMETER_NONE(TestOperandType::INT32)}, .outputs = {OUTPUT_DEFAULT}, diff --git a/nn/runtime/test/fuzzing/operation_signatures/OperationSignatureUtils.h b/nn/runtime/test/fuzzing/operation_signatures/OperationSignatureUtils.h index 0e100cb8f..36efa4712 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/OperationSignatureUtils.h +++ b/nn/runtime/test/fuzzing/operation_signatures/OperationSignatureUtils.h @@ -400,8 +400,8 @@ inline void defaultOperandConstructor(TestOperandType dataType, uint32_t, Random // .opType = TestOperationType::RELU, // .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, // TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, .version = -// HalVersion::V1_0, .inputs = {INPUT_DEFAULT}, .outputs = {OUTPUT_DEFAULT}, .constructor = -// sameShapeOpConstructor}; +// TestHalVersion::V1_0, .inputs = {INPUT_DEFAULT}, .outputs = {OUTPUT_DEFAULT}, .constructor +// = sameShapeOpConstructor}; // #define DEFINE_OPERATION_SIGNATURE(name) \ const int dummy_##name = OperationSignatureHelper(#name) + OperationSignature diff --git a/nn/runtime/test/fuzzing/operation_signatures/Poolings.cpp b/nn/runtime/test/fuzzing/operation_signatures/Poolings.cpp index f1dd59dc1..008f0ce67 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/Poolings.cpp +++ b/nn/runtime/test/fuzzing/operation_signatures/Poolings.cpp @@ -103,7 +103,7 @@ static void poolingImplicitOpConstructor(TestOperandType, uint32_t rank, RandomO .opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = \ { \ INPUT_DEFAULT, \ @@ -123,7 +123,7 @@ static void poolingImplicitOpConstructor(TestOperandType, uint32_t rank, RandomO .opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = \ { \ INPUT_DEFAULT, \ @@ -152,7 +152,7 @@ DEFINE_POOLING_SIGNATURE(MAX_POOL_2D, V1_2, TestOperandType::TENSOR_FLOAT16); .opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = \ { \ INPUT_DEFAULT, \ @@ -173,7 +173,7 @@ DEFINE_POOLING_SIGNATURE(MAX_POOL_2D, V1_2, TestOperandType::TENSOR_FLOAT16); .opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = \ { \ INPUT_DEFAULT, \ diff --git a/nn/runtime/test/fuzzing/operation_signatures/Reduce.cpp b/nn/runtime/test/fuzzing/operation_signatures/Reduce.cpp index bfbb47dd1..7c5ae4e29 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/Reduce.cpp +++ b/nn/runtime/test/fuzzing/operation_signatures/Reduce.cpp @@ -65,7 +65,7 @@ static void reduceOpConstructor(TestOperandType, uint32_t rank, RandomOperation* .opType = TestOperationType::MEAN, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {1, 2, 3, 4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32), \ PARAMETER_CHOICE(TestOperandType::INT32, -100, 100)}, \ .outputs = {OUTPUT_DEFAULT}, \ @@ -79,7 +79,7 @@ DEFINE_MEAN_SIGNATURE(V1_2, TestOperandType::TENSOR_FLOAT16); .opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {1, 2, 3, 4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32), \ PARAMETER_CHOICE(TestOperandType::BOOL, true, false)}, \ .outputs = {OUTPUT_DEFAULT}, \ @@ -116,7 +116,7 @@ static void singleAxisReduceOpConstructor(TestOperandType, uint32_t rank, Random TestOperandType::TENSOR_FLOAT16, TestOperandType::TENSOR_INT32, \ TestOperandType::TENSOR_QUANT8_ASYMM}, \ .supportedRanks = {1, 2, 3, 4, 5}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::INT32)}, \ .outputs = {OUTPUT_TYPED(TestOperandType::TENSOR_INT32)}, \ .constructor = singleAxisReduceOpConstructor}; diff --git a/nn/runtime/test/fuzzing/operation_signatures/Reshape.cpp b/nn/runtime/test/fuzzing/operation_signatures/Reshape.cpp index 80e701e0c..86a9f67c3 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/Reshape.cpp +++ b/nn/runtime/test/fuzzing/operation_signatures/Reshape.cpp @@ -52,7 +52,7 @@ DEFINE_OPERATION_SIGNATURE(SPACE_TO_DEPTH_V1_0){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {4}, - .version = HalVersion::V1_0, + .version = TestHalVersion::V1_0, .inputs = {INPUT_DEFAULT, PARAMETER_RANGE(TestOperandType::INT32, 1, 5)}, .outputs = {OUTPUT_DEFAULT}, .constructor = spaceToDepthConstructor}; @@ -61,7 +61,7 @@ DEFINE_OPERATION_SIGNATURE(SPACE_TO_DEPTH_V1_2){ .opType = TestOperationType::SPACE_TO_DEPTH, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_RANGE(TestOperandType::INT32, 1, 5)}, .outputs = {OUTPUT_DEFAULT}, .constructor = spaceToDepthConstructor}; @@ -72,7 +72,7 @@ DEFINE_OPERATION_SIGNATURE(SPACE_TO_DEPTH_layout_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_RANGE(TestOperandType::INT32, 1, 5), PARAMETER_CHOICE(TestOperandType::BOOL, true, false)}, .outputs = {OUTPUT_DEFAULT}, @@ -107,7 +107,7 @@ DEFINE_OPERATION_SIGNATURE(DEPTH_TO_SPACE_V1_0){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {4}, - .version = HalVersion::V1_0, + .version = TestHalVersion::V1_0, .inputs = {INPUT_DEFAULT, PARAMETER_RANGE(TestOperandType::INT32, 1, 3)}, .outputs = {OUTPUT_DEFAULT}, .constructor = depthToSpaceConstructor}; @@ -116,7 +116,7 @@ DEFINE_OPERATION_SIGNATURE(DEPTH_TO_SPACE_V1_2){ .opType = TestOperationType::DEPTH_TO_SPACE, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_RANGE(TestOperandType::INT32, 1, 3)}, .outputs = {OUTPUT_DEFAULT}, .constructor = depthToSpaceConstructor}; @@ -127,7 +127,7 @@ DEFINE_OPERATION_SIGNATURE(DEPTH_TO_SPACE_layout_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_RANGE(TestOperandType::INT32, 1, 3), PARAMETER_CHOICE(TestOperandType::BOOL, true, false)}, .outputs = {OUTPUT_DEFAULT}, @@ -154,7 +154,7 @@ DEFINE_OPERATION_SIGNATURE(RESHAPE_V1_0){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_0, + .version = TestHalVersion::V1_0, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32)}, .outputs = {OUTPUT_DEFAULT}, .constructor = reshapeConstructor}; @@ -163,7 +163,7 @@ DEFINE_OPERATION_SIGNATURE(RESHAPE_V1_2){ .opType = TestOperationType::RESHAPE, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32)}, .outputs = {OUTPUT_DEFAULT}, .constructor = reshapeConstructor}; @@ -197,7 +197,7 @@ DEFINE_OPERATION_SIGNATURE(BATCH_TO_SPACE_ND_V1_1){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {4}, - .version = HalVersion::V1_1, + .version = TestHalVersion::V1_1, .inputs = {INPUT_DEFAULT, PARAMETER_VEC_RANGE(TestOperandType::TENSOR_INT32, /*len=*/2, /*range=*/1, 3)}, .outputs = {OUTPUT_DEFAULT}, @@ -207,7 +207,7 @@ DEFINE_OPERATION_SIGNATURE(BATCH_TO_SPACE_ND_V1_2){ .opType = TestOperationType::BATCH_TO_SPACE_ND, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_VEC_RANGE(TestOperandType::TENSOR_INT32, /*len=*/2, /*range=*/1, 3)}, .outputs = {OUTPUT_DEFAULT}, @@ -219,7 +219,7 @@ DEFINE_OPERATION_SIGNATURE(BATCH_TO_SPACE_ND_layout_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_VEC_RANGE(TestOperandType::TENSOR_INT32, /*len=*/2, /*range=*/1, 3), PARAMETER_CHOICE(TestOperandType::BOOL, true, false)}, @@ -273,7 +273,7 @@ DEFINE_OPERATION_SIGNATURE(SPACE_TO_BATCH_ND_V1_1){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {4}, - .version = HalVersion::V1_1, + .version = TestHalVersion::V1_1, .inputs = {INPUT_DEFAULT, PARAMETER_VEC_RANGE(TestOperandType::TENSOR_INT32, /*len=*/2, /*range=*/1, 5), paddingTensor_SPACE_TO_BATCH_ND}, @@ -284,7 +284,7 @@ DEFINE_OPERATION_SIGNATURE(SPACE_TO_BATCH_ND_V1_2){ .opType = TestOperationType::SPACE_TO_BATCH_ND, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_VEC_RANGE(TestOperandType::TENSOR_INT32, /*len=*/2, /*range=*/1, 5), paddingTensor_SPACE_TO_BATCH_ND}, @@ -297,7 +297,7 @@ DEFINE_OPERATION_SIGNATURE(SPACE_TO_BATCH_ND_layout_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_VEC_RANGE(TestOperandType::TENSOR_INT32, /*len=*/2, /*range=*/1, 5), paddingTensor_SPACE_TO_BATCH_ND, @@ -345,7 +345,7 @@ DEFINE_OPERATION_SIGNATURE(PAD_V1_1){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_1, + .version = TestHalVersion::V1_1, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32)}, .outputs = {OUTPUT_DEFAULT}, .constructor = padConstructor}; @@ -354,7 +354,7 @@ DEFINE_OPERATION_SIGNATURE(PAD_V1_2){ .opType = TestOperationType::PAD, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32)}, .outputs = {OUTPUT_DEFAULT}, .constructor = padConstructor}; @@ -365,7 +365,7 @@ DEFINE_OPERATION_SIGNATURE(PAD_V2_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32), paddingScalar_PAD_V2}, .outputs = {OUTPUT_DEFAULT}, @@ -395,7 +395,7 @@ DEFINE_OPERATION_SIGNATURE(TRANSPOSE_V1_1){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_1, + .version = TestHalVersion::V1_1, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32)}, .outputs = {OUTPUT_DEFAULT}, .constructor = transposeConstructor}; @@ -404,7 +404,7 @@ DEFINE_OPERATION_SIGNATURE(TRANSPOSE_V1_2){ .opType = TestOperationType::TRANSPOSE, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32)}, .outputs = {OUTPUT_DEFAULT}, .constructor = transposeConstructor}; @@ -426,7 +426,7 @@ DEFINE_OPERATION_SIGNATURE(CHANNEL_SHUFFLE_V1_2){ TestOperandType::TENSOR_QUANT8_ASYMM, TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_RANGE(TestOperandType::INT32, 1, 5), PARAMETER_NONE(TestOperandType::INT32)}, .outputs = {OUTPUT_DEFAULT}, @@ -463,7 +463,7 @@ DEFINE_OPERATION_SIGNATURE(SQUEEZE_V1_1){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_1, + .version = TestHalVersion::V1_1, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32)}, .outputs = {OUTPUT_DEFAULT}, .constructor = squeezeConstructor}; @@ -472,7 +472,7 @@ DEFINE_OPERATION_SIGNATURE(SQUEEZE_V1_2){ .opType = TestOperationType::SQUEEZE, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32)}, .outputs = {OUTPUT_DEFAULT}, .constructor = squeezeConstructor}; @@ -499,7 +499,7 @@ DEFINE_OPERATION_SIGNATURE(EXPAND_DIMS_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_FLOAT16, TestOperandType::TENSOR_INT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4, 5}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::INT32)}, .outputs = {OUTPUT_DEFAULT}, .constructor = expandDimsConstructor}; @@ -522,7 +522,7 @@ DEFINE_OPERATION_SIGNATURE(TILE_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_FLOAT16, TestOperandType::TENSOR_INT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4, 5}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32)}, .outputs = {OUTPUT_DEFAULT}, .constructor = tileConstructor}; diff --git a/nn/runtime/test/fuzzing/operation_signatures/Resize.cpp b/nn/runtime/test/fuzzing/operation_signatures/Resize.cpp index ae398913b..8cda1c7fd 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/Resize.cpp +++ b/nn/runtime/test/fuzzing/operation_signatures/Resize.cpp @@ -66,7 +66,7 @@ static void resizeOpConstructor(TestOperandType, uint32_t rank, RandomOperation* .opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT, RANDOM_INT_FREE, RANDOM_INT_FREE}, \ .outputs = {OUTPUT_DEFAULT}, \ .constructor = resizeOpConstructor}; @@ -80,7 +80,7 @@ DEFINE_RESIZE_WITHOUT_LAYOUT_SIGNATURE(RESIZE_BILINEAR, V1_2, TestOperandType::T .opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT, RANDOM_INT_FREE, RANDOM_INT_FREE, \ PARAMETER_CHOICE(TestOperandType::BOOL, false, true)}, \ .outputs = {OUTPUT_DEFAULT}, \ @@ -89,7 +89,7 @@ DEFINE_RESIZE_WITHOUT_LAYOUT_SIGNATURE(RESIZE_BILINEAR, V1_2, TestOperandType::T .opType = TestOperationType::op, \ .supportedDataTypes = {__VA_ARGS__}, \ .supportedRanks = {4}, \ - .version = HalVersion::ver, \ + .version = TestHalVersion::ver, \ .inputs = {INPUT_DEFAULT, PARAMETER_FLOAT_RANGE(0.2, 4.0), \ PARAMETER_FLOAT_RANGE(0.2, 4.0), \ PARAMETER_CHOICE(TestOperandType::BOOL, false, true)}, \ diff --git a/nn/runtime/test/fuzzing/operation_signatures/Selection.cpp b/nn/runtime/test/fuzzing/operation_signatures/Selection.cpp index 079c31af1..93b7fc2d4 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/Selection.cpp +++ b/nn/runtime/test/fuzzing/operation_signatures/Selection.cpp @@ -49,7 +49,7 @@ DEFINE_OPERATION_SIGNATURE(EMBEDDING_LOOKUP_V1_0){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_INT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {2, 3, 4}, - .version = HalVersion::V1_0, + .version = TestHalVersion::V1_0, .inputs = {PARAMETER_NONE(TestOperandType::TENSOR_INT32), INPUT_DEFAULT}, .outputs = {OUTPUT_DEFAULT}, .constructor = embeddingLookupConstructor, @@ -99,7 +99,7 @@ DEFINE_OPERATION_SIGNATURE(HASHTABLE_LOOKUP_V1_0){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_INT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {2, 3, 4}, - .version = HalVersion::V1_0, + .version = TestHalVersion::V1_0, .inputs = {PARAMETER_NONE(TestOperandType::TENSOR_INT32), PARAMETER_NONE(TestOperandType::TENSOR_INT32), INPUT_DEFAULT}, .outputs = {OUTPUT_DEFAULT, hitsTensor_HASHTABLE_LOOKUP}, @@ -145,7 +145,7 @@ DEFINE_OPERATION_SIGNATURE(GATHER_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_FLOAT16, TestOperandType::TENSOR_INT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4, 5}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::INT32), PARAMETER_NONE(TestOperandType::TENSOR_INT32)}, .outputs = {OUTPUT_DEFAULT}, @@ -166,7 +166,7 @@ DEFINE_OPERATION_SIGNATURE(SELECT_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_FLOAT16, TestOperandType::TENSOR_INT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_TYPED(TestOperandType::TENSOR_BOOL8), INPUT_DEFAULT, INPUT_DEFAULT}, .outputs = {OUTPUT_DEFAULT}, .constructor = selectConstructor}; @@ -199,7 +199,7 @@ DEFINE_OPERATION_SIGNATURE(TOPK_V2_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_FLOAT16, TestOperandType::TENSOR_INT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, RANDOM_INT_FREE}, .outputs = {OUTPUT_DEFAULT, OUTPUT_TYPED(TestOperandType::TENSOR_INT32)}, .constructor = topKConstructor}; @@ -234,7 +234,7 @@ DEFINE_OPERATION_SIGNATURE(SLICE_V1_2){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_FLOAT16, TestOperandType::TENSOR_INT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32), PARAMETER_NONE(TestOperandType::TENSOR_INT32)}, .outputs = {OUTPUT_DEFAULT}, @@ -325,7 +325,7 @@ DEFINE_OPERATION_SIGNATURE(STRIDED_SLICE_V1_1){ .supportedDataTypes = {TestOperandType::TENSOR_FLOAT32, TestOperandType::TENSOR_QUANT8_ASYMM}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_1, + .version = TestHalVersion::V1_1, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32), PARAMETER_NONE(TestOperandType::TENSOR_INT32), PARAMETER_NONE(TestOperandType::TENSOR_INT32), @@ -340,7 +340,7 @@ DEFINE_OPERATION_SIGNATURE(STRIDED_SLICE_V1_2){ .opType = TestOperationType::STRIDED_SLICE, .supportedDataTypes = {TestOperandType::TENSOR_FLOAT16}, .supportedRanks = {1, 2, 3, 4}, - .version = HalVersion::V1_2, + .version = TestHalVersion::V1_2, .inputs = {INPUT_DEFAULT, PARAMETER_NONE(TestOperandType::TENSOR_INT32), PARAMETER_NONE(TestOperandType::TENSOR_INT32), PARAMETER_NONE(TestOperandType::TENSOR_INT32), |