Skip to content

Commit bb4be6d

Browse files
ilyachurilyachur
committed
Fixed code style
1 parent 0188335 commit bb4be6d

31 files changed

+485
-38
lines changed

‎ngraph/src/ngraph/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,8 +589,6 @@ set (SRC
589589
pass/nop_elimination.hpp
590590
pass/pass.cpp
591591
pass/pass.hpp
592-
pass/opset0_downgrade.cpp
593-
pass/opset0_downgrade.hpp
594592
pass/opset1_downgrade.cpp
595593
pass/opset1_downgrade.hpp
596594
pass/opset1_upgrade.cpp

‎ngraph/src/ngraph/builder/reshape.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ namespace ngraph
7878
///
7979
/// \return The squeezed node.
8080
///
81+
NGRAPH_API
8182
std::shared_ptr<Node> squeeze(const Output<Node>& value,
8283
std::vector<std::size_t> axes = {0});
8384

‎ngraph/src/ngraph/opsets/opset0_tbl.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ NGRAPH_OP(ArgMin, ngraph::op)
6262
NGRAPH_OP(Asin, ngraph::op)
6363
NGRAPH_OP(Atan, ngraph::op)
6464
NGRAPH_OP(Atan2, ngraph::op)
65-
NGRAPH_OP(AvgPool, ngraph::op)
6665
NGRAPH_OP(BatchMatMul, ngraph::op)
6766
NGRAPH_OP(BatchMatMulTranspose, ngraph::op)
6867
NGRAPH_OP(BatchNormInference, ngraph::op)

‎ngraph/test/dyn_elimination.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "ngraph/pass/constant_folding.hpp"
2121
#include "ngraph/pass/dyn_elimination.hpp"
2222
#include "ngraph/pass/manager.hpp"
23-
#include "ngraph/pass/opset0_downgrade.hpp"
23+
#include "opset0_downgrade.hpp"
2424
#include "util/all_close_f.hpp"
2525
#include "util/test_tools.hpp"
2626

‎ngraph/test/onnx/onnx_import_provenance.in.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include "ngraph/frontend/onnx_import/onnx.hpp"
2121
#include "ngraph/opsets/opset0.hpp"
2222
#include "ngraph/pass/manager.hpp"
23-
#include "ngraph/pass/opset0_downgrade.hpp"
2423
#include "ngraph/pass/opset1_downgrade.hpp"
2524
#include "ngraph/provenance.hpp"
25+
#include "opset0_downgrade.hpp"
2626
#include "util/provenance_enabler.hpp"
2727
#include "util/test_control.hpp"
2828
#include "util/type_prop.hpp"

‎ngraph/test/opset_pass/binary_elementwise_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "ngraph/ngraph.hpp"
55
#include "ngraph/pass/manager.hpp"
6-
#include "ngraph/pass/opset0_downgrade.hpp"
76
#include "ngraph/pass/opset1_upgrade.hpp"
7+
#include "opset0_downgrade.hpp"
88
#include "util/test_control.hpp"
99
#include "util/type_prop.hpp"
1010

‎ngraph/test/opset_pass/broadcast_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include "ngraph/ngraph.hpp"
55
#include "ngraph/op/util/attr_types.hpp"
66
#include "ngraph/pass/manager.hpp"
7-
#include "ngraph/pass/opset0_downgrade.hpp"
87
#include "ngraph/pass/opset1_upgrade.hpp"
8+
#include "opset0_downgrade.hpp"
99
#include "util/type_prop.hpp"
1010

1111
using namespace std;

‎ngraph/test/opset_pass/convolution_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "ngraph/ngraph.hpp"
55
#include "ngraph/pass/manager.hpp"
6-
#include "ngraph/pass/opset0_downgrade.hpp"
76
#include "ngraph/pass/opset1_upgrade.hpp"
7+
#include "opset0_downgrade.hpp"
88
#include "util/test_control.hpp"
99
#include "util/type_prop.hpp"
1010

‎ngraph/test/opset_pass/logical_and_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "ngraph/ngraph.hpp"
2121
#include "ngraph/pass/manager.hpp"
22-
#include "ngraph/pass/opset0_downgrade.hpp"
2322
#include "ngraph/pass/opset1_upgrade.hpp"
23+
#include "opset0_downgrade.hpp"
2424
#include "util/type_prop.hpp"
2525

2626
using namespace std;

‎ngraph/test/opset_pass/logical_not_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "ngraph/ngraph.hpp"
2121
#include "ngraph/pass/manager.hpp"
22-
#include "ngraph/pass/opset0_downgrade.hpp"
2322
#include "ngraph/pass/opset1_upgrade.hpp"
23+
#include "opset0_downgrade.hpp"
2424
#include "util/type_prop.hpp"
2525

2626
using namespace std;

‎ngraph/test/opset_pass/logical_or_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "ngraph/ngraph.hpp"
2121
#include "ngraph/pass/manager.hpp"
22-
#include "ngraph/pass/opset0_downgrade.hpp"
2322
#include "ngraph/pass/opset1_upgrade.hpp"
23+
#include "opset0_downgrade.hpp"
2424
#include "util/type_prop.hpp"
2525

2626
using namespace std;

‎ngraph/test/opset_pass/logical_xor_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "ngraph/ngraph.hpp"
2121
#include "ngraph/pass/manager.hpp"
22-
#include "ngraph/pass/opset0_downgrade.hpp"
2322
#include "ngraph/pass/opset1_upgrade.hpp"
23+
#include "opset0_downgrade.hpp"
2424
#include "util/type_prop.hpp"
2525

2626
using namespace std;

‎ngraph/test/opset_pass/one_hot_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "ngraph/ngraph.hpp"
55
#include "ngraph/pass/manager.hpp"
6-
#include "ngraph/pass/opset0_downgrade.hpp"
76
#include "ngraph/pass/opset1_upgrade.hpp"
7+
#include "opset0_downgrade.hpp"
88
#include "util/type_prop.hpp"
99

1010
using namespace std;

‎ngraph/test/opset_pass/pad_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "ngraph/ngraph.hpp"
55
#include "ngraph/pass/manager.hpp"
6-
#include "ngraph/pass/opset0_downgrade.hpp"
76
#include "ngraph/pass/opset1_upgrade.hpp"
7+
#include "opset0_downgrade.hpp"
88
#include "util/type_prop.hpp"
99

1010
using namespace std;

‎ngraph/test/opset_pass/poolings_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "ngraph/ngraph.hpp"
55
#include "ngraph/pass/manager.hpp"
6-
#include "ngraph/pass/opset0_downgrade.hpp"
76
#include "ngraph/pass/opset1_upgrade.hpp"
7+
#include "opset0_downgrade.hpp"
88
#include "util/test_control.hpp"
99
#include "util/type_prop.hpp"
1010

‎ngraph/test/opset_pass/reduction_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "ngraph/ngraph.hpp"
2020
#include "ngraph/pass/manager.hpp"
21-
#include "ngraph/pass/opset0_downgrade.hpp"
2221
#include "ngraph/pass/opset1_upgrade.hpp"
22+
#include "opset0_downgrade.hpp"
2323
#include "util/type_prop.hpp"
2424

2525
using namespace std;

‎ngraph/test/opset_pass/reverse_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "ngraph/ngraph.hpp"
2121
#include "ngraph/pass/manager.hpp"
22-
#include "ngraph/pass/opset0_downgrade.hpp"
2322
#include "ngraph/pass/opset1_upgrade.hpp"
23+
#include "opset0_downgrade.hpp"
2424
#include "util/type_prop.hpp"
2525

2626
using namespace std;

‎ngraph/test/opset_pass/select_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include "ngraph/ngraph.hpp"
55
#include "ngraph/pass/manager.hpp"
6-
#include "ngraph/pass/opset0_downgrade.hpp"
76
#include "ngraph/pass/opset1_upgrade.hpp"
7+
#include "opset0_downgrade.hpp"
88
#include "util/test_control.hpp"
99
#include "util/type_prop.hpp"
1010

‎ngraph/test/opset_pass/slice_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "ngraph/ngraph.hpp"
2121
#include "ngraph/pass/manager.hpp"
22-
#include "ngraph/pass/opset0_downgrade.hpp"
2322
#include "ngraph/pass/opset1_upgrade.hpp"
23+
#include "opset0_downgrade.hpp"
2424
#include "util/type_prop.hpp"
2525

2626
using namespace std;

‎ngraph/test/opset_pass/topk_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "ngraph/ngraph.hpp"
2121
#include "ngraph/pass/manager.hpp"
22-
#include "ngraph/pass/opset0_downgrade.hpp"
2322
#include "ngraph/pass/opset1_upgrade.hpp"
23+
#include "opset0_downgrade.hpp"
2424
#include "util/type_prop.hpp"
2525

2626
using namespace std;

‎ngraph/test/opset_pass/transpose_opset_pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include "ngraph/ngraph.hpp"
2121
#include "ngraph/pass/manager.hpp"
22-
#include "ngraph/pass/opset0_downgrade.hpp"
22+
#include "opset0_downgrade.hpp"
2323
#include "util/type_prop.hpp"
2424

2525
using namespace std;

‎ngraph/test/provenance.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
#include "ngraph/ngraph.hpp"
2828
#include "ngraph/pass/fused_op_decomposition.hpp"
2929
#include "ngraph/pass/manager.hpp"
30-
#include "ngraph/pass/opset0_downgrade.hpp"
3130
#include "ngraph/pass/opset1_upgrade.hpp"
3231
#include "ngraph/provenance.hpp"
32+
#include "opset0_downgrade.hpp"
3333
#include "util/provenance_enabler.hpp"
3434

3535
using namespace std;

‎ngraph/test/runtime/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@ set (SRC
2020
backend_manager.hpp
2121
cache.cpp
2222
cache.hpp
23+
opset0_downgrade.cpp
24+
opset0_downgrade.hpp
2325
executable.cpp
2426
executable.hpp
2527
performance_counter.hpp
2628
dynamic/dynamic_backend.cpp
2729
dynamic/dynamic_backend.hpp
30+
op/avg_pool.cpp
31+
op/avg_pool.hpp
2832
)
2933

3034
add_library(ngraph_backend SHARED ${SRC})

‎ngraph/test/runtime/dynamic/dynamic_backend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
//*****************************************************************************
1616

1717
#include "dynamic_backend.hpp"
18+
#include "../opset0_downgrade.hpp"
1819
#include "ngraph/graph_util.hpp"
1920
#include "ngraph/op/avg_pool.hpp"
2021
#include "ngraph/op/broadcast.hpp"
@@ -29,7 +30,6 @@
2930
#include "ngraph/pass/constant_folding.hpp"
3031
#include "ngraph/pass/dyn_elimination.hpp"
3132
#include "ngraph/pass/manager.hpp"
32-
#include "ngraph/pass/opset0_downgrade.hpp"
3333
#include "ngraph/pass/opset1_downgrade.hpp"
3434
#include "ngraph/pass/shape_relevance.hpp"
3535
#include "ngraph/specialize_function.hpp"

‎ngraph/test/runtime/interpreter/int_executable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
#include "ngraph/pass/like_replacement.hpp"
2828
#include "ngraph/pass/liveness.hpp"
2929
#include "ngraph/pass/manager.hpp"
30-
#include "ngraph/pass/opset0_downgrade.hpp"
3130
#include "ngraph/pass/opset1_downgrade.hpp"
3231
#include "ngraph/serializer.hpp"
3332
#include "ngraph/util.hpp"
33+
#include "opset0_downgrade.hpp"
3434

3535
using namespace std;
3636
using namespace ngraph;

‎ngraph/test/runtime/interpreter/int_executable.hpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
#include "ngraph/runtime/tensor.hpp"
105105
#include "ngraph/state/bernoulli_rng_state.hpp"
106106
#include "ngraph/state/uniform_rng_state.hpp"
107+
#include "op/avg_pool.hpp"
107108

108109
namespace ngraph
109110
{
@@ -330,19 +331,18 @@ class INTERPRETER_BACKEND_API ngraph::runtime::interpreter::INTExecutable : publ
330331
}
331332
case OP_TYPEID::AvgPool:
332333
{
333-
throw unsupported_op("Unsupported op '" + node.description() + "'");
334-
// const op::AvgPool* avg_pool = static_cast<const op::AvgPool*>(&node);
335-
//
336-
// reference::avg_pool<T>(args[0]->get_data_ptr<const T>(),
337-
// out[0]->get_data_ptr<T>(),
338-
// node.get_input_shape(0),
339-
// node.get_output_shape(0),
340-
// avg_pool->get_window_shape(),
341-
// avg_pool->get_window_movement_strides(),
342-
// avg_pool->get_padding_below(),
343-
// avg_pool->get_padding_above(),
344-
// avg_pool->get_include_padding_in_avg_computation());
345-
// break;
334+
const op::v0::AvgPool* avg_pool = static_cast<const op::v0::AvgPool*>(&node);
335+
336+
reference::avg_pool<T>(args[0]->get_data_ptr<const T>(),
337+
out[0]->get_data_ptr<T>(),
338+
node.get_input_shape(0),
339+
node.get_output_shape(0),
340+
avg_pool->get_window_shape(),
341+
avg_pool->get_window_movement_strides(),
342+
avg_pool->get_padding_below(),
343+
avg_pool->get_padding_above(),
344+
avg_pool->get_include_padding_in_avg_computation());
345+
break;
346346
}
347347
case OP_TYPEID::GenerateMask:
348348
{

‎ngraph/test/runtime/interpreter/opset_int_tbl.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#define ID_SUFFIX(NAME) NAME
1818
#include "ngraph/opsets/opset0_tbl.hpp"
19+
NGRAPH_OP(AvgPool, op::v0)
1920
#undef ID_SUFFIX
2021

2122
#define ID_SUFFIX(NAME) NAME##_v1

0 commit comments

Comments
 (0)