natas_hw
/
openvino
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avg pool bug fix (#7493) 

* modify avg_pool ref impl to work with n_elements = 0

* add avg_pool backend test

* fix bug with division by 0
This commit is contained in:
Piotr Szmelczynski 2021-09-15 06:50:30 +02:00 committed by GitHub
parent f5cd75a084
commit ffef5bdff2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ngraph/core/reference/include/ngraph/runtime/reference/avg_pool.hpp
View File

@ -215,16 +215,17 @@ void avg_pool(const T* arg,
}
}
if (n_elements == 0) {
throw std::runtime_error("AvgPool elements == 0, must be non-zero");
if (n_elements != 0) {
if (std::is_same<T, int8_t>::value || std::is_same<T, uint8_t>::value) {
out[output_transform.index(out_coord)] =
static_cast<T>(std::nearbyint(static_cast<float>(result) / n_elements));
} else {
out[output_transform.index(out_coord)] = result / n_elements;
}
} else {
out[output_transform.index(out_coord)] = T{0};
}
if (std::is_same<T, int8_t>::value || std::is_same<T, uint8_t>::value) {
out[output_transform.index(out_coord)] =
static_cast<T>(std::nearbyint(static_cast<float>(result) / n_elements));
} else {
out[output_transform.index(out_coord)] = result / n_elements;
}
std::fesetround(old_mode);
}
NGRAPH_SUPPRESS_DEPRECATED_END

26
ngraph/test/backend/avg_pool.in.cpp
View File

@ -223,3 +223,29 @@ NGRAPH_TEST(${BACKEND_NAME}, avg_pool_2d_same_lower) {
test_case.add_expected_output<float>(out_shape, result);
test_case.run();
}
NGRAPH_TEST(${BACKEND_NAME}, avg_pool_2d_padding) {
Shape in_shape{1, 1, 3, 3};
Shape out_shape{1, 1, 3, 3};
const Strides& strides{2, 2};
const Shape& pads_begin{1, 1};
const Shape& pads_end{1, 1};
const Shape& kernel{2, 2};
const bool exclude_pad = true;
const op::RoundingType rounding_type = op::RoundingType::CEIL;
const op::PadType pad_type = op::PadType::NOTSET;
auto A = make_shared<op::Parameter>(element::f32, in_shape);
auto avgPool =
make_shared<op::v1::AvgPool>(A, strides, pads_begin, pads_end, kernel, exclude_pad, rounding_type, pad_type);
auto f = make_shared<Function>(avgPool, ParameterVector{A});
std::vector<float> a(1 * 1 * 3 * 3);
std::iota(std::begin(a), std::end(a), 1);
std::vector<float> result{1.0f, 2.5f, 0, 5.5f, 7.0f, 0, 0, 0, 0};
auto test_case = test::TestCase<TestEngine>(f);
test_case.add_input<float>({a});
test_case.add_expected_output<float>(out_shape, result);
test_case.run();
}