diff options
author | Xusong Wang <xusongw@google.com> | 2019-10-11 15:33:53 -0700 |
---|---|---|
committer | Xusong Wang <xusongw@google.com> | 2019-10-11 15:42:03 -0700 |
commit | a9599f3667250dc0d97bec0f7c86bf6a54631f0a (patch) | |
tree | 9699ddea6f32fbbee05bc651a2bbe25e606b4439 | |
parent | adbc13a818fdefc43ef8cc29e9f68c9a39bdb830 (diff) | |
download | ml-a9599f3667250dc0d97bec0f7c86bf6a54631f0a.tar.gz |
Fix CTS and VTS tests for INSTANCE_NORMALIZATION.
- Fix CTS/VTS generated tests.
- Skip RGG tests with this operator.
Bug: 142558844
Test: NNT_static
Change-Id: I7b0423c4a3adcf4f75a8987badd1569bb8f28f17
3 files changed, 62 insertions, 60 deletions
diff --git a/nn/runtime/test/fuzzing/TestRandomGraph.cpp b/nn/runtime/test/fuzzing/TestRandomGraph.cpp index 81e1ea55f..e3f551c32 100644 --- a/nn/runtime/test/fuzzing/TestRandomGraph.cpp +++ b/nn/runtime/test/fuzzing/TestRandomGraph.cpp @@ -205,6 +205,8 @@ class RandomGraphTest : public ::testing::TestWithParam<uint32_t> { if (op.opType == ANEURALNETWORKS_BATCH_TO_SPACE_ND && op.inputs[0]->dimensions[0].getValue() == 1) return true; + // We have a bug in the reference implementation of INSTANCE_NORMALIZATION. + if (op.opType == ANEURALNETWORKS_INSTANCE_NORMALIZATION) return true; } return false; } diff --git a/nn/runtime/test/generated/examples/instance_normalization.example.cpp b/nn/runtime/test/generated/examples/instance_normalization.example.cpp index 0f1e69aab..b23d5bdfe 100644 --- a/nn/runtime/test/generated/examples/instance_normalization.example.cpp +++ b/nn/runtime/test/generated/examples/instance_normalization.example.cpp @@ -10,7 +10,7 @@ static std::vector<MixedTypedExample> examples_nhwc = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 1.0f, 0.0f, 2.0f, 0.0f, 2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, -2.0f, 0.0f, -2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -33,7 +33,7 @@ static std::vector<MixedTypedExample> examples_nhwc = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, -0.499996f, 0.0f, -0.0999992f, 0.0f, -0.0999992f, 0.0f, 0.6999944f, 0.99995f, -0.6999944f, -0.99995f, 0.499996f, -0.99995f, -1.0999912f, 0.99995f, 1.2999896f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, -0.8164898f, 0.0f, -0.8164898f, 0.0f, 1.6329796f, 0.99995005f, -0.6324429f, -0.99995005f, 1.2648858f, -0.99995005f, -1.2648858f, 0.99995005f, 0.6324429f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -67,7 +67,7 @@ static std::vector<MixedTypedExample> examples_nhwc_relaxed = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 1.0f, 0.0f, 2.0f, 0.0f, 2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, -2.0f, 0.0f, -2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -90,7 +90,7 @@ static std::vector<MixedTypedExample> examples_nhwc_relaxed = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, -0.499996f, 0.0f, -0.0999992f, 0.0f, -0.0999992f, 0.0f, 0.6999944f, 0.99995f, -0.6999944f, -0.99995f, 0.499996f, -0.99995f, -1.0999912f, 0.99995f, 1.2999896f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, -0.8164898f, 0.0f, -0.8164898f, 0.0f, 1.6329796f, 0.99995005f, -0.6324429f, -0.99995005f, 1.2648858f, -0.99995005f, -1.2648858f, 0.99995005f, 0.6324429f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -132,7 +132,7 @@ static std::vector<MixedTypedExample> examples_nhwc_float16 = { // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {0.0f, 1.0f, 0.0f, 2.0f, 0.0f, 2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 4.0f}}}, + .float16Operands = {{0, {0.0f, 0.0f, 0.0f, -2.0f, 0.0f, -2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 1.0f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -155,7 +155,7 @@ static std::vector<MixedTypedExample> examples_nhwc_float16 = { // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {0.0f, -0.49999600648880005f, 0.0f, -0.09999919682741165f, 0.0f, -0.09999919682741165f, 0.0f, 0.6999943852424622f, 0.9999499917030334f, -0.6999943852424622f, -0.9999499917030334f, 0.49999600648880005f, -0.9999499917030334f, -1.0999912023544312f, 0.9999499917030334f, 1.2999895811080933f}}}, + .float16Operands = {{0, {0.0f, 0.0f, 0.0f, -0.8164898157119751f, 0.0f, -0.8164898157119751f, 0.0f, 1.6329796314239502f, 0.9999500513076782f, -0.6324428915977478f, -0.9999500513076782f, 1.2648857831954956f, -0.9999500513076782f, -1.2648857831954956f, 0.9999500513076782f, 0.6324428915977478f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -181,7 +181,7 @@ static std::vector<MixedTypedExample> examples_nchw = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, -2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -204,7 +204,7 @@ static std::vector<MixedTypedExample> examples_nchw = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, -0.499996f, -0.0999992f, -0.0999992f, 0.6999944f, 0.99995f, -0.99995f, -0.99995f, 0.99995f, -0.6999944f, 0.499996f, -1.0999912f, 1.2999896f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.8164898f, -0.8164898f, 1.6329796f, 0.99995005f, -0.99995005f, -0.99995005f, 0.99995005f, -0.6324429f, 1.2648858f, -1.2648858f, 0.6324429f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -238,7 +238,7 @@ static std::vector<MixedTypedExample> examples_nchw_relaxed = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, -2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -261,7 +261,7 @@ static std::vector<MixedTypedExample> examples_nchw_relaxed = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, -0.499996f, -0.0999992f, -0.0999992f, 0.6999944f, 0.99995f, -0.99995f, -0.99995f, 0.99995f, -0.6999944f, 0.499996f, -1.0999912f, 1.2999896f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.8164898f, -0.8164898f, 1.6329796f, 0.99995005f, -0.99995005f, -0.99995005f, 0.99995005f, -0.6324429f, 1.2648858f, -1.2648858f, 0.6324429f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -303,7 +303,7 @@ static std::vector<MixedTypedExample> examples_nchw_float16 = { // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 4.0f}}}, + .float16Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, -2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 1.0f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -326,7 +326,7 @@ static std::vector<MixedTypedExample> examples_nchw_float16 = { // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, -0.49999600648880005f, -0.09999919682741165f, -0.09999919682741165f, 0.6999943852424622f, 0.9999499917030334f, -0.9999499917030334f, -0.9999499917030334f, 0.9999499917030334f, -0.6999943852424622f, 0.49999600648880005f, -1.0999912023544312f, 1.2999895811080933f}}}, + .float16Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.8164898157119751f, -0.8164898157119751f, 1.6329796314239502f, 0.9999500513076782f, -0.9999500513076782f, -0.9999500513076782f, 0.9999500513076782f, -0.6324428915977478f, 1.2648857831954956f, -1.2648857831954956f, 0.6324428915977478f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -352,7 +352,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nhwc = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 1.0f, 0.0f, 2.0f, 0.0f, 2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, -2.0f, 0.0f, -2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -375,7 +375,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nhwc = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, -0.499996f, 0.0f, -0.0999992f, 0.0f, -0.0999992f, 0.0f, 0.6999944f, 0.99995f, -0.6999944f, -0.99995f, 0.499996f, -0.99995f, -1.0999912f, 0.99995f, 1.2999896f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, -0.8164898f, 0.0f, -0.8164898f, 0.0f, 1.6329796f, 0.99995005f, -0.6324429f, -0.99995005f, 1.2648858f, -0.99995005f, -1.2648858f, 0.99995005f, 0.6324429f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -409,7 +409,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nhwc_relaxed // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 1.0f, 0.0f, 2.0f, 0.0f, 2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, -2.0f, 0.0f, -2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -432,7 +432,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nhwc_relaxed // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, -0.499996f, 0.0f, -0.0999992f, 0.0f, -0.0999992f, 0.0f, 0.6999944f, 0.99995f, -0.6999944f, -0.99995f, 0.499996f, -0.99995f, -1.0999912f, 0.99995f, 1.2999896f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, -0.8164898f, 0.0f, -0.8164898f, 0.0f, 1.6329796f, 0.99995005f, -0.6324429f, -0.99995005f, 1.2648858f, -0.99995005f, -1.2648858f, 0.99995005f, 0.6324429f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -474,7 +474,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nhwc_float16 // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {0.0f, 1.0f, 0.0f, 2.0f, 0.0f, 2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 4.0f}}}, + .float16Operands = {{0, {0.0f, 0.0f, 0.0f, -2.0f, 0.0f, -2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 1.0f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -497,7 +497,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nhwc_float16 // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {0.0f, -0.49999600648880005f, 0.0f, -0.09999919682741165f, 0.0f, -0.09999919682741165f, 0.0f, 0.6999943852424622f, 0.9999499917030334f, -0.6999943852424622f, -0.9999499917030334f, 0.49999600648880005f, -0.9999499917030334f, -1.0999912023544312f, 0.9999499917030334f, 1.2999895811080933f}}}, + .float16Operands = {{0, {0.0f, 0.0f, 0.0f, -0.8164898157119751f, 0.0f, -0.8164898157119751f, 0.0f, 1.6329796314239502f, 0.9999500513076782f, -0.6324428915977478f, -0.9999500513076782f, 1.2648857831954956f, -0.9999500513076782f, -1.2648857831954956f, 0.9999500513076782f, 0.6324428915977478f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -523,7 +523,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nchw = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, -2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -546,7 +546,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nchw = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, -0.499996f, -0.0999992f, -0.0999992f, 0.6999944f, 0.99995f, -0.99995f, -0.99995f, 0.99995f, -0.6999944f, 0.499996f, -1.0999912f, 1.2999896f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.8164898f, -0.8164898f, 1.6329796f, 0.99995005f, -0.99995005f, -0.99995005f, 0.99995005f, -0.6324429f, 1.2648858f, -1.2648858f, 0.6324429f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -580,7 +580,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nchw_relaxed // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, -2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -603,7 +603,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nchw_relaxed // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, -0.499996f, -0.0999992f, -0.0999992f, 0.6999944f, 0.99995f, -0.99995f, -0.99995f, 0.99995f, -0.6999944f, 0.499996f, -1.0999912f, 1.2999896f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.8164898f, -0.8164898f, 1.6329796f, 0.99995005f, -0.99995005f, -0.99995005f, 0.99995005f, -0.6324429f, 1.2648858f, -1.2648858f, 0.6324429f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -645,7 +645,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nchw_float16 // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 4.0f}}}, + .float16Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, -2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 1.0f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -668,7 +668,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nchw_float16 // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, -0.49999600648880005f, -0.09999919682741165f, -0.09999919682741165f, 0.6999943852424622f, 0.9999499917030334f, -0.9999499917030334f, -0.9999499917030334f, 0.9999499917030334f, -0.6999943852424622f, 0.49999600648880005f, -1.0999912023544312f, 1.2999895811080933f}}}, + .float16Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.8164898157119751f, -0.8164898157119751f, 1.6329796314239502f, 0.9999500513076782f, -0.9999500513076782f, -0.9999500513076782f, 0.9999500513076782f, -0.6324428915977478f, 1.2648857831954956f, -1.2648857831954956f, 0.6324428915977478f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -694,7 +694,7 @@ static std::vector<MixedTypedExample> examples_nhwc_2 = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 1.0f, 0.0f, 2.0f, 0.0f, 2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, -2.0f, 0.0f, -2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -717,7 +717,7 @@ static std::vector<MixedTypedExample> examples_nhwc_2 = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {10.0f, 9.000008f, 10.0f, 9.8000016f, 10.0f, 9.8000016f, 10.0f, 11.3999888f, 11.9999f, 8.6000112f, 8.0001f, 10.999992f, 8.0001f, 7.8000176f, 11.9999f, 12.5999792f}}}, + .float32Operands = {{0, {10.0f, 10.0f, 10.0f, 8.367021f, 10.0f, 8.367021f, 10.0f, 13.265959f, 11.9999f, 8.735114f, 8.0001f, 12.529772f, 8.0001f, 7.470228f, 11.9999f, 11.264886f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -751,7 +751,7 @@ static std::vector<MixedTypedExample> examples_nhwc_relaxed_2 = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 1.0f, 0.0f, 2.0f, 0.0f, 2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, -2.0f, 0.0f, -2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -774,7 +774,7 @@ static std::vector<MixedTypedExample> examples_nhwc_relaxed_2 = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {10.0f, 9.000008f, 10.0f, 9.8000016f, 10.0f, 9.8000016f, 10.0f, 11.3999888f, 11.9999f, 8.6000112f, 8.0001f, 10.999992f, 8.0001f, 7.8000176f, 11.9999f, 12.5999792f}}}, + .float32Operands = {{0, {10.0f, 10.0f, 10.0f, 8.367021f, 10.0f, 8.367021f, 10.0f, 13.265959f, 11.9999f, 8.735114f, 8.0001f, 12.529772f, 8.0001f, 7.470228f, 11.9999f, 11.264886f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -816,7 +816,7 @@ static std::vector<MixedTypedExample> examples_nhwc_float16_2 = { // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {0.0f, 1.0f, 0.0f, 2.0f, 0.0f, 2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 4.0f}}}, + .float16Operands = {{0, {0.0f, 0.0f, 0.0f, -2.0f, 0.0f, -2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 1.0f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -839,7 +839,7 @@ static std::vector<MixedTypedExample> examples_nhwc_float16_2 = { // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {10.0f, 9.000007629394531f, 10.0f, 9.80000114440918f, 10.0f, 9.80000114440918f, 10.0f, 11.399989128112793f, 11.999899864196777f, 8.600010871887207f, 8.000100135803223f, 10.999992370605469f, 8.000100135803223f, 7.800017833709717f, 11.999899864196777f, 12.599979400634766f}}}, + .float16Operands = {{0, {10.0f, 10.0f, 10.0f, 8.367020606994629f, 10.0f, 8.367020606994629f, 10.0f, 13.265958786010742f, 11.999899864196777f, 8.735114097595215f, 8.000100135803223f, 12.52977180480957f, 8.000100135803223f, 7.47022819519043f, 11.999899864196777f, 11.264885902404785f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -865,7 +865,7 @@ static std::vector<MixedTypedExample> examples_nchw_2 = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, -2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -888,7 +888,7 @@ static std::vector<MixedTypedExample> examples_nchw_2 = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {10.0f, 10.0f, 10.0f, 10.0f, 9.000008f, 9.8000016f, 9.8000016f, 11.3999888f, 11.9999f, 8.0001f, 8.0001f, 11.9999f, 8.6000112f, 10.999992f, 7.8000176f, 12.5999792f}}}, + .float32Operands = {{0, {10.0f, 10.0f, 10.0f, 10.0f, 10.0f, 8.367021f, 8.367021f, 13.265959f, 11.9999f, 8.0001f, 8.0001f, 11.9999f, 8.735114f, 12.529772f, 7.470228f, 11.264886f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -922,7 +922,7 @@ static std::vector<MixedTypedExample> examples_nchw_relaxed_2 = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, -2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -945,7 +945,7 @@ static std::vector<MixedTypedExample> examples_nchw_relaxed_2 = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {10.0f, 10.0f, 10.0f, 10.0f, 9.000008f, 9.8000016f, 9.8000016f, 11.3999888f, 11.9999f, 8.0001f, 8.0001f, 11.9999f, 8.6000112f, 10.999992f, 7.8000176f, 12.5999792f}}}, + .float32Operands = {{0, {10.0f, 10.0f, 10.0f, 10.0f, 10.0f, 8.367021f, 8.367021f, 13.265959f, 11.9999f, 8.0001f, 8.0001f, 11.9999f, 8.735114f, 12.529772f, 7.470228f, 11.264886f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -987,7 +987,7 @@ static std::vector<MixedTypedExample> examples_nchw_float16_2 = { // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 4.0f}}}, + .float16Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, -2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 1.0f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -1010,7 +1010,7 @@ static std::vector<MixedTypedExample> examples_nchw_float16_2 = { // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {10.0f, 10.0f, 10.0f, 10.0f, 9.000007629394531f, 9.80000114440918f, 9.80000114440918f, 11.399989128112793f, 11.999899864196777f, 8.000100135803223f, 8.000100135803223f, 11.999899864196777f, 8.600010871887207f, 10.999992370605469f, 7.800017833709717f, 12.599979400634766f}}}, + .float16Operands = {{0, {10.0f, 10.0f, 10.0f, 10.0f, 10.0f, 8.367020606994629f, 8.367020606994629f, 13.265958786010742f, 11.999899864196777f, 8.000100135803223f, 8.000100135803223f, 11.999899864196777f, 8.735114097595215f, 12.52977180480957f, 7.47022819519043f, 11.264885902404785f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -1036,7 +1036,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nhwc_2 = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 1.0f, 0.0f, 2.0f, 0.0f, 2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, -2.0f, 0.0f, -2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -1059,7 +1059,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nhwc_2 = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {10.0f, 9.000008f, 10.0f, 9.8000016f, 10.0f, 9.8000016f, 10.0f, 11.3999888f, 11.9999f, 8.6000112f, 8.0001f, 10.999992f, 8.0001f, 7.8000176f, 11.9999f, 12.5999792f}}}, + .float32Operands = {{0, {10.0f, 10.0f, 10.0f, 8.367021f, 10.0f, 8.367021f, 10.0f, 13.265959f, 11.9999f, 8.735114f, 8.0001f, 12.529772f, 8.0001f, 7.470228f, 11.9999f, 11.264886f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -1093,7 +1093,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nhwc_relaxed // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 1.0f, 0.0f, 2.0f, 0.0f, 2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, -2.0f, 0.0f, -2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -1116,7 +1116,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nhwc_relaxed // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {10.0f, 9.000008f, 10.0f, 9.8000016f, 10.0f, 9.8000016f, 10.0f, 11.3999888f, 11.9999f, 8.6000112f, 8.0001f, 10.999992f, 8.0001f, 7.8000176f, 11.9999f, 12.5999792f}}}, + .float32Operands = {{0, {10.0f, 10.0f, 10.0f, 8.367021f, 10.0f, 8.367021f, 10.0f, 13.265959f, 11.9999f, 8.735114f, 8.0001f, 12.529772f, 8.0001f, 7.470228f, 11.9999f, 11.264886f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -1158,7 +1158,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nhwc_float16 // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {0.0f, 1.0f, 0.0f, 2.0f, 0.0f, 2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 4.0f}}}, + .float16Operands = {{0, {0.0f, 0.0f, 0.0f, -2.0f, 0.0f, -2.0f, 0.0f, 4.0f, 1.0f, -1.0f, -1.0f, 2.0f, -1.0f, -2.0f, 1.0f, 1.0f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -1181,7 +1181,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nhwc_float16 // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {10.0f, 9.000007629394531f, 10.0f, 9.80000114440918f, 10.0f, 9.80000114440918f, 10.0f, 11.399989128112793f, 11.999899864196777f, 8.600010871887207f, 8.000100135803223f, 10.999992370605469f, 8.000100135803223f, 7.800017833709717f, 11.999899864196777f, 12.599979400634766f}}}, + .float16Operands = {{0, {10.0f, 10.0f, 10.0f, 8.367020606994629f, 10.0f, 8.367020606994629f, 10.0f, 13.265958786010742f, 11.999899864196777f, 8.735114097595215f, 8.000100135803223f, 12.52977180480957f, 8.000100135803223f, 7.47022819519043f, 11.999899864196777f, 11.264885902404785f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -1207,7 +1207,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nchw_2 = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, -2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -1230,7 +1230,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nchw_2 = { // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {10.0f, 10.0f, 10.0f, 10.0f, 9.000008f, 9.8000016f, 9.8000016f, 11.3999888f, 11.9999f, 8.0001f, 8.0001f, 11.9999f, 8.6000112f, 10.999992f, 7.8000176f, 12.5999792f}}}, + .float32Operands = {{0, {10.0f, 10.0f, 10.0f, 10.0f, 10.0f, 8.367021f, 8.367021f, 13.265959f, 11.9999f, 8.0001f, 8.0001f, 11.9999f, 8.735114f, 12.529772f, 7.470228f, 11.264886f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -1264,7 +1264,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nchw_relaxed // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 4.0f}}}, + .float32Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, -2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 1.0f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -1287,7 +1287,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nchw_relaxed // int -> Dimensions map .operandDimensions = {{0, {2, 2, 2, 2}}}, // int -> FLOAT32 map - .float32Operands = {{0, {10.0f, 10.0f, 10.0f, 10.0f, 9.000008f, 9.8000016f, 9.8000016f, 11.3999888f, 11.9999f, 8.0001f, 8.0001f, 11.9999f, 8.6000112f, 10.999992f, 7.8000176f, 12.5999792f}}}, + .float32Operands = {{0, {10.0f, 10.0f, 10.0f, 10.0f, 10.0f, 8.367021f, 8.367021f, 13.265959f, 11.9999f, 8.0001f, 8.0001f, 11.9999f, 8.735114f, 12.529772f, 7.470228f, 11.264886f}}}, // int -> INT32 map .int32Operands = {}, // int -> QUANT8_ASYMM map @@ -1329,7 +1329,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nchw_float16 // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 2.0f, 2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 4.0f}}}, + .float16Operands = {{0, {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, -2.0f, 4.0f, 1.0f, -1.0f, -1.0f, 1.0f, -1.0f, 2.0f, -2.0f, 1.0f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map @@ -1352,7 +1352,7 @@ static std::vector<MixedTypedExample> examples_dynamic_output_shape_nchw_float16 // int -> QUANT16_SYMM map .quant16SymmOperands = {}, // int -> FLOAT16 map - .float16Operands = {{0, {10.0f, 10.0f, 10.0f, 10.0f, 9.000007629394531f, 9.80000114440918f, 9.80000114440918f, 11.399989128112793f, 11.999899864196777f, 8.000100135803223f, 8.000100135803223f, 11.999899864196777f, 8.600010871887207f, 10.999992370605469f, 7.800017833709717f, 12.599979400634766f}}}, + .float16Operands = {{0, {10.0f, 10.0f, 10.0f, 10.0f, 10.0f, 8.367020606994629f, 8.367020606994629f, 13.265958786010742f, 11.999899864196777f, 8.000100135803223f, 8.000100135803223f, 11.999899864196777f, 8.735114097595215f, 12.52977180480957f, 7.47022819519043f, 11.264885902404785f}}}, // int -> BOOL8 map .bool8Operands = {}, // int -> QUANT8_SYMM_PER_CHANNEL map diff --git a/nn/runtime/test/specs/V1_2/instance_normalization.mod.py b/nn/runtime/test/specs/V1_2/instance_normalization.mod.py index 9d540ff59..241ab8b12 100644 --- a/nn/runtime/test/specs/V1_2/instance_normalization.mod.py +++ b/nn/runtime/test/specs/V1_2/instance_normalization.mod.py @@ -24,14 +24,14 @@ Model().Operation("INSTANCE_NORMALIZATION", i1, 1.0, 0.0, 0.0001, layout).To(o1) # Instantiate an example Example({ i1: [ - 0, 1, 0, 2, 0, 2, 0, 4, - 1, -1, -1, 2, -1, -2, 1, 4 + 0, 0, 0, -2, 0, -2, 0, 4, + 1, -1, -1, 2, -1, -2, 1, 1 ], o1: [ - 0.00, -0.499996, 0.00, -0.0999992, - 0.00, -0.0999992, 0.00, 0.6999944, - 0.99995, -0.6999944, -0.99995, 0.499996, - -0.99995, -1.0999912, 0.99995, 1.2999896 + 0., 0., 0., -0.8164898, + 0., -0.8164898, 0., 1.6329796, + 0.99995005, -0.6324429, -0.99995005, 1.2648858, + -0.99995005, -1.2648858, 0.99995005, 0.6324429, ] }).AddNchw(i1, o1, layout).AddVariations("relaxed", "float16") @@ -44,13 +44,13 @@ Model().Operation("INSTANCE_NORMALIZATION", i2, 2.0, 10.0, 0.0001, layout).To(o2 # Instantiate an example Example({ i2: [ - 0, 1, 0, 2, 0, 2, 0, 4, - 1, -1, -1, 2, -1, -2, 1, 4 + 0, 0, 0, -2, 0, -2, 0, 4, + 1, -1, -1, 2, -1, -2, 1, 1 ], o2: [ - 10. , 9.000008 , 10. , 9.8000016, 10. , - 9.8000016, 10. , 11.3999888, 11.9999 , 8.6000112, - 8.0001 , 10.999992 , 8.0001 , 7.8000176, 11.9999 , - 12.5999792 + 10., 10., 10., 8.367021, + 10., 8.367021, 10., 13.265959, + 11.9999, 8.735114, 8.0001, 12.529772, + 8.0001, 7.470228, 11.9999, 11.264886, ] }).AddNchw(i2, o2, layout).AddVariations("relaxed", "float16") |