forked from openvinotoolkit/openvino
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FIxed is_on_constant_path() using in all places (openvinotoolkit#19239)
* Fixed matmul weights check in snippets_mark_skipped * fix * ConvertMatMulToFC: is_on_constant_path fix * [TESTS] added SplitMatMulConcat subgraph test * MarkDequantizationSubgraph: is_on_constant_path fix
- Loading branch information
Showing
4 changed files
with
153 additions
and
6 deletions.
There are no files selected for viewing
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
147 changes: 147 additions & 0 deletions
147
src/plugins/intel_cpu/tests/functional/subgraph_tests/src/split_matmul_concat.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,147 @@ | ||
| // Copyright (C) 2023 Intel Corporation | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
|
|
||
| #include "test_utils/fusing_test_utils.hpp" | ||
| #include "ngraph_functions/builders.hpp" | ||
| #include "shared_test_classes/base/ov_subgraph.hpp" | ||
|
|
||
| using namespace ngraph; | ||
| using namespace InferenceEngine; | ||
| using namespace CPUTestUtils; | ||
| using namespace ov::test; | ||
|
|
||
| namespace SubgraphTestsDefinitions { | ||
|
|
||
| /* | ||
| --------------- | ||
| | Input | | ||
| --------------- | ||
| | | ||
| --------------- | ||
| |VariadicSplit| | ||
| --------------- | ||
| | | | ||
| --------- | | ||
| |MatMul | | | ||
| --------- | | ||
| | | | ||
| --------------- | ||
| | Concat | | ||
| --------------- | ||
| | | ||
| --------------- | ||
| | Output | | ||
| --------------- | ||
| */ | ||
|
|
||
| using SplitMatMulConcatParams = std::tuple< | ||
| std::vector<InputShape>, // input shapes | ||
| std::pair<bool, bool> // transposeA, transposeB | ||
| >; | ||
|
|
||
| class SplitMatMulConcatTest : public testing::WithParamInterface<SplitMatMulConcatParams>, | ||
| virtual public SubgraphBaseTest, public CPUTestsBase { | ||
| public: | ||
| static std::string getTestCaseName(testing::TestParamInfo<SplitMatMulConcatParams> obj) { | ||
| std::vector<InputShape> inputShapes; | ||
| std::pair<bool, bool> transpose; | ||
|
|
||
| std::tie(inputShapes, transpose) = obj.param; | ||
|
|
||
| std::ostringstream result; | ||
| for (const auto& shape : inputShapes) { | ||
| result << ov::test::utils::partialShape2str({shape.first}) << "_"; | ||
| } | ||
| result << "TS="; | ||
| for (const auto& shape : inputShapes) { | ||
| result << "("; | ||
| if (!shape.second.empty()) { | ||
| auto itr = shape.second.begin(); | ||
| do { | ||
| result << ov::test::utils::vec2str(*itr); | ||
| } while (++itr != shape.second.end() && result << "_"); | ||
| } | ||
| result << ")_"; | ||
| } | ||
| result << "transpose_a=" << transpose.first << "_"; | ||
| result << "transpose_b=" << transpose.second << "_"; | ||
|
|
||
| return result.str(); | ||
| } | ||
|
|
||
| protected: | ||
| template<typename T> | ||
| void transposeShape(T& shape) { | ||
| IE_ASSERT(shape.size() > 1); | ||
| std::swap(*(shape.end() - 1), *(shape.end() - 2)); | ||
| } | ||
|
|
||
| void SetUp() override { | ||
| targetDevice = ov::test::utils::DEVICE_CPU; | ||
|
|
||
| std::vector<InputShape> inputShapes; | ||
| std::pair<bool, bool> transpose; | ||
|
|
||
| std::tie(inputShapes, transpose) = this->GetParam(); | ||
|
|
||
| init_input_shapes(inputShapes); | ||
|
|
||
| bool transpA = transpose.first; | ||
| bool transpB = transpose.second; | ||
|
|
||
| if (transpA) { | ||
| transposeShape(inputDynamicShapes[0]); | ||
| for (auto& shapes : targetStaticShapes) { | ||
| transposeShape(shapes[0]); | ||
| } | ||
| } | ||
| if (transpB) { | ||
| transposeShape(inputDynamicShapes[1]); | ||
| for (auto& shapes : targetStaticShapes) { | ||
| transposeShape(shapes[1]); | ||
| } | ||
| } | ||
|
|
||
| const auto& inShapeA = inputDynamicShapes[0]; | ||
| const auto& inShapeB = inputDynamicShapes[1]; | ||
|
|
||
| auto params = builder::makeDynamicParams(ElementType::f32, {inShapeA}); | ||
| auto paramOuts = helpers::convert2OutputVector(helpers::castOps2Nodes<opset1::Parameter>(params)); | ||
| std::shared_ptr<Node> inputB = builder::makeConstant<float>(ElementType::f32, inShapeB.get_shape(), {}, true); | ||
|
|
||
| auto split = builder::makeVariadicSplit(paramOuts[0], {1, 1}, 0); | ||
|
|
||
| auto matMul = builder::makeMatMul(split->output(0), inputB, transpA, transpB); | ||
|
|
||
| auto concat = builder::makeConcat({matMul, split->output(1)}, 0); | ||
|
|
||
| function = CPUTestsBase::makeNgraphFunction(ElementType::f32, params, concat, "FullyConnected"); | ||
| } | ||
| }; | ||
|
|
||
| TEST_P(SplitMatMulConcatTest, CompareWithRefs) { | ||
| SKIP_IF_CURRENT_TEST_IS_DISABLED(); | ||
| run(); | ||
| } | ||
|
|
||
| namespace { | ||
|
|
||
| const std::vector<std::pair<bool, bool>> transposeParams = { | ||
| {false, true}, | ||
| }; | ||
|
|
||
| const std::vector<std::vector<InputShape>> inputShapes2D = { | ||
| static_shapes_to_test_representation({{2, 3}, {3, 3}}), | ||
| }; | ||
|
|
||
| const auto testParams2D_FP32_smoke = ::testing::Combine( | ||
| ::testing::ValuesIn(inputShapes2D), | ||
| ::testing::ValuesIn(transposeParams)); | ||
|
|
||
| INSTANTIATE_TEST_SUITE_P(smoke_FC_2D_FP32, SplitMatMulConcatTest, testParams2D_FP32_smoke, | ||
| SplitMatMulConcatTest::getTestCaseName); | ||
|
|
||
| } // namespace | ||
|
|
||
| } // namespace SubgraphTestsDefinitions |