IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removal of opset12 from ngraph (#18282)

Browse Source
This commit is contained in:
Tomasz Dołbniak
2023-06-30 16:41:11 +02:00
committed by GitHub
parent 5d399faa64
commit deb6231329
8 changed files with 4 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/include/ngraph/op/group_normalization.hpp
View File

@@ -1,15 +0,0 @@
// Copyright (C) 2018-2023 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//
#pragma once
#include "openvino/op/group_normalization.hpp"
namespace ngraph {
namespace op {
namespace v12 {
using ov::op::v12::GroupNormalization;
} // namespace v12
} // namespace op
} // namespace ngraph

1
src/core/include/ngraph/ops.hpp
View File

@@ -82,7 +82,6 @@
#include "ngraph/op/grid_sample.hpp"
#include "ngraph/op/grn.hpp"
#include "ngraph/op/group_conv.hpp"
#include "ngraph/op/group_normalization.hpp"
#include "ngraph/op/gru_cell.hpp"
#include "ngraph/op/gru_sequence.hpp"
#include "ngraph/op/hard_sigmoid.hpp"

1
src/core/include/ngraph/opsets/opset.hpp
View File

@@ -67,7 +67,6 @@ const NGRAPH_API OpSet& get_opset8();
const NGRAPH_API OpSet& get_opset9();
const NGRAPH_API OpSet& get_opset10();
const NGRAPH_API OpSet& get_opset11();
const NGRAPH_API OpSet& get_opset12();
const NGRAPH_API std::map<std::string, std::function<const ngraph::OpSet&()>>& get_available_opsets();
} // namespace ngraph
NGRAPH_SUPPRESS_DEPRECATED_END

15
src/core/include/ngraph/opsets/opset12.hpp
View File

@@ -1,15 +0,0 @@
// Copyright (C) 2018-2023 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//
#pragma once
#include "ngraph/ops.hpp"
namespace ngraph {
namespace opset12 {
#define NGRAPH_OP(a, b) using b::a;
#include "ngraph/opsets/opset12_tbl.hpp"
#undef NGRAPH_OP
} // namespace opset12
} // namespace ngraph

12
src/core/include/ngraph/opsets/opset12_tbl.hpp
View File

@@ -1,12 +0,0 @@
// Copyright (C) 2018-2023 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//
#ifndef NGRAPH_OP
# warning "NGRAPH_OP not defined"
# define NGRAPH_OP(x, y)
#endif
#define _OPENVINO_OP_REG NGRAPH_OP
#include "openvino/opsets/opset12_tbl.hpp"
#undef _OPENVINO_OP_REG

10
src/core/src/opsets/opset.cpp
View File

@@ -7,7 +7,7 @@
#include "itt.hpp"
#include "ngraph/deprecated.hpp"
#include "ngraph/log.hpp"
#include "ngraph/ops.hpp"
#include "openvino/op/ops.hpp"
#include "openvino/opsets/opset.hpp"
#include "openvino/util/log.hpp"
@@ -64,8 +64,7 @@ const std::map<std::string, std::function<const ngraph::OpSet&()>>& ngraph::get_
_NGRAPH_REG_OPSET(opset8),
_NGRAPH_REG_OPSET(opset9),
_NGRAPH_REG_OPSET(opset10),
_NGRAPH_REG_OPSET(opset11),
_NGRAPH_REG_OPSET(opset12)};
_NGRAPH_REG_OPSET(opset11)};
#undef _NGRAPH_REG_OPSET
return opset_map;
}
@@ -275,8 +274,3 @@ const ngraph::OpSet& ngraph::get_opset11() {
static OpSet opset(ov::get_opset11());
return opset;
}
const ngraph::OpSet& ngraph::get_opset12() {
static OpSet opset(ov::get_opset12());
return opset;
}

2
src/core/tests/op_version_tbl.hpp
View File

@@ -67,7 +67,7 @@ _OPENVINO_OP_REG(Greater, ngraph::op::v1)
_OPENVINO_OP_REG(GreaterEqual, ngraph::op::v1)
_OPENVINO_OP_REG(GroupConvolution, ngraph::op::v1)
_OPENVINO_OP_REG(GroupConvolutionBackpropData, ngraph::op::v1)
_OPENVINO_OP_REG(GroupNormalization, ngraph::op::v12)
_OPENVINO_OP_REG(GroupNormalization, ov::op::v12)
_OPENVINO_OP_REG(HardSigmoid, ngraph::op::v0)
_OPENVINO_OP_REG(Interpolate, ngraph::op::v0)
_OPENVINO_OP_REG(Interpolate, ngraph::op::v4)

1
src/tests/util/visitor.hpp
View File

@@ -15,6 +15,7 @@
#include "ngraph/ops.hpp"
#include "ngraph/runtime/host_tensor.hpp"
#include "openvino/core/deprecated.hpp"
#include "openvino/op/ops.hpp"
OPENVINO_SUPPRESS_DEPRECATED_START
namespace ngraph {