Merge pull request #18973 from sl-sergei:fix_vulkan_build

* Fix build when HAVE_VULKAN is ON

* Fix warnings
This commit is contained in:
Sergei Slashchinin 2020-12-01 15:52:09 +03:00 committed by GitHub
parent fc54853d44
commit 9cef41000a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -440,9 +440,9 @@ public:
{
int padding_mode;
vkcom::PoolType pool_type;
int filter_size[2] = {kernel.height, kernel.width};
int pad_size[2] = {pad.height, pad.width};
int stride_size[2] = {stride.height, stride.width};
int filter_size[2] = {static_cast<int>(kernel_size[0]), static_cast<int>(kernel_size[1])};
int pad_size[2] = {static_cast<int>(pads_begin[0]), static_cast<int>(pads_begin[1])};
int stride_size[2] = {static_cast<int>(strides[0]), static_cast<int>(strides[1])};
pool_type = type == MAX ? vkcom::kPoolTypeMax:
(type == AVE ? vkcom::kPoolTypeAvg:
vkcom::kPoolTypeNum);