Skip to content

Commit

Permalink
Merge pull request #4 from v-Golubev/vg/merge_to_integration
Browse files Browse the repository at this point in the history 
[LPT] Tests Unification
  • Loading branch information
@eshoguli
eshoguli authored Sep 22, 2020
2 parents 5595c4c + 4445ad2 commit 932ff7d
Show file tree
Hide file tree
Showing 4 changed files with 502 additions and 19 deletions.
321 changes: 321 additions & 0 deletions ...rence_engine/lp_transformations/concat_with_intermediate_with_constant_transformation.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,321 @@
// Copyright (C) 2020 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//

#include "layer_transformation.hpp"

#include <string>
#include <sstream>
#include <memory>

#include <gtest/gtest.h>

#include <transformations/utils/utils.hpp>
#include <transformations/init_node_info.hpp>
#include <transformations/low_precision/transformer.hpp>
#include <transformations/low_precision/concat.hpp>
#include <transformations/low_precision/concat_multi_channels.hpp>
#include <transformations/low_precision/max_pool.hpp>
#include <transformations/low_precision/interpolate.hpp>

#include "common_test_utils/ngraph_test_utils.hpp"
#include "ngraph_functions/low_precision_transformations/concat_function.hpp"
#include "ngraph_functions/low_precision_transformations/common/fake_quantize_on_data.hpp"
#include "simple_low_precision_transformer.hpp"

using namespace testing;
using namespace ngraph;
using namespace ngraph::pass;

