Removed not needed suppressions for deprecated API in ngraph (#4992)
* Removed not needed suppressions for deprecated API in ngraph * Fixed compilation with deprecated API in 3rd party with MSVC
This commit is contained in:
parent
eb4840e078
commit
8a3ff9aeae
@ -38,9 +38,10 @@ endmacro()
|
||||
macro(ie_deprecated_no_errors)
|
||||
if(WIN32)
|
||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
|
||||
set(ie_c_cxx_deprecated "/Qdiag-warning:1478,1786")
|
||||
set(ie_c_cxx_deprecated_no_errors "/Qdiag-warning:1478,1786")
|
||||
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
|
||||
set(ie_c_cxx_deprecated "/wd4996")
|
||||
# show 4996 only for /w4
|
||||
set(ie_c_cxx_deprecated_no_errors "/w44996")
|
||||
endif()
|
||||
else()
|
||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
|
||||
|
@ -15,8 +15,6 @@
|
||||
#include "ngraph/op/reshape.hpp"
|
||||
#include "ngraph/util.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
|
||||
namespace ngraph
|
||||
|
@ -5,8 +5,6 @@
|
||||
#include "ngraph/builder/split.hpp"
|
||||
#include "ngraph/opsets/opset1.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace ngraph;
|
||||
|
||||
OutputVector builder::opset1::split(const Output<Node>& value,
|
||||
|
@ -10,8 +10,6 @@
|
||||
#include "ngraph/op/util/fused_op.hpp"
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
namespace ngraph
|
||||
{
|
||||
namespace op
|
||||
@ -94,5 +92,3 @@ namespace ngraph
|
||||
const DiscreteTypeInfo& get_type_info() const override { return type_info; }
|
||||
};
|
||||
}
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_END
|
||||
|
@ -8,8 +8,6 @@
|
||||
#include "ngraph/op/util/attr_types.hpp"
|
||||
#include "ngraph/op/util/fused_op.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
namespace ngraph
|
||||
{
|
||||
namespace op
|
||||
@ -78,5 +76,3 @@ namespace ngraph
|
||||
using v0::FakeQuantize;
|
||||
}
|
||||
}
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_END
|
||||
|
@ -271,10 +271,9 @@ namespace ngraph
|
||||
const std::vector<int64_t>& sizes) const;
|
||||
};
|
||||
} // namespace v4
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using v0::Interpolate;
|
||||
using v0::InterpolateAttrs;
|
||||
NGRAPH_SUPPRESS_DEPRECATED_END
|
||||
} // namespace op
|
||||
|
||||
//---------------------------------------- v0 --------------------------------------------------
|
||||
|
@ -9,8 +9,6 @@
|
||||
#include "ngraph/node.hpp"
|
||||
#include "ngraph/op/util/fused_op.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
namespace ngraph
|
||||
{
|
||||
namespace op
|
||||
@ -67,5 +65,3 @@ namespace ngraph
|
||||
using v0::ShuffleChannels;
|
||||
}
|
||||
}
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_END
|
||||
|
@ -8,8 +8,6 @@
|
||||
#include "ngraph/op/util/fused_op.hpp"
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
namespace ngraph
|
||||
{
|
||||
namespace op
|
||||
@ -91,5 +89,3 @@ namespace ngraph
|
||||
const DiscreteTypeInfo& get_type_info() const override { return type_info; }
|
||||
};
|
||||
} // namespace ngraph
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_END
|
||||
|
@ -8,8 +8,6 @@
|
||||
#include "ngraph/op/quantize.hpp"
|
||||
#include "ngraph/shape_util.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
namespace ngraph
|
||||
{
|
||||
namespace runtime
|
||||
@ -108,5 +106,3 @@ namespace ngraph
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_END
|
||||
|
@ -11,8 +11,6 @@
|
||||
#include "ngraph/coordinate_transform.hpp"
|
||||
#include "ngraph/op/topk.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
namespace ngraph
|
||||
{
|
||||
namespace runtime
|
||||
@ -139,5 +137,3 @@ namespace ngraph
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_END
|
||||
|
@ -26,8 +26,6 @@
|
||||
#include "ngraph/rt_info.hpp"
|
||||
#include "ngraph/util.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -7,8 +7,6 @@
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
#include "ngraph/runtime/reference/add.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -14,8 +14,6 @@
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
#include "ngraph/runtime/reference/broadcast.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -20,8 +20,6 @@
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
NGRAPH_RTTI_DEFINITION(op::v0::DepthToSpace, "DepthToSpace", 0);
|
||||
|
||||
op::DepthToSpace::DepthToSpace(const Output<Node>& data,
|
||||
|
@ -7,8 +7,6 @@
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
#include "ngraph/runtime/reference/divide.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -7,8 +7,6 @@
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
#include "ngraph/runtime/reference/equal.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -15,8 +15,6 @@
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
NGRAPH_RTTI_DEFINITION(op::FakeQuantize, "FakeQuantize", 0);
|
||||
|
||||
op::FakeQuantize::FakeQuantize()
|
||||
|
@ -13,8 +13,6 @@
|
||||
|
||||
#include <ngraph/validation_util.hpp>
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -7,8 +7,6 @@
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
#include "ngraph/runtime/reference/greater.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -7,8 +7,6 @@
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
#include "ngraph/runtime/reference/greater_eq.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -17,8 +17,6 @@
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// v1::GroupConvolution
|
||||
//------------------------------------------------------------------------------
|
||||
|
@ -7,8 +7,6 @@
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
#include "ngraph/runtime/reference/less.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -7,8 +7,6 @@
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
#include "ngraph/runtime/reference/less_eq.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -13,8 +13,6 @@
|
||||
#include "ngraph/runtime/reference/maximum.hpp"
|
||||
#include "ngraph/type/element_type.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -9,8 +9,6 @@
|
||||
#include "ngraph/runtime/reference/min.hpp"
|
||||
#include "ngraph/shape_util.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -13,8 +13,6 @@
|
||||
#include "ngraph/runtime/reference/minimum.hpp"
|
||||
#include "ngraph/type/element_type.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -11,8 +11,6 @@
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
#include "ngraph/runtime/reference/not.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace ngraph;
|
||||
using namespace std;
|
||||
|
||||
|
@ -7,8 +7,6 @@
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
#include "ngraph/runtime/reference/not_equal.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -7,8 +7,6 @@
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
#include "ngraph/runtime/reference/or.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -12,8 +12,6 @@
|
||||
#include "ngraph/op/util/op_types.hpp"
|
||||
#include "ngraph/runtime/reference/pad.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -10,8 +10,6 @@
|
||||
#include "ngraph/runtime/host_tensor.hpp"
|
||||
#include "ngraph/runtime/reference/power.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -12,8 +12,6 @@
|
||||
#include "ngraph/op/select.hpp"
|
||||
#include "ngraph/runtime/reference/select.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -16,8 +16,6 @@
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
constexpr NodeTypeInfo op::ShuffleChannels::type_info;
|
||||
|
||||
op::ShuffleChannels::ShuffleChannels(const Output<Node>& data,
|
||||
|
@ -18,8 +18,6 @@
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
constexpr NodeTypeInfo op::SpaceToDepth::type_info;
|
||||
|
||||
op::SpaceToDepth::SpaceToDepth(const Output<Node>& data,
|
||||
|
@ -25,8 +25,6 @@
|
||||
#include "ngraph/op/xor.hpp"
|
||||
#include "ngraph/type.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
bool ngraph::op::is_unary_elementwise_arithmetic(const ngraph::Node* node)
|
||||
{
|
||||
return dynamic_cast<const ngraph::op::util::UnaryElementwiseArithmetic*>(node) != nullptr;
|
||||
|
@ -13,12 +13,8 @@
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
NGRAPH_RTTI_DEFINITION(ngraph::pass::FunctionPass, "ngraph::pass::FunctionPass", 0);
|
||||
|
||||
NGRAPH_RTTI_DEFINITION(ngraph::pass::NodePass, "ngraph::pass::NodePass", 0);
|
||||
|
||||
pass::PassBase::PassBase()
|
||||
: m_property{all_pass_property_off}
|
||||
, m_pass_config(std::make_shared<PassConfig>())
|
||||
@ -69,4 +65,8 @@ void pass::PassBase::set_callback(const param_callback& callback)
|
||||
|
||||
pass::FunctionPass::~FunctionPass() {}
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
NGRAPH_RTTI_DEFINITION(ngraph::pass::NodePass, "ngraph::pass::NodePass", 0);
|
||||
|
||||
pass::NodePass::~NodePass() {}
|
||||
|
@ -22,8 +22,6 @@
|
||||
#include "ngraph/util.hpp"
|
||||
#include "ngraph/validation_util.hpp"
|
||||
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
using namespace std;
|
||||
using namespace ngraph;
|
||||
|
||||
|
@ -39,8 +39,6 @@ namespace ngraph
|
||||
|
||||
if (ng_inputs.size() > 3 && !ngraph::op::is_null(ng_inputs.at(3)))
|
||||
{
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
|
||||
auto bias = ng_inputs.at(3);
|
||||
// gates_count * 2 since B is: [Wb, Rb]
|
||||
const int split_parts = 2 * 3;
|
||||
@ -66,7 +64,6 @@ namespace ngraph
|
||||
split_bias.at(2),
|
||||
split_bias.at(5)},
|
||||
1);
|
||||
NGRAPH_SUPPRESS_DEPRECATED_END
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -113,11 +113,9 @@ namespace ngraph
|
||||
{
|
||||
auto bias = ng_inputs.at(3);
|
||||
auto split_bias = builder::opset1::split(bias, 2, 1);
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
m_input_map[LSTMInput::LSTM_INPUT_B] =
|
||||
std::make_shared<default_opset::Add>(split_bias.at(0),
|
||||
split_bias.at(1));
|
||||
NGRAPH_SUPPRESS_DEPRECATED_END
|
||||
m_input_map[LSTMInput::LSTM_INPUT_B] =
|
||||
ngraph::op::util::convert_lstm_node_format(
|
||||
m_input_map[LSTMInput::LSTM_INPUT_B],
|
||||
|
@ -16,7 +16,6 @@ namespace ngraph
|
||||
{
|
||||
OutputVector matmul_integer(const Node& node)
|
||||
{
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
auto ng_inputs = node.get_ng_inputs();
|
||||
auto factory = builder::MatmulIntegerFactory(
|
||||
OutputVector(std::begin(ng_inputs), std::end(ng_inputs)));
|
||||
@ -32,7 +31,6 @@ namespace ngraph
|
||||
"to conform with ONNX standard.";
|
||||
}
|
||||
return factory.make_matmul_op();
|
||||
NGRAPH_SUPPRESS_DEPRECATED_END
|
||||
}
|
||||
} // namespace set_1
|
||||
|
||||
|
@ -16,7 +16,6 @@ namespace ngraph
|
||||
{
|
||||
OutputVector qlinear_matmul(const Node& node)
|
||||
{
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
auto ng_inputs = node.get_ng_inputs();
|
||||
auto factory = builder::QLinearMatmulFactory(
|
||||
(OutputVector(std::begin(ng_inputs), std::end(ng_inputs))));
|
||||
@ -32,7 +31,6 @@ namespace ngraph
|
||||
"to conform with ONNX standard.";
|
||||
}
|
||||
return factory.make_matmul_op();
|
||||
NGRAPH_SUPPRESS_DEPRECATED_END
|
||||
}
|
||||
} // namespace set_1
|
||||
|
||||
|
@ -52,10 +52,8 @@ namespace ngraph
|
||||
{
|
||||
auto bias = ng_inputs.at(3);
|
||||
auto split_bias = builder::opset1::split(bias, 2, 1);
|
||||
NGRAPH_SUPPRESS_DEPRECATED_START
|
||||
m_map[OpInput::B] =
|
||||
std::make_shared<ngraph::op::v1::Add>(split_bias.at(0), split_bias.at(1));
|
||||
NGRAPH_SUPPRESS_DEPRECATED_END
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user