Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IE Myriad] Fix tests for LogicalAnd #2622

Merged
1 commit merged into from
Oct 12, 2020
Merged

[IE Myriad] Fix tests for LogicalAnd #2622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions ...gine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/logical.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,9 @@ typedef std::map<std::string, std::string> Config;
class LogicalLayerTestVPU : public LogicalLayerTest {
protected:
void SetUp() override {
const auto& inputShapes = std::get<0>(GetParam());
const auto& ngInputsPrecision = std::get<4>(GetParam());
const auto& logicalOpType = std::get<1>(GetParam());
targetDevice = std::get<5>(GetParam());
const auto& additionalConfig = std::get<9>(GetParam());
configuration.insert(additionalConfig.begin(), additionalConfig.end());
outPrc = ngInputsPrecision;

auto ngInputsPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(ngInputsPrecision);
SetupParams();

auto ngInputsPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(inPrc);
auto inputs = ngraph::builder::makeParams(ngInputsPrc, {inputShapes.first, logicalOpType != ngraph::helpers::LogicalTypes::LOGICAL_NOT ?
inputShapes.second : ngraph::Shape()});
ngraph::NodeVector convertedInputs;
Expand Down Expand Up @@ -80,7 +74,7 @@ INSTANTIATE_TEST_CASE_P(smoke_EltwiseLogicalInt,
::testing::Values(ngraph::helpers::InputLayerType::PARAMETER),
::testing::Values(InferenceEngine::Precision::UNSPECIFIED),
::testing::Values(InferenceEngine::Precision::I32),
::testing::Values(InferenceEngine::Precision::UNSPECIFIED),
::testing::Values(InferenceEngine::Precision::I32),
::testing::Values(InferenceEngine::Layout::ANY),
::testing::Values(InferenceEngine::Layout::ANY),
::testing::Values(CommonTestUtils::DEVICE_MYRIAD),
Expand All @@ -95,7 +89,7 @@ INSTANTIATE_TEST_CASE_P(smoke_EltwiseLogicalNotInt,
::testing::Values(ngraph::helpers::InputLayerType::CONSTANT),
::testing::Values(InferenceEngine::Precision::UNSPECIFIED),
::testing::Values(InferenceEngine::Precision::I32),
::testing::Values(InferenceEngine::Precision::UNSPECIFIED),
::testing::Values(InferenceEngine::Precision::I32),
::testing::Values(InferenceEngine::Layout::ANY),
::testing::Values(InferenceEngine::Layout::ANY),
::testing::Values(CommonTestUtils::DEVICE_MYRIAD),
Expand Down
8 changes: 8 additions & 0 deletions inference-engine/tests/functional/plugin/shared/include/single_layer_tests/logical.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,18 @@ class LogicalLayerTest : public testing::WithParamInterface<LogicalTestParams>,
virtual public LayerTestsUtils::LayerTestsCommon {
protected:
InferenceEngine::Blob::Ptr GenerateInput(const InferenceEngine::InputInfo &info) const override;
void SetupParams();
void SetUp() override;

public:
static std::string getTestCaseName(testing::TestParamInfo<LogicalTestParams> obj);
static std::vector<LogicalParams::InputShapesTuple> combineShapes(const std::map<std::vector<size_t>, std::vector<std::vector<size_t >>>& inputShapes);

protected:
LogicalParams::InputShapesTuple inputShapes;
ngraph::helpers::LogicalTypes logicalOpType;
ngraph::helpers::InputLayerType secondInputType;
InferenceEngine::Precision netPrecision;
std::map<std::string, std::string> additional_config;
};
} // namespace LayerTestsDefinitions
18 changes: 8 additions & 10 deletions inference-engine/tests/functional/plugin/shared/src/single_layer_tests/logical.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,18 @@ InferenceEngine::Blob::Ptr LogicalLayerTest::GenerateInput(const InferenceEngine
return FuncTestUtils::createAndFillBlob(info.getTensorDesc(), 2, 0);
}

void LogicalLayerTest::SetUp() {
InputShapesTuple inputShapes;
InferenceEngine::Precision inputsPrecision;
ngraph::helpers::LogicalTypes logicalOpType;
ngraph::helpers::InputLayerType secondInputType;
InferenceEngine::Precision netPrecision;
std::string targetName;
std::map<std::string, std::string> additional_config;
std::tie(inputShapes, logicalOpType, secondInputType, netPrecision, inPrc, outPrc, inLayout, outLayout, targetDevice, additional_config) =
void LogicalLayerTest::SetupParams() {
std::tie(inputShapes, logicalOpType, secondInputType, netPrecision,
inPrc, outPrc, inLayout, outLayout, targetDevice, additional_config) =
this->GetParam();

auto ngInputsPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(inPrc);
configuration.insert(additional_config.begin(), additional_config.end());
}

void LogicalLayerTest::SetUp() {
SetupParams();

auto ngInputsPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(inPrc);
auto inputs = ngraph::builder::makeParams(ngInputsPrc, {inputShapes.first});

std::shared_ptr<ngraph::Node> logicalNode;
Expand Down