namespace {

class ConcatTransformationActualValues {
public:
ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize1;
ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize2;
};

inline std::ostream& operator<<(std::ostream& out, const ConcatTransformationActualValues& values) {
return out << "_" << values.fakeQuantize1 << "_" << values.fakeQuantize2;
}

class ConcatTransformationResultValues {
public:
ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize1;
ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize2;
ngraph::builder::subgraph::DequantizationOperations dequantizationOperations1;
ngraph::element::Type precisionBeforeOp;
ngraph::element::Type precisionAfterOperation;
ngraph::builder::subgraph::DequantizationOperations dequantizationOperations2;
ngraph::element::Type precisionAfterDequantization;
};

inline std::ostream& operator<<(std::ostream& out, const ConcatTransformationResultValues& values) {
return out << "_" <<
values.fakeQuantize1 << "_" <<
values.fakeQuantize2 << "_" <<
values.precisionBeforeOp << "_" <<
values.dequantizationOperations1 << "_" <<
values.dequantizationOperations2;
}

class ConcatTransformationTestValues {
public:
ngraph::pass::low_precision::LayerTransformation::Params params;
bool multiChannels;
bool transparentIntermediate;
ConcatTransformationActualValues actual;
ConcatTransformationResultValues result;
};

inline std::ostream& operator<<(std::ostream& out, const ConcatTransformationTestValues& values) {
return out << "_" << values.multiChannels << "_" << values.actual << "_" << values.result;
}

typedef std::tuple <
ngraph::element::Type,
ngraph::Shape,
ConcatTransformationTestValues
> ConcatTransformationParams;

class ConcatWithIntermediateWithConstantTransformation : public LayerTransformation, public testing::WithParamInterface<ConcatTransformationParams> {
public:
void SetUp() override {
const ngraph::element::Type precision = std::get<0>(GetParam());
const ngraph::Shape shape = std::get<1>(GetParam());
ConcatTransformationTestValues testValues = std::get<2>(GetParam());

actualFunction = ngraph::builder::subgraph::ConcatFunction::getOriginalWithIntermediateWithConstant(
precision,
shape,
testValues.transparentIntermediate,
testValues.actual.fakeQuantize1,
testValues.actual.fakeQuantize2);

SimpleLowPrecisionTransformer transform;
if (testValues.multiChannels) {
transform.add<ngraph::pass::low_precision::ConcatMultiChannelsTransformation, ngraph::opset1::Concat>(testValues.params);
} else {
transform.add<ngraph::pass::low_precision::ConcatTransformation, ngraph::opset1::Concat>(testValues.params);
}
transform.add<ngraph::pass::low_precision::MaxPoolTransformation, ngraph::opset1::MaxPool>(testValues.params);
transform.add<ngraph::pass::low_precision::InterpolateTransformation, ngraph::opset1::Interpolate>(testValues.params);
transform.transform(actualFunction);

referenceFunction = ngraph::builder::subgraph::ConcatFunction::getReferenceWithIntermediateWithConstant(
precision,
shape,
testValues.transparentIntermediate,
testValues.result.fakeQuantize1,
testValues.result.fakeQuantize2,
testValues.result.precisionBeforeOp,
testValues.result.dequantizationOperations1,
testValues.result.precisionAfterOperation,
testValues.result.dequantizationOperations2,
testValues.result.precisionAfterDequantization);
}

static std::string getTestCaseName(testing::TestParamInfo<ConcatTransformationParams> obj) {
const ngraph::element::Type precision = std::get<0>(obj.param);
const ngraph::Shape shape = std::get<1>(obj.param);
ConcatTransformationTestValues testValues = std::get<2>(obj.param);

std::ostringstream result;
result <<
toString(testValues.params) << "_" <<
shape << "_" <<
(testValues.multiChannels ? "multiChannels_" : "notMultiChannels_") <<
testValues.actual << "_" <<
testValues.result << "_";
return result.str();
}
};

TEST_P(ConcatWithIntermediateWithConstantTransformation, CompareFunctions) {
actualFunction->validate_nodes_and_infer_types();
auto res = compare_functions(referenceFunction, actualFunction, true, true, true);
ASSERT_TRUE(res.first) << res.second;
}

const std::vector<ngraph::element::Type> precisions = {
ngraph::element::f32,
// ngraph::element::f16
};

const std::vector<ConcatTransformationTestValues> testValues = {
// U8: concat
{
LayerTransformation::createParamsU8I8(),
false,
true,
{
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} },
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} },
},
{
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {255.f} },
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {255.f} },
{ {}, {}, {} },
ngraph::element::u8,
ngraph::element::u8,
{ ngraph::element::f32, {}, { 0.01f } },
ngraph::element::f32
}
},
// I8: concat
{
LayerTransformation::createParamsI8I8(),
false,
true,
{
{ 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} },
{ 256ul, ngraph::Shape({}), {-1.28f / 2.f}, {1.27f / 2.f}, {-1.28f / 2.f}, {1.27f / 2.f} }
},
{
{ 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-128.f}, {127.f} },
{ 256ul, ngraph::Shape({}), {-1.28f / 2.f}, {1.27f / 2.f}, {-64.f}, { 64.f} },
{ {}, {}, {} },
ngraph::element::i8,
ngraph::element::i8,
{ ngraph::element::f32, {}, { 0.01f } },
ngraph::element::f32
}
},
// U8: concat with subtract
{
LayerTransformation::createParamsU8I8(),
false,
true,
{
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} },
{ 256ul, ngraph::Shape({}), {1.275f}, {2.55f}, {1.275f}, {2.55f} }
},
{
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {255.f} },
{ 256ul, ngraph::Shape({}), {1.275f}, {2.55f}, {128.f}, {255.f} },
{ {}, {}, {} },
ngraph::element::u8,
ngraph::element::u8,
{ ngraph::element::f32, {}, { 0.01f } },
ngraph::element::f32
}
},
// U8: not update precisions
{
LayerTransformation::createParamsU8I8().setUpdatePrecisions(false),
false,
true,
{
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} },
{ 256ul, ngraph::Shape({}), {1.275f}, {2.55f}, {1.275f}, {2.55f} }
},
{
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {255.f} },
{ 256ul, ngraph::Shape({}), {1.275f}, {2.55f}, {128.f}, {255.f} },
{ {}, {}, {} },
ngraph::element::f32,
ngraph::element::f32,
{ ngraph::element::f32, {}, { 0.01f } },
ngraph::element::f32
}
},
// U8: concat multi channels
{
LayerTransformation::createParamsU8I8(),
true,
true,
{
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} },
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f / 2.f}, {0.f}, {2.55f / 2.f} }
},
{
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {255.f} },
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f / 2.f}, {0.f}, { 255.f} },
{ {}, {}, {} },
ngraph::element::u8,
ngraph::element::u8,
{ ngraph::element::f32, {}, {{ 0.005f, 0.005f, 0.005f, 0.01f, 0.01f, 0.01f }} },
ngraph::element::f32
}
},
// I8: concat multi channels
{
LayerTransformation::createParamsI8I8(),
true,
true,
{
{ 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-1.28f}, {1.27f} },
{ 256ul, ngraph::Shape({}), {-1.28f / 2.f}, {1.27f / 2.f}, {-1.28f / 2.f}, {1.27f / 2.f} }
},
{
{ 256ul, ngraph::Shape({}), {-1.28f}, {1.27f}, {-128.f}, {127.f} },
{ 256ul, ngraph::Shape({}), {-1.28f / 2.f}, {1.27f / 2.f}, {-128.f}, {127.f} },
{ {}, {}, {} },
ngraph::element::i8,
ngraph::element::i8,
{ ngraph::element::f32, {}, {{ 0.005f, 0.005f, 0.005f, 0.01f, 0.01f, 0.01f }} },
ngraph::element::f32
}
},
// U8: concat multi channels with subtract
{
LayerTransformation::createParamsU8I8(),
true,
true,
{
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} },
{ 256ul, ngraph::Shape({}), {1.275f}, {2.55f}, {1.275f}, {2.55f} }
},
{
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {255.f} },
{ 256ul, ngraph::Shape({}), {1.275f}, {2.55f}, {0.f}, {255.f} },
{ {}, {}, {} },
ngraph::element::u8,
ngraph::element::u8,
{
ngraph::element::f32,
{{ -255.f, -255.f, -255.f, 0.f, 0.f, 0.f }},
{{ 0.005f, 0.005f, 0.005f, 0.01f, 0.01f, 0.01f }}
},
ngraph::element::f32
}
},
// U8: concat multi channels, not update precisions
{
LayerTransformation::createParamsU8I8().setUpdatePrecisions(false),
true,
true,
{
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {2.55f} },
{ 256ul, ngraph::Shape({}), {1.275f}, {2.55f}, {1.275f}, {2.55f} }
},
{
{ 256ul, ngraph::Shape({}), {0.f}, {2.55f}, {0.f}, {255.f} },
{ 256ul, ngraph::Shape({}), {1.275f}, {2.55f}, {0.f}, {255.f} },
{ {}, {}, {} },
ngraph::element::f32,
ngraph::element::f32,
{
ngraph::element::f32,
{{ -255.f, -255.f, -255.f, 0.f, 0.f, 0.f }},
{{ 0.005f, 0.005f, 0.005f, 0.01f, 0.01f, 0.01f }}
},
ngraph::element::f32
}
},
};

