[XXX-67099] Remove legacy from primitives priotity (#8005)
This commit is contained in:
parent
a0a70ab53e
commit
1fa0d525d9
@ -17,12 +17,13 @@
|
|||||||
#include <ngraph/variant.hpp>
|
#include <ngraph/variant.hpp>
|
||||||
#include <transformations/utils/utils.hpp>
|
#include <transformations/utils/utils.hpp>
|
||||||
#include <cpp/ie_cnn_network.h>
|
#include <cpp/ie_cnn_network.h>
|
||||||
#include <legacy/cnn_network_impl.hpp> // deprecated API
|
#include <ie_ngraph_utils.hpp>
|
||||||
#include <legacy/ie_layers.h> // deprecated API
|
#include "transformations/rt_info/primitives_priority_attribute.hpp"
|
||||||
|
|
||||||
#include "common_test_utils/ngraph_test_utils.hpp"
|
#include "common_test_utils/ngraph_test_utils.hpp"
|
||||||
|
|
||||||
using namespace testing;
|
using namespace testing;
|
||||||
|
using namespace InferenceEngine;
|
||||||
|
using namespace InferenceEngine::details;
|
||||||
|
|
||||||
TEST(TransformationTests, ConvBiasFusion) {
|
TEST(TransformationTests, ConvBiasFusion) {
|
||||||
std::shared_ptr<ngraph::Function> f(nullptr);
|
std::shared_ptr<ngraph::Function> f(nullptr);
|
||||||
@ -39,6 +40,7 @@ TEST(TransformationTests, ConvBiasFusion) {
|
|||||||
f = std::make_shared<ngraph::Function>(ngraph::NodeVector{add}, ngraph::ParameterVector{input1});
|
f = std::make_shared<ngraph::Function>(ngraph::NodeVector{add}, ngraph::ParameterVector{input1});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unordered_map<std::string, std::string> pp;
|
||||||
|
|
||||||
InferenceEngine::CNNNetwork network(f);
|
InferenceEngine::CNNNetwork network(f);
|
||||||
|
|
||||||
@ -48,16 +50,18 @@ TEST(TransformationTests, ConvBiasFusion) {
|
|||||||
for (auto & op : nGraph->get_ops()) {
|
for (auto & op : nGraph->get_ops()) {
|
||||||
if (auto conv = std::dynamic_pointer_cast<ngraph::opset1::Convolution>(op)) {
|
if (auto conv = std::dynamic_pointer_cast<ngraph::opset1::Convolution>(op)) {
|
||||||
auto & rtInfo = conv->get_rt_info();
|
auto & rtInfo = conv->get_rt_info();
|
||||||
rtInfo["PrimitivesPriority"] = std::make_shared<ngraph::VariantWrapper<std::string> > ("test");
|
rtInfo["PrimitivesPriority"] = std::make_shared<ngraph::VariantWrapper<std::string>>("test");
|
||||||
|
pp[op->get_friendly_name()] = "test";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
auto clonedNetwork = std::make_shared<InferenceEngine::details::CNNNetworkImpl>(network);
|
auto clonedNetwork = InferenceEngine::details::cloneNetwork(network);
|
||||||
|
auto funcs = clonedNetwork.getFunction();
|
||||||
|
|
||||||
IE_SUPPRESS_DEPRECATED_START
|
for (auto & op : funcs->get_ops()) {
|
||||||
InferenceEngine::CNNLayerPtr conv;
|
if (auto conv = std::dynamic_pointer_cast<ngraph::opset1::Convolution>(op)) {
|
||||||
clonedNetwork->getLayerByName("add", conv, nullptr);
|
ASSERT_TRUE(pp.find(op->get_friendly_name()) != pp.end());
|
||||||
ASSERT_TRUE(conv->params.count("PrimitivesPriority"));
|
ASSERT_EQ(pp[op->get_friendly_name()], "test");
|
||||||
ASSERT_EQ(conv->params.at("PrimitivesPriority"), "test");
|
}
|
||||||
IE_SUPPRESS_DEPRECATED_END
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user