diff options
| author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-11-27 13:29:51 +0000 |
|---|---|---|
| committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-11-29 10:28:32 +0000 |
| commit | 2e259276fba9fa5c6c2e146de3b26e3d6c6cccc6 (patch) | |
| tree | 935888a1252056036ac1cfdd623f60b46bd3579d /src/armnnTfParser/test/FusedBatchNorm.cpp | |
| parent | 2445744f46921ba5e30f9110c26b9485ddfe90b5 (diff) | |
| download | armnn-2e259276fba9fa5c6c2e146de3b26e3d6c6cccc6.tar.gz | |
Github #306 Treat data_format attribute as optional in TfParser::ParseFusedBatchNorm()
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I1c6583e4abb43b864dc636f8cdcd9011c763a6fe
Diffstat (limited to 'src/armnnTfParser/test/FusedBatchNorm.cpp')
| -rw-r--r-- | src/armnnTfParser/test/FusedBatchNorm.cpp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/armnnTfParser/test/FusedBatchNorm.cpp b/src/armnnTfParser/test/FusedBatchNorm.cpp index 98bdb26183..b93a4728d0 100644 --- a/src/armnnTfParser/test/FusedBatchNorm.cpp +++ b/src/armnnTfParser/test/FusedBatchNorm.cpp @@ -141,16 +141,22 @@ struct FusedBatchNormFixture : public armnnUtils::ParserPrototxtFixture<armnnTfP " value { \n" " type: DT_FLOAT \n" " } \n" - " } \n" - " attr { \n" - " key: \"data_format\" \n" - " value { \n" - " s: \""; - m_Prototext.append(dataLayout); - m_Prototext.append("\" \n" - " } \n" - " } \n" - " attr { \n" + " } \n"; + + // NOTE: we only explicitly set data_format when it is not the default NHWC + if (dataLayout != "NHWC") + { + m_Prototext.append(" attr { \n" + " key: \"data_format\" \n" + " value { \n" + " s: \""); + m_Prototext.append(dataLayout); + m_Prototext.append("\" \n" + " } \n" + " } \n"); + } + + m_Prototext.append(" attr { \n" " key: \"epsilon\" \n" " value { \n" " f: 0.0010000000475 \n" |