-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
269 additions
and
4 deletions.
There are no files selected for viewing
48 changes: 48 additions & 0 deletions
48
src/plugins/intel_cpu/tests/functional/subgraph_tests/include/conv_with_zero_point_fuse.hpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| // Copyright (C) 2018-2023 Intel Corporation | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <tuple> | ||
| #include <vector> | ||
| #include <string> | ||
|
|
||
| #include "test_utils/cpu_test_utils.hpp" | ||
| #include "shared_test_classes/base/layer_test_utils.hpp" | ||
| #include "ngraph_functions/utils/ngraph_helpers.hpp" | ||
| #include "ngraph_functions/builders.hpp" | ||
|
|
||
| using namespace CPUTestUtils; | ||
|
|
||
| namespace SubgraphTestsDefinitions { | ||
|
|
||
| using commonConvParams = std::tuple< | ||
| InferenceEngine::SizeVector, // Kernel size | ||
| InferenceEngine::SizeVector, // Strides | ||
| std::vector<ptrdiff_t>, // Pad begin | ||
| std::vector<ptrdiff_t>, // Pad end | ||
| InferenceEngine::SizeVector, // Dilation | ||
| size_t, // Num out channels | ||
| ngraph::op::PadType, // Padding type | ||
| size_t // Number of groups | ||
| >; | ||
|
|
||
| using convConcatCPUParams = std::tuple< | ||
| nodeType, // Ngraph convolution type | ||
| commonConvParams, // Convolution params | ||
| InferenceEngine::SizeVector // Input shapes | ||
| >; | ||
|
|
||
| class ConvWithZeroPointFuseSubgraphTest : public testing::WithParamInterface<convConcatCPUParams>, | ||
| public CPUTestsBase, | ||
| virtual public LayerTestsUtils::LayerTestsCommon { | ||
| public: | ||
| static std::string getTestCaseName(testing::TestParamInfo<convConcatCPUParams> obj); | ||
|
|
||
| protected: | ||
| void SetUp() override; | ||
| std::string pluginTypeNode; | ||
| }; | ||
|
|
||
| } // namespace SubgraphTestsDefinitions |
173 changes: 173 additions & 0 deletions
173
src/plugins/intel_cpu/tests/functional/subgraph_tests/src/conv_with_zero_point_fuse.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| // Copyright (C) 2018-2023 Intel Corporation | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| #include "ngraph/opsets/opset1.hpp" | ||
| #include "test_utils/convolution_params.hpp" | ||
| #include "subgraph_tests/include/conv_with_zero_point_fuse.hpp" | ||
|
|
||
| using namespace InferenceEngine; | ||
| using namespace CPUTestUtils; | ||
|
|
||
| namespace SubgraphTestsDefinitions { | ||
|
|
||
| std::string ConvWithZeroPointFuseSubgraphTest::getTestCaseName(testing::TestParamInfo<convConcatCPUParams> obj) { | ||
| std::ostringstream result; | ||
| nodeType type; | ||
| commonConvParams convParams; | ||
| SizeVector inputShapes; | ||
| std::tie(type, convParams, inputShapes) = obj.param; | ||
|
|
||
| result << "Type=" << nodeType2str(type) << "_"; | ||
|
|
||
| SizeVector kernelSize, strides, dilation; | ||
| std::vector<ptrdiff_t> padBegin, padEnd; | ||
| size_t numOutChannels, numOfGroups; | ||
| ngraph::op::PadType paddingType; | ||
| std::tie(kernelSize, strides, padBegin, padEnd, dilation, numOutChannels, paddingType, numOfGroups) = convParams; | ||
|
|
||
| result << "IS=" << CommonTestUtils::vec2str(inputShapes) << "_"; | ||
| result << "K" << CommonTestUtils::vec2str(kernelSize) << "_"; | ||
| result << "S" << CommonTestUtils::vec2str(strides) << "_"; | ||
| result << "PB" << CommonTestUtils::vec2str(padBegin) << "_"; | ||
| result << "PE" << CommonTestUtils::vec2str(padEnd) << "_"; | ||
| result << "D=" << CommonTestUtils::vec2str(dilation) << "_"; | ||
| result << "O=" << numOutChannels << "_"; | ||
| result << "G=" << numOfGroups << "_"; | ||
| result << "AP=" << paddingType << "_"; | ||
|
|
||
| return result.str(); | ||
| } | ||
|
|
||
| void ConvWithZeroPointFuseSubgraphTest::SetUp() { | ||
| targetDevice = CommonTestUtils::DEVICE_CPU; | ||
| nodeType type; | ||
| commonConvParams convParams; | ||
| SizeVector inputShapes; | ||
|
|
||
| std::tie(type, convParams, inputShapes) = this->GetParam(); | ||
| pluginTypeNode = nodeType2PluginType(type); | ||
| SizeVector kernelSize, strides, dilation; | ||
| std::vector<ptrdiff_t> padBegin, padEnd; | ||
| size_t numOutChannels, numOfGroups; | ||
| ngraph::op::PadType paddingType; | ||
|
|
||
| std::tie(kernelSize, strides, padBegin, padEnd, dilation, numOutChannels, paddingType, numOfGroups) = convParams; | ||
| selectedType = ".*_I8"; | ||
|
|
||
| auto inputParams = ngraph::builder::makeParams(ngraph::element::f32, {inputShapes}); | ||
| const auto fq = ngraph::builder::makeFakeQuantize( | ||
| inputParams[0], | ||
| ov::element::f32, | ||
| 256, | ||
| {1, 1, 1, 1}, | ||
| {-12.8f}, | ||
| {12.7f}, | ||
| {-12.8f}, | ||
| {12.7f}); | ||
|
|
||
| auto paramOuts = ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes<ngraph::op::Parameter>(inputParams)); | ||
|
|
||
| std::vector<std::shared_ptr<ngraph::Node>> branches(2); | ||
| { | ||
| ngraph::Strides strides{1, 1}; | ||
| ngraph::Shape pads_begin{0, 0}, pads_end{0, 0}, kernel{1, 1}; | ||
| branches[0] = std::make_shared<ngraph::opset1::MaxPool>(fq, | ||
| strides, | ||
| pads_begin, | ||
| pads_end, | ||
| kernel); | ||
| } | ||
| { | ||
| const auto fq_conv_data = ngraph::builder::makeFakeQuantize( | ||
| fq, | ||
| ov::element::f32, | ||
| 256, | ||
| {1, 1, 1, 1}, | ||
| {-12.8}, | ||
| {12.7}, | ||
| {-12.8}, | ||
| {12.7}); | ||
|
|
||
| const InferenceEngine::SizeVector weights_const_shape = {numOutChannels, inputShapes[1], kernelSize[0], kernelSize[1]}; | ||
| const auto weights_const_values = std::vector<int>(ngraph::shape_size(weights_const_shape), 1); | ||
| const auto weights_const = ngraph::builder::makeConstant(ov::element::i8, weights_const_shape, weights_const_values); | ||
|
|
||
| const auto weights_convert = ngraph::builder::makeConversion( | ||
| weights_const, | ||
| ov::element::f32, | ||
| ngraph::helpers::ConversionTypes::CONVERT); | ||
|
|
||
| const auto weights_multiply = std::make_shared<ov::opset10::Multiply>( | ||
| weights_convert, | ||
| ngraph::builder::makeConstant(ov::element::f32, | ||
| {numOutChannels, 1, 1, 1}, | ||
| std::vector<float>(numOutChannels, 1.0))); | ||
|
|
||
| switch (type) { | ||
| case nodeType::convolution: { | ||
| branches[1] = ngraph::builder::makeConvolution(fq_conv_data, | ||
| weights_multiply, | ||
| ngraph::element::f32, | ||
| kernelSize, | ||
| strides, | ||
| padBegin, | ||
| padEnd, | ||
| dilation, | ||
| paddingType, | ||
| numOutChannels); | ||
| break; | ||
| } | ||
| case nodeType::groupConvolution: { | ||
| branches[1] = ngraph::builder::makeGroupConvolution( | ||
| fq_conv_data, | ||
| std::make_shared<ov::opset10::Reshape>( | ||
| weights_multiply, | ||
| ngraph::builder::makeConstant( | ||
| ov::element::i32, | ||
| {5}, | ||
| std::vector<size_t>{1, numOutChannels, inputShapes[1], kernelSize[0], kernelSize[1]}), | ||
| true), | ||
| ngraph::element::f32, | ||
| strides, | ||
| padBegin, | ||
| padEnd, | ||
| dilation, | ||
| paddingType); | ||
| break; | ||
| } | ||
| default: { | ||
| throw std::runtime_error("Subgraph concat test doesn't support this type of operation"); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| auto concat = ngraph::builder::makeConcat(ngraph::OutputVector{branches[0], branches[1]}, 1); | ||
|
|
||
| ngraph::ResultVector results{std::make_shared<ngraph::opset4::Result>(concat)}; | ||
| function = std::make_shared<ngraph::Function>(results, inputParams, "ConvWithZeroPointFuseSubgraphTest"); | ||
| } | ||
|
|
||
| TEST_P(ConvWithZeroPointFuseSubgraphTest, CompareWithRefs) { | ||
| Run(); | ||
|
|
||
| CheckPluginRelatedResults(executableNetwork, pluginTypeNode); | ||
| }; | ||
|
|
||
| const ngraph::op::PadType paddingType{ngraph::op::PadType::EXPLICIT}; | ||
| const size_t numOutChannels{256}; | ||
| const SizeVector inputShapes2D{1, 32, 136, 136}; | ||
| const SizeVector dilation2D{1, 1}; | ||
|
|
||
| commonConvParams convParams = commonConvParams{{1, 1}, {1, 1}, {0, 0}, {0, 0}, dilation2D, numOutChannels, paddingType, 1}; | ||
|
|
||
| const auto params2DConv = ::testing::Combine(::testing::ValuesIn({nodeType::convolution, nodeType::groupConvolution}), | ||
| ::testing::Values(convParams), | ||
| ::testing::Values(inputShapes2D)); | ||
|
|
||
| INSTANTIATE_TEST_SUITE_P(smoke_ConvWithZeroPointFuse, | ||
| ConvWithZeroPointFuseSubgraphTest, | ||
| params2DConv, | ||
| ConvWithZeroPointFuseSubgraphTest::getTestCaseName); | ||
|
|
||
| } // namespace SubgraphTestsDefinitions |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters