diff options
author | telsoa01 <telmo.soares@arm.com> | 2018-08-31 09:22:23 +0100 |
---|---|---|
committer | telsoa01 <telmo.soares@arm.com> | 2018-08-31 09:22:23 +0100 |
commit | c577f2c6a3b4ddb6ba87a882723c53a248afbeba (patch) | |
tree | bd7d4c148df27f8be6649d313efb24f536b7cf34 /src/armnnTfParser/test/Convolution2d.cpp | |
parent | 4c7098bfeab1ffe1cdc77f6c15548d3e73274746 (diff) | |
download | armnn-c577f2c6a3b4ddb6ba87a882723c53a248afbeba.tar.gz |
Release 18.08
Diffstat (limited to 'src/armnnTfParser/test/Convolution2d.cpp')
-rw-r--r-- | src/armnnTfParser/test/Convolution2d.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/armnnTfParser/test/Convolution2d.cpp b/src/armnnTfParser/test/Convolution2d.cpp index a7c7648b81..8ad1036ef1 100644 --- a/src/armnnTfParser/test/Convolution2d.cpp +++ b/src/armnnTfParser/test/Convolution2d.cpp @@ -11,14 +11,14 @@ BOOST_AUTO_TEST_SUITE(TensorflowParser) -struct Convolution2dFixture : public ParserPrototxtFixture<armnnTfParser::ITfParser> +struct Convolution2dFixture : public armnnUtils::ParserPrototxtFixture<armnnTfParser::ITfParser> { explicit Convolution2dFixture(const char* paddingType) : Convolution2dFixture(paddingType, 1) {} - // dilation: 0 - dilations attribute is not included; - // dilation: >0 - dilations attribute set to [1,v,v,1], where v is the value of the dilation arg + // Dilation: 0 - dilations attribute is not included; + // Dilation: >0 - dilations attribute set to [1,v,v,1], where v is the value of the dilation arg explicit Convolution2dFixture(const char* paddingType, int stride, int dilation = 0) { std::string strideString = std::to_string(stride); @@ -309,13 +309,8 @@ BOOST_AUTO_TEST_CASE(ParseConv2DDilation2) armnn::TensorShape tensorShape = { 1, 3, 3, 1 }; inputShapes["graphInput"] = tensorShape; armnnTfParser::ITfParserPtr parser = armnnTfParser::ITfParser::Create(); - BOOST_CHECK_EXCEPTION(parser->CreateNetworkFromString(prototext, inputShapes, { "potato" }), - armnn::ParseException, - [] (armnn::ParseException const& ex)->bool - { - return strcmp(ex.what(), - "ArmNN only supports Convolution layers with dilations [1,1,1,1]") == 0; - }); + BOOST_CHECK_THROW(parser->CreateNetworkFromString(prototext, inputShapes, { "potato" }), + armnn::ParseException); } |