const std::vector<ngraph::Shape> shapes = {
{ 1, 3, 9, 9 },
{ 4, 3, 9, 9 }
};

INSTANTIATE_TEST_CASE_P(
LPT,
ConcatWithIntermediateWithConstantTransformation,
::testing::Combine(
::testing::ValuesIn(precisions),
::testing::ValuesIn(shapes),
::testing::ValuesIn(testValues)),
ConcatWithIntermediateWithConstantTransformation::getTestCaseName);
} // namespace
32 changes: 13 additions & 19 deletions ...tests/functional/plugin/shared/src/low_precision_transformations/clamp_transformation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,25 +67,19 @@ void ClampTransformation::validateNGraph() {
std::shared_ptr<ngraph::Node> parent = output->get_input_node_shared_ptr(0);
ASSERT_FALSE(parent == nullptr);
const std::string typeName = parent->get_type_name();
if (params.updatePrecisions) {
if (!param.dequantizationAfter.empty()) {
EXPECT_EQ("ScaleShiftIE", typeName);
EXPECT_EQ(3, parent->get_input_size());

const auto expectedScale = param.dequantizationAfter.multiply.values;
const auto actualScale =
ngraph::as_type_ptr<ngraph::opset1::Constant>(parent->get_input_node_shared_ptr(1))->cast_vector<float>();
EXPECT_EQ(expectedScale.size(), actualScale.size());

const auto expectedShift = param.dequantizationAfter.subtract.values;
const auto actualShift =
ngraph::as_type_ptr<ngraph::opset1::Constant>(parent->get_input_node_shared_ptr(2))->cast_vector<float>();
EXPECT_EQ(expectedShift.size(), actualShift.size());
}
} else {
if (!param.dequantizationAfter.empty()) {
EXPECT_EQ("ConvolutionIE", typeName);
}
if (!param.dequantizationAfter.empty()) {
EXPECT_EQ("ScaleShiftIE", typeName);
EXPECT_EQ(3, parent->get_input_size());

const auto expectedScale = param.dequantizationAfter.multiply.values;
const auto actualScale =
ngraph::as_type_ptr<ngraph::opset1::Constant>(parent->get_input_node_shared_ptr(1))->cast_vector<float>();
EXPECT_EQ(expectedScale.size(), actualScale.size());

const auto expectedShift = param.dequantizationAfter.subtract.values;
const auto actualShift =
ngraph::as_type_ptr<ngraph::opset1::Constant>(parent->get_input_node_shared_ptr(2))->cast_vector<float>();
EXPECT_EQ(expectedShift.size(), actualShift.size());
}
}

Expand Down
19 changes: 19 additions & 0 deletions ...raph_functions/include/ngraph_functions/low_precision_transformations/concat_function.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ class ConcatFunction {
const FakeQuantizeOnData& fqOnData1,
const FakeQuantizeOnData& fqOnData2);

static std::shared_ptr<ngraph::Function> getOriginalWithIntermediateWithConstant(
const ngraph::element::Type precision,
const ngraph::Shape& inputShape,
const bool transparentIntermediate,
const FakeQuantizeOnData& fqOnData1,
const FakeQuantizeOnData& fqOnData2);

static std::shared_ptr<ngraph::Function> getReference(
const ngraph::element::Type precision,
const ngraph::Shape& inputShape,
Expand Down Expand Up @@ -106,6 +113,18 @@ class ConcatFunction {
const FakeQuantizeOnData& fqOnData2,
const DequantizationOperations& dequantizationOperations1,
const DequantizationOperations& dequantizationOperations2);

static std::shared_ptr<ngraph::Function> getReferenceWithIntermediateWithConstant(
const ngraph::element::Type precision,
const ngraph::Shape& inputShape,
const bool transparentIntermediate,
const FakeQuantizeOnData& fqOnData1,
const FakeQuantizeOnData& fqOnData2,
const ngraph::element::Type precisionBeforeOp,
const DequantizationOperations& dequantizationBefore,
const ngraph::element::Type precisionAfterOperation,
const DequantizationOperations& dequantizationAfter,
const ngraph::element::Type precisionAfterDequantization);
};

} // namespace subgraph
Expand Down
Loading

0 comments on commit 932ff7d

Please sign in to comment.