From 32488a5c263fc9fbab9dc3592a8fa2079d030531 Mon Sep 17 00:00:00 2001 From: azhogov Date: Mon, 18 May 2020 13:17:10 +0300 Subject: [PATCH] Fix VS2017 compilation issue: Intermediate channels count type changed to size_t (cherry-pick master 0f6155ac3616fb2a7b51cfaddfdad1cc189f968d) --- .../tests/functional/plugin/cpu/bfloat16/concat_in_place.cpp | 2 +- inference-engine/tests/functional/plugin/cpu/bfloat16/elt_max.cpp | 2 +- .../tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x3_eltwise.cpp | 2 +- .../tests/functional/plugin/cpu/bfloat16/tail_fp32_optimization.cpp | 2 +- .../tests/functional/plugin/cpu/bfloat16/topk_inputs_i32.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/concat_in_place.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/concat_in_place.cpp index 5037e20..6ab4fd3 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/concat_in_place.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/concat_in_place.cpp @@ -25,7 +25,7 @@ using namespace InferenceEngine; namespace LayerTestsDefinitions { namespace { - static const int inputSize = 2, concatAxe = 1; + static const size_t inputSize = 2, concatAxe = 1; static std::vector paramVector = { SizeVector({ 1, 1, inputSize, inputSize }), SizeVector({ 1, 2, inputSize, inputSize }), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/elt_max.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/elt_max.cpp index 5c8e392..7e0e82c 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/elt_max.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/elt_max.cpp @@ -39,7 +39,7 @@ protected: // STAGE1: construction of the GRAPH ngraph::element::Type ntype = (netPrecision == Precision::FP32) ? ngraph::element::f32 : ngraph::element::bf16; auto channelsCount = inputShapes[1]; - const int conv0OutputChannels = 1; + const size_t conv0OutputChannels = 1; // add auto input1 = std::make_shared(ntype, ngraph::Shape{inputShapes}); diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x3_eltwise.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x3_eltwise.cpp index 1a4fb81..48db4d7 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x3_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x3_eltwise.cpp @@ -44,7 +44,7 @@ protected: ngraph::element::Type ntype = (netPrecision == Precision::FP32) ? ngraph::element::f32 : ngraph::element::bf16; auto channelsCount = inputShapes[1]; - const int outChannels = 16; + const size_t outChannels = 16; // multiply auto input1 = std::make_shared(ntype, ngraph::Shape{inputShapes}); diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/tail_fp32_optimization.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/tail_fp32_optimization.cpp index 4ed11f7..0d7d312 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/tail_fp32_optimization.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/tail_fp32_optimization.cpp @@ -41,7 +41,7 @@ protected: ngraph::element::Type ntype = (netPrecision == Precision::FP32) ? ngraph::element::f32 : ngraph::element::bf16; auto channelsCount = inputShapes[1]; - const int outChannels = 16; + const size_t outChannels = 16; // multiply auto input1 = std::make_shared(ntype, ngraph::Shape{inputShapes}); diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/topk_inputs_i32.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/topk_inputs_i32.cpp index 29ae8e0..8f278f7 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/topk_inputs_i32.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/topk_inputs_i32.cpp @@ -42,7 +42,7 @@ protected: ngraph::element::Type ntype = (netPrecision == Precision::FP32) ? ngraph::element::f32 : ngraph::element::bf16; auto channelsCount = inputShapes[1]; - const int intermediateChannelsCount = 16; + const size_t intermediateChannelsCount = 16; // multiply auto input1 = std::make_shared(ntype, ngraph::Shape{inputShapes}); -- 2.7.4