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

[IE][VPU][GT]: Change begin and end masks serialization for StridedSlice (#1417)

Browse Source 
* In order to support cases when begin and end size is less than input rank, the serialization was changed.
* Add tests
* Update firmware
This commit is contained in:
Andrew Bakalin 2020-07-23 12:20:08 +03:00 committed by GitHub
parent d6c412ca40
commit f00cdddede
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inference-engine/cmake/vpu_dependencies.cmake
View File

@ -19,7 +19,7 @@ set(VPU_SUPPORTED_FIRMWARES usb-ma2450 usb-ma2x8x pcie-ma248x)
# Default packages
#
set(FIRMWARE_PACKAGE_VERSION 1250)
set(FIRMWARE_PACKAGE_VERSION 1263)
set(VPU_CLC_MA2X8X_VERSION "movi-cltools-20.02.0")
#

25
inference-engine/src/vpu/graph_transformer/src/stages/strided_slice.cpp
View File

@ -11,19 +11,22 @@ namespace vpu {
namespace {
int maskStrToInt(std::string mask) {
int idx = 0, result = 0;
std::uint32_t maskStrToInt(std::string mask) {
std::uint32_t result = 0;
int idx = 0;
for (const auto& character : mask) {
if (character == ',') continue;
if (idx++ > 0) {
result <<= 1;
}
if (character == '1') {
result = result | 1;
} else if (character != '0') {
VPU_THROW_FORMAT("Unsupported mask value: only 0 or 1 are supported, but got {} instead", character);
switch (character) {
case ',':
continue;
case '1':
result |= (0x1 << idx++);
break;
case '0':
idx++;
break;
default:
VPU_THROW_FORMAT("Unsupported mask value: only 0 or 1 are supported, but got {} instead", character);
}
}

2
inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/strided_slice.cpp
View File

@ -18,6 +18,8 @@ typedef std::map<std::string, std::string> Config;
std::vector<StridedSliceSpecificParams> testCases = {
{ { 1, 12, 100 }, { 0, 9, 0 }, { 0, 11, 0 }, { 1, 1, 1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } },
{ { 1, 12, 100 }, { 0, 9 }, { 0, 11 }, { 1, 1, 1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } },
{ { 1, 12, 100 }, { 0, 9 }, { 0, 11 }, { 1, 1 }, { 1, 0 }, { 1, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } },
{ { 1, 12, 100 }, { 0, 1, 0 }, { 0, -1, 0 }, { 1, 1, 1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } },
{ { 1, 12, 100 }, { 0, 8, 0 }, { 0, 9, 0 }, { 1, 1, 1 }, { 1, 0, 1 }, { 1, 0, 1 }, {}, {}, {} },
{ { 1, 12, 100 }, { 0, 4, 0 }, { 0, 9, 0 }, { 1, 2, 1 }, { 1, 0, 1 }, { 1, 0, 1 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } },