diff options
| author | Mohamed Nour Abouelseoud <mohamednour.abouelseoud@arm.com> | 2018-12-06 14:29:25 +0000 |
|---|---|---|
| committer | Mohamed Nour Abouelseoud <mohamednour.abouelseoud@arm.com> | 2018-12-06 14:29:25 +0000 |
| commit | ba8815f4c38966cc15bb5bcd0960fdd23d89e365 (patch) | |
| tree | 7eea803c6a1b92aa2e8b8114305d547687483899 /src/armnnCaffeParser | |
| parent | d7cceeb9b772ea09879355bcfdea211d34749c1b (diff) | |
| download | armnn-ba8815f4c38966cc15bb5bcd0960fdd23d89e365.tar.gz | |
Removed square kernel in range validation in CaffeParser
as validation assumptions should not be made and
should be handled by the backend
Change-Id: I1565daeb0abfdc0bb01981eab2a1937a5af7976e
Diffstat (limited to 'src/armnnCaffeParser')
| -rw-r--r-- | src/armnnCaffeParser/CaffeParser.cpp | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/armnnCaffeParser/CaffeParser.cpp b/src/armnnCaffeParser/CaffeParser.cpp index 3f61650f8b..3cc0fb9319 100644 --- a/src/armnnCaffeParser/CaffeParser.cpp +++ b/src/armnnCaffeParser/CaffeParser.cpp @@ -123,11 +123,6 @@ void GetDataFromBlob(const LayerParameter& layerParam, vector<float>& outData, u } } -bool IsInRange(unsigned int value, unsigned int min, unsigned int max) -{ - return (value >= min && value <= max) ? true : false; -} - template <typename T> size_t SizeOfVectorData(const vector<T>& vec) { @@ -244,35 +239,6 @@ ValueType GetOptionalWithFallback(const ParamType& param, }, \ DEFAULT_VALUE) - -void ValidateEqualValuesInRange(unsigned int valueA, - const char* valueNameA, - unsigned int valueB, - const char* valueNameB, - unsigned int min, - unsigned int max, - const armnn::CheckLocation& location) -{ - if (!IsInRange(valueA, min, max) || !IsInRange(valueB, min, max) || (valueA != valueB)) - { - throw ParseException( - boost::str( - boost::format( - "%1%=%2% and %3%=%4% must be equal and within the valid range" - "of [%5%, %6%] %7%") % - valueNameA % - valueA % - valueNameB % - valueB % - min % - max % - location.AsString())); - } -} - -#define VALIDATE_EQUAL_VALUES_IN_RANGE(A, B, MIN_RANGE, MAX_RANGE) \ - ValidateEqualValuesInRange(A, #A, B, #B, MIN_RANGE, MAX_RANGE, CHECK_LOCATION()) - } // namespace <anonymous> const std::map<std::string, CaffeParserBase::OperationParsingFunction> @@ -943,8 +909,6 @@ void CaffeParserBase::ParsePoolingLayer(const LayerParameter& layerParam) kernel_w = inputInfo.GetShape()[3]; } - VALIDATE_EQUAL_VALUES_IN_RANGE(kernel_h, kernel_w, 0, 11); - unsigned int stride_h = GET_OPTIONAL_WITH_FALLBACK(param, PoolingParameter, stride_h, stride, unsigned int, notFound); unsigned int stride_w = GET_OPTIONAL_WITH_FALLBACK(param, PoolingParameter, @@ -956,15 +920,11 @@ void CaffeParserBase::ParsePoolingLayer(const LayerParameter& layerParam) stride_w = 1; } - VALIDATE_EQUAL_VALUES_IN_RANGE(stride_h, stride_w, 0, 11); - unsigned int pad_h = GET_OPTIONAL_WITH_FALLBACK(param, PoolingParameter, pad_h, pad, unsigned int, 0u); unsigned int pad_w = GET_OPTIONAL_WITH_FALLBACK(param, PoolingParameter, pad_w, pad, unsigned int, 0u); - VALIDATE_EQUAL_VALUES_IN_RANGE(pad_h, pad_w, 0, 11); - // Populate Weight and Bias Filter Descriptor Pooling2dDescriptor pooling2dDescriptor; if (param.has_pool()) |