From c577f2c6a3b4ddb6ba87a882723c53a248afbeba Mon Sep 17 00:00:00 2001 From: telsoa01 Date: Fri, 31 Aug 2018 09:22:23 +0100 Subject: Release 18.08 --- src/armnnTfParser/test/Constant.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/armnnTfParser/test/Constant.cpp') diff --git a/src/armnnTfParser/test/Constant.cpp b/src/armnnTfParser/test/Constant.cpp index 09587fc3d5..bc8b36d61b 100644 --- a/src/armnnTfParser/test/Constant.cpp +++ b/src/armnnTfParser/test/Constant.cpp @@ -14,13 +14,13 @@ BOOST_AUTO_TEST_SUITE(TensorflowParser) // Tests that a Const node in Tensorflow can be converted to a ConstLayer in armnn (as opposed to most // Const nodes which are used as weight inputs for convolutions etc. and are therefore not converted to // armnn ConstLayers). -struct ConstantFixture : public ParserPrototxtFixture +struct ConstantFixture : public armnnUtils::ParserPrototxtFixture { ConstantFixture() { - // input = tf.placeholder(tf.float32, name = "input") - // const = tf.constant([17], tf.float32, [1]) - // output = tf.add(input, const, name = "output") + // Input = tf.placeholder(tf.float32, name = "input") + // Const = tf.constant([17], tf.float32, [1]) + // Output = tf.add(input, const, name = "output") m_Prototext = R"( node { @@ -90,12 +90,12 @@ BOOST_FIXTURE_TEST_CASE(Constant, ConstantFixture) // Tests that a single Const node in Tensorflow can be used twice by a dependant node. This should result in only // a single armnn ConstLayer being created. -struct ConstantReusedFixture : public ParserPrototxtFixture +struct ConstantReusedFixture : public armnnUtils::ParserPrototxtFixture { ConstantReusedFixture() { - // const = tf.constant([17], tf.float32, [1]) - // output = tf.add(const, const, name = "output") + // Const = tf.constant([17], tf.float32, [1]) + // Output = tf.add(const, const, name = "output") m_Prototext = R"( node { @@ -145,7 +145,7 @@ BOOST_FIXTURE_TEST_CASE(ConstantReused, ConstantReusedFixture) } template -struct ConstantValueListFixture : public ParserPrototxtFixture +struct ConstantValueListFixture : public armnnUtils::ParserPrototxtFixture { ConstantValueListFixture() { @@ -180,7 +180,7 @@ node { m_Prototext += std::string("float_val : ") + std::to_string(value) + "\n"; } - m_Prototext += + m_Prototext += R"( } } @@ -209,7 +209,7 @@ BOOST_FIXTURE_TEST_CASE(ConstantMaxValueList, ConstantMaxValueListFixture) } template -struct ConstantCreateFixture : public ParserPrototxtFixture +struct ConstantCreateFixture : public armnnUtils::ParserPrototxtFixture { ConstantCreateFixture() { -- cgit v1.2.1