From 36318ca2ccdf6dd348b631463fa66ba4915b5d9f Mon Sep 17 00:00:00 2001 From: Anastasia Kuporosova Date: Thu, 9 Sep 2021 13:41:11 +0300 Subject: [PATCH] [Python API] move ngraph python api to the new location (#7364) * [Python API] Move ngraph python api to the new destination * fix building tests * fix code-style checks * building in azure * fix building wheels * apply fixes --- .ci/azure/linux_ngraph_onnx.yml | 2 +- .ci/openvino-onnx/Dockerfile | 2 +- .ci/openvino-onnx/Jenkinsfile | 2 +- .github/dependabot.yml | 2 +- .gitmodules | 4 +-- CMakeLists.txt | 1 + ngraph/CMakeLists.txt | 4 --- ngraph/python/pybind11 | 1 - runtime/CMakeLists.txt | 8 +++++ runtime/bindings/python/.clang-format | 28 ++++++++++++++++++ .../bindings}/python/.gitignore | 0 .../bindings}/python/BUILDING.md | 0 runtime/bindings/python/CMakeLists.txt | 21 +++++++++++++ .../bindings}/python/requirements.txt | 0 .../bindings}/python/requirements_test.txt | 0 {ngraph => runtime/bindings}/python/setup.py | 2 +- .../python/src/compatibility/CMakeLists.txt | 6 ++++ .../src/compatibility}/ngraph/__init__.py | 0 .../src/compatibility}/ngraph/exceptions.py | 0 .../ngraph/frontend/__init__.py | 0 .../src/compatibility}/ngraph/helpers.py | 0 .../compatibility}/ngraph/impl/__init__.py | 0 .../compatibility}/ngraph/impl/op/__init__.py | 0 .../ngraph/impl/op/util/__init__.py | 0 .../ngraph/impl/passes/__init__.py | 0 .../compatibility}/ngraph/opset1/__init__.py | 0 .../src/compatibility}/ngraph/opset1/ops.py | 0 .../compatibility}/ngraph/opset2/__init__.py | 0 .../src/compatibility}/ngraph/opset2/ops.py | 0 .../compatibility}/ngraph/opset3/__init__.py | 0 .../src/compatibility}/ngraph/opset3/ops.py | 0 .../compatibility}/ngraph/opset4/__init__.py | 0 .../src/compatibility}/ngraph/opset4/ops.py | 0 .../compatibility}/ngraph/opset5/__init__.py | 0 .../src/compatibility}/ngraph/opset5/ops.py | 0 .../compatibility}/ngraph/opset6/__init__.py | 0 .../src/compatibility}/ngraph/opset6/ops.py | 0 .../compatibility}/ngraph/opset7/__init__.py | 0 .../src/compatibility}/ngraph/opset7/ops.py | 0 .../compatibility}/ngraph/opset8/__init__.py | 0 .../src/compatibility}/ngraph/opset8/ops.py | 0 .../src/compatibility}/ngraph/opset_utils.py | 0 .../compatibility}/ngraph/utils/__init__.py | 0 .../ngraph/utils/broadcasting.py | 0 .../compatibility}/ngraph/utils/decorators.py | 0 .../ngraph/utils/input_validation.py | 0 .../ngraph/utils/node_factory.py | 0 .../compatibility}/ngraph/utils/reduction.py | 0 .../ngraph/utils/tensor_iterator_types.py | 0 .../src/compatibility}/ngraph/utils/types.py | 0 .../compatibility/pyngraph}/CMakeLists.txt | 25 ++++------------ .../src/compatibility}/pyngraph/axis_set.cpp | 0 .../src/compatibility}/pyngraph/axis_set.hpp | 0 .../compatibility}/pyngraph/axis_vector.cpp | 0 .../compatibility}/pyngraph/axis_vector.hpp | 0 .../compatibility}/pyngraph/coordinate.cpp | 0 .../compatibility}/pyngraph/coordinate.hpp | 0 .../pyngraph/coordinate_diff.cpp | 0 .../pyngraph/coordinate_diff.hpp | 0 .../pyngraph/dict_attribute_visitor.cpp | 0 .../pyngraph/dict_attribute_visitor.hpp | 0 .../src/compatibility}/pyngraph/dimension.cpp | 0 .../src/compatibility}/pyngraph/dimension.hpp | 0 .../pyngraph/frontend/frontend.cpp | 0 .../pyngraph/frontend/frontend.hpp | 0 .../pyngraph/frontend/frontend_manager.cpp | 0 .../pyngraph/frontend/frontend_manager.hpp | 0 .../pyngraph/frontend/inputmodel.cpp | 0 .../pyngraph/frontend/inputmodel.hpp | 0 .../pyngraph/frontend/place.cpp | 0 .../pyngraph/frontend/place.hpp | 0 .../src/compatibility}/pyngraph/function.cpp | 0 .../src/compatibility}/pyngraph/function.hpp | 0 .../src/compatibility}/pyngraph/node.cpp | 0 .../src/compatibility}/pyngraph/node.hpp | 0 .../compatibility}/pyngraph/node_factory.cpp | 0 .../compatibility}/pyngraph/node_factory.hpp | 0 .../compatibility}/pyngraph/node_input.cpp | 0 .../compatibility}/pyngraph/node_input.hpp | 0 .../compatibility}/pyngraph/node_output.cpp | 0 .../compatibility}/pyngraph/node_output.hpp | 0 .../compatibility}/pyngraph/ops/constant.cpp | 0 .../compatibility}/pyngraph/ops/constant.hpp | 0 .../compatibility}/pyngraph/ops/parameter.cpp | 0 .../compatibility}/pyngraph/ops/parameter.hpp | 0 .../compatibility}/pyngraph/ops/result.cpp | 0 .../compatibility}/pyngraph/ops/result.hpp | 0 .../ops/util/arithmetic_reduction.cpp | 0 .../ops/util/arithmetic_reduction.hpp | 0 .../util/binary_elementwise_arithmetic.cpp | 0 .../util/binary_elementwise_arithmetic.hpp | 0 .../util/binary_elementwise_comparison.cpp | 0 .../util/binary_elementwise_comparison.hpp | 0 .../ops/util/binary_elementwise_logical.cpp | 0 .../ops/util/binary_elementwise_logical.hpp | 0 .../pyngraph/ops/util/index_reduction.cpp | 0 .../pyngraph/ops/util/index_reduction.hpp | 0 .../pyngraph/ops/util/op_annotations.cpp | 0 .../pyngraph/ops/util/op_annotations.hpp | 0 .../ops/util/regmodule_pyngraph_op_util.cpp | 0 .../ops/util/regmodule_pyngraph_op_util.hpp | 0 .../ops/util/unary_elementwise_arithmetic.cpp | 0 .../ops/util/unary_elementwise_arithmetic.hpp | 0 .../compatibility}/pyngraph/partial_shape.cpp | 0 .../compatibility}/pyngraph/partial_shape.hpp | 0 .../pyngraph/passes/manager.cpp | 0 .../pyngraph/passes/manager.hpp | 0 .../passes/regmodule_pyngraph_passes.cpp | 0 .../passes/regmodule_pyngraph_passes.hpp | 0 .../src/compatibility}/pyngraph/pyngraph.cpp | 0 .../src/compatibility}/pyngraph/rt_map.cpp | 0 .../src/compatibility}/pyngraph/rt_map.hpp | 0 .../src/compatibility}/pyngraph/shape.cpp | 0 .../src/compatibility}/pyngraph/shape.hpp | 0 .../src/compatibility}/pyngraph/strides.cpp | 0 .../src/compatibility}/pyngraph/strides.hpp | 0 .../pyngraph/types/element_type.cpp | 0 .../pyngraph/types/element_type.hpp | 0 .../types/regmodule_pyngraph_types.cpp | 0 .../types/regmodule_pyngraph_types.hpp | 0 .../src/compatibility}/pyngraph/util.cpp | 0 .../src/compatibility}/pyngraph/util.hpp | 0 .../src/compatibility}/pyngraph/util.py | 0 .../src/compatibility}/pyngraph/variant.cpp | 0 .../src/compatibility}/pyngraph/variant.hpp | 0 .../bindings}/python/tests/__init__.py | 0 .../bindings}/python/tests/conftest.py | 0 .../mock_py_ngraph_frontend/CMakeLists.txt | 0 .../mock_py_frontend.cpp | 0 .../mock_py_frontend.hpp | 0 .../mock/pyngraph_fe_mock_api/CMakeLists.txt | 0 .../pyngraph_mock_frontend_api.cpp | 0 .../bindings}/python/tests/runtime.py | 0 .../tests/test_frontend/test_frontend_onnx.py | 0 .../test_frontend_onnx_editor.py | 0 .../test_frontend/test_frontendmanager.py | 0 .../python/tests/test_ngraph/__init__.py | 0 .../tests/test_ngraph/test_adaptive_pool.py | 0 .../python/tests/test_ngraph/test_basic.py | 0 .../tests/test_ngraph/test_convolution.py | 0 .../python/tests/test_ngraph/test_core.py | 0 .../tests/test_ngraph/test_create_op.py | 0 .../python/tests/test_ngraph/test_ctc_loss.py | 0 .../tests/test_ngraph/test_data_movement.py | 0 .../python/tests/test_ngraph/test_dft.py | 0 .../tests/test_ngraph/test_dyn_attributes.py | 0 .../python/tests/test_ngraph/test_einsum.py | 0 .../python/tests/test_ngraph/test_gather.py | 0 .../python/tests/test_ngraph/test_idft.py | 0 .../test_ngraph/test_input_validation.py | 0 .../tests/test_ngraph/test_log_softmax.py | 0 .../python/tests/test_ngraph/test_manager.py | 0 .../tests/test_ngraph/test_node_factory.py | 0 .../tests/test_ngraph/test_normalization.py | 0 .../python/tests/test_ngraph/test_ops.py | 0 .../tests/test_ngraph/test_ops_binary.py | 0 .../tests/test_ngraph/test_ops_fused.py | 0 .../tests/test_ngraph/test_ops_matmul.py | 0 .../tests/test_ngraph/test_ops_multioutput.py | 0 .../tests/test_ngraph/test_ops_reshape.py | 0 .../tests/test_ngraph/test_ops_scatter.py | 0 .../tests/test_ngraph/test_ops_unary.py | 0 .../python/tests/test_ngraph/test_pooling.py | 0 .../python/tests/test_ngraph/test_proposal.py | 0 .../tests/test_ngraph/test_reduction.py | 0 .../python/tests/test_ngraph/test_roll.py | 0 .../test_ngraph/test_sequence_processing.py | 0 .../python/tests/test_ngraph/test_swish.py | 0 .../python/tests/test_ngraph/test_utils.py | 0 .../python/tests/test_ngraph/util.py | 0 .../python/tests/test_onnx/__init__.py | 0 .../tests/test_onnx/model_zoo_preprocess.sh | 0 .../tests/test_onnx/models/add_abc.onnx | 0 .../tests/test_onnx/models/data/tensor.data | Bin .../tests/test_onnx/models/external_data.onnx | 0 .../python/tests/test_onnx/test_backend.py | 0 .../test_onnx/test_onnx_external_data.py | 0 .../tests/test_onnx/test_onnx_import.py | 0 .../tests/test_onnx/test_ops_batchnorm.py | 0 .../python/tests/test_onnx/test_ops_binary.py | 0 .../tests/test_onnx/test_ops_convpool.py | 0 .../tests/test_onnx/test_ops_logical.py | 0 .../python/tests/test_onnx/test_ops_matmul.py | 0 .../tests/test_onnx/test_ops_nonlinear.py | 0 .../tests/test_onnx/test_ops_reduction.py | 0 .../tests/test_onnx/test_ops_reshape.py | 0 .../python/tests/test_onnx/test_ops_unary.py | 0 .../tests/test_onnx/test_ops_variadic.py | 0 .../python/tests/test_onnx/test_zoo_models.py | 0 .../python/tests/test_onnx/utils/__init__.py | 0 .../tests/test_onnx/utils/model_importer.py | 0 .../tests/test_onnx/utils/onnx_backend.py | 0 .../tests/test_onnx/utils/onnx_helpers.py | 0 runtime/bindings/python/thirdparty/pybind11 | 1 + {ngraph => runtime/bindings}/python/tox.ini | 0 scripts/CMakeLists.txt | 4 +-- 196 files changed, 79 insertions(+), 34 deletions(-) delete mode 160000 ngraph/python/pybind11 create mode 100644 runtime/CMakeLists.txt create mode 100644 runtime/bindings/python/.clang-format rename {ngraph => runtime/bindings}/python/.gitignore (100%) rename {ngraph => runtime/bindings}/python/BUILDING.md (100%) create mode 100644 runtime/bindings/python/CMakeLists.txt rename {ngraph => runtime/bindings}/python/requirements.txt (100%) rename {ngraph => runtime/bindings}/python/requirements_test.txt (100%) rename {ngraph => runtime/bindings}/python/setup.py (99%) create mode 100644 runtime/bindings/python/src/compatibility/CMakeLists.txt rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/exceptions.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/frontend/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/helpers.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/impl/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/impl/op/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/impl/op/util/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/impl/passes/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset1/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset1/ops.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset2/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset2/ops.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset3/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset3/ops.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset4/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset4/ops.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset5/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset5/ops.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset6/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset6/ops.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset7/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset7/ops.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset8/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset8/ops.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/opset_utils.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/utils/__init__.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/utils/broadcasting.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/utils/decorators.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/utils/input_validation.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/utils/node_factory.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/utils/reduction.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/utils/tensor_iterator_types.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/ngraph/utils/types.py (100%) rename {ngraph/python => runtime/bindings/python/src/compatibility/pyngraph}/CMakeLists.txt (74%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/axis_set.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/axis_set.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/axis_vector.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/axis_vector.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/coordinate.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/coordinate.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/coordinate_diff.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/coordinate_diff.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/dict_attribute_visitor.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/dict_attribute_visitor.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/dimension.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/dimension.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/frontend/frontend.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/frontend/frontend.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/frontend/frontend_manager.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/frontend/frontend_manager.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/frontend/inputmodel.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/frontend/inputmodel.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/frontend/place.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/frontend/place.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/function.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/function.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/node.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/node.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/node_factory.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/node_factory.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/node_input.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/node_input.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/node_output.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/node_output.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/constant.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/constant.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/parameter.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/parameter.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/result.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/result.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/arithmetic_reduction.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/arithmetic_reduction.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/binary_elementwise_arithmetic.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/binary_elementwise_arithmetic.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/binary_elementwise_comparison.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/binary_elementwise_comparison.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/binary_elementwise_logical.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/binary_elementwise_logical.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/index_reduction.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/index_reduction.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/op_annotations.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/op_annotations.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/regmodule_pyngraph_op_util.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/regmodule_pyngraph_op_util.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/unary_elementwise_arithmetic.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/ops/util/unary_elementwise_arithmetic.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/partial_shape.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/partial_shape.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/passes/manager.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/passes/manager.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/passes/regmodule_pyngraph_passes.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/passes/regmodule_pyngraph_passes.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/pyngraph.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/rt_map.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/rt_map.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/shape.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/shape.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/strides.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/strides.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/types/element_type.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/types/element_type.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/types/regmodule_pyngraph_types.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/types/regmodule_pyngraph_types.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/util.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/util.hpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/util.py (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/variant.cpp (100%) rename {ngraph/python/src => runtime/bindings/python/src/compatibility}/pyngraph/variant.hpp (100%) rename {ngraph => runtime/bindings}/python/tests/__init__.py (100%) rename {ngraph => runtime/bindings}/python/tests/conftest.py (100%) rename {ngraph => runtime/bindings}/python/tests/mock/mock_py_ngraph_frontend/CMakeLists.txt (100%) rename {ngraph => runtime/bindings}/python/tests/mock/mock_py_ngraph_frontend/mock_py_frontend.cpp (100%) rename {ngraph => runtime/bindings}/python/tests/mock/mock_py_ngraph_frontend/mock_py_frontend.hpp (100%) rename {ngraph => runtime/bindings}/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt (100%) rename {ngraph => runtime/bindings}/python/tests/mock/pyngraph_fe_mock_api/pyngraph_mock_frontend_api.cpp (100%) rename {ngraph => runtime/bindings}/python/tests/runtime.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_frontend/test_frontend_onnx.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_frontend/test_frontend_onnx_editor.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_frontend/test_frontendmanager.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/__init__.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_adaptive_pool.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_basic.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_convolution.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_core.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_create_op.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_ctc_loss.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_data_movement.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_dft.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_dyn_attributes.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_einsum.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_gather.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_idft.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_input_validation.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_log_softmax.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_manager.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_node_factory.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_normalization.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_ops.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_ops_binary.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_ops_fused.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_ops_matmul.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_ops_multioutput.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_ops_reshape.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_ops_scatter.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_ops_unary.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_pooling.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_proposal.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_reduction.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_roll.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_sequence_processing.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_swish.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/test_utils.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_ngraph/util.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/__init__.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/model_zoo_preprocess.sh (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/models/add_abc.onnx (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/models/data/tensor.data (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/models/external_data.onnx (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_backend.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_onnx_external_data.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_onnx_import.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_ops_batchnorm.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_ops_binary.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_ops_convpool.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_ops_logical.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_ops_matmul.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_ops_nonlinear.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_ops_reduction.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_ops_reshape.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_ops_unary.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_ops_variadic.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/test_zoo_models.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/utils/__init__.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/utils/model_importer.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/utils/onnx_backend.py (100%) rename {ngraph => runtime/bindings}/python/tests/test_onnx/utils/onnx_helpers.py (100%) create mode 160000 runtime/bindings/python/thirdparty/pybind11 rename {ngraph => runtime/bindings}/python/tox.ini (100%) diff --git a/.ci/azure/linux_ngraph_onnx.yml b/.ci/azure/linux_ngraph_onnx.yml index 5521d224630..8218a0874cd 100644 --- a/.ci/azure/linux_ngraph_onnx.yml +++ b/.ci/azure/linux_ngraph_onnx.yml @@ -72,7 +72,7 @@ jobs: workingDirectory: $(WORK_DIR) displayName: 'Install dependencies' - - script: ngraph/python/tests/test_onnx/model_zoo_preprocess.sh -d $(MODELS_DIR)/models_data -o -s "$(ONNX_MODEL_ZOO_SHA)" + - script: runtime/bindings/python/tests/test_onnx/model_zoo_preprocess.sh -d $(MODELS_DIR)/models_data -o -s "$(ONNX_MODEL_ZOO_SHA)" displayName: 'Update models' condition: ne(variables['BUILD_TYPE'], 'Debug') diff --git a/.ci/openvino-onnx/Dockerfile b/.ci/openvino-onnx/Dockerfile index 3a190c42769..4e1a6ad551a 100644 --- a/.ci/openvino-onnx/Dockerfile +++ b/.ci/openvino-onnx/Dockerfile @@ -74,7 +74,7 @@ RUN cmake .. \ RUN make -j $(nproc) install # Run tests via tox -WORKDIR /openvino/ngraph/python +WORKDIR /openvino/runtime/bindings/python ENV ngraph_DIR=/openvino/dist/deployment_tools/ngraph ENV LD_LIBRARY_PATH=/openvino/dist/deployment_tools/ngraph/lib ENV PYTHONPATH=/openvino/bin/intel64/${BUILD_TYPE}/lib/python_api/python3.8:${PYTHONPATH} diff --git a/.ci/openvino-onnx/Jenkinsfile b/.ci/openvino-onnx/Jenkinsfile index 2849579dcdb..5581c7c2ea8 100644 --- a/.ci/openvino-onnx/Jenkinsfile +++ b/.ci/openvino-onnx/Jenkinsfile @@ -94,7 +94,7 @@ def prepare_repository(String workdir) { def updateModels() { sh """ - ./ngraph/python/tests/test_onnx/model_zoo_preprocess.sh -d ${HOME}/ONNX_CI/models_data -o -s ${ONNX_MODEL_ZOO_SHA} + ./runtime/bindings/python/tests/test_onnx/model_zoo_preprocess.sh -d ${HOME}/ONNX_CI/models_data -o -s ${ONNX_MODEL_ZOO_SHA} """ } diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7d450a95183..cc8124c21c7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,7 +4,7 @@ version: 2 updates: # Enable version updates for nGraph Python API - package-ecosystem: pip - directory: "/ngraph/python" + directory: "/runtime/bindings/python" schedule: interval: weekly day: monday diff --git a/.gitmodules b/.gitmodules index 095f3968264..8569ecbb958 100644 --- a/.gitmodules +++ b/.gitmodules @@ -44,8 +44,8 @@ [submodule "thirdparty/protobuf"] path = thirdparty/protobuf/protobuf url = https://github.com/protocolbuffers/protobuf.git -[submodule "ngraph/python/pybind11"] - path = ngraph/python/pybind11 +[submodule "runtime/bindings/python/thirdparty/pybind11"] + path = runtime/bindings/python/thirdparty/pybind11 url = https://github.com/pybind/pybind11.git [submodule "thirdparty/ittapi/ittapi"] path = thirdparty/ittapi/ittapi diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cec8d2d5e8..40a888800da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,7 @@ add_subdirectory(inference-engine) openvino_developer_export_targets(COMPONENT ngraph TARGETS ngraph_backend interpreter_backend) include(cmake/extra_modules.cmake) +add_subdirectory(runtime) add_subdirectory(model-optimizer) add_subdirectory(docs) add_subdirectory(tools) diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt index 6ef6b3cdeb6..a5573427a89 100644 --- a/ngraph/CMakeLists.txt +++ b/ngraph/CMakeLists.txt @@ -30,7 +30,3 @@ add_subdirectory(core) add_subdirectory(frontend) add_subdirectory(test) - -if(ENABLE_PYTHON) - add_subdirectory(python) -endif() diff --git a/ngraph/python/pybind11 b/ngraph/python/pybind11 deleted file mode 160000 index 8de7772cc72..00000000000 --- a/ngraph/python/pybind11 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8de7772cc72daca8e947b79b83fea46214931604 diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt new file mode 100644 index 00000000000..d0078e44507 --- /dev/null +++ b/runtime/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright (C) 2021 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +# + + +if(ENABLE_PYTHON) + add_subdirectory(bindings/python) +endif() diff --git a/runtime/bindings/python/.clang-format b/runtime/bindings/python/.clang-format new file mode 100644 index 00000000000..ebe747b7838 --- /dev/null +++ b/runtime/bindings/python/.clang-format @@ -0,0 +1,28 @@ +BasedOnStyle: Google +IndentWidth: 4 +UseTab: Never +ColumnLimit: 120 + +Language: Cpp +Standard: Cpp11 + +AccessModifierOffset: -4 +AlignConsecutiveMacros: true +AllowAllArgumentsOnNextLine: false +AllowAllConstructorInitializersOnNextLine: false +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortFunctionsOnASingleLine: Empty +AllowShortIfStatementsOnASingleLine: Never +AllowShortLambdasOnASingleLine: Empty +AllowShortLoopsOnASingleLine: false +AlwaysBreakBeforeMultilineStrings: false +BinPackArguments: false +BinPackParameters: false +CommentPragmas: '^#' +DerivePointerAlignment: false +FixNamespaceComments: true +IndentCaseLabels: false +IndentPPDirectives: AfterHash +ForEachMacros: + - foreach + - FOREACH_CHILD diff --git a/ngraph/python/.gitignore b/runtime/bindings/python/.gitignore similarity index 100% rename from ngraph/python/.gitignore rename to runtime/bindings/python/.gitignore diff --git a/ngraph/python/BUILDING.md b/runtime/bindings/python/BUILDING.md similarity index 100% rename from ngraph/python/BUILDING.md rename to runtime/bindings/python/BUILDING.md diff --git a/runtime/bindings/python/CMakeLists.txt b/runtime/bindings/python/CMakeLists.txt new file mode 100644 index 00000000000..7aaecb7e90c --- /dev/null +++ b/runtime/bindings/python/CMakeLists.txt @@ -0,0 +1,21 @@ +# Copyright (C) 2021 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +# + +set(LIBRARY_OUTPUT_DIRECTORY_BIN ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) + +add_subdirectory(thirdparty/pybind11 EXCLUDE_FROM_ALL) +add_subdirectory(src/compatibility) + +if(NGRAPH_UNIT_TEST_ENABLE) + add_subdirectory(tests/mock/mock_py_ngraph_frontend) + add_dependencies(_pyngraph mock_py_ngraph_frontend) + set_target_properties(mock_py_ngraph_frontend PROPERTIES + LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_DIRECTORY_BIN} + ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_DIRECTORY_BIN} + COMPILE_PDB_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_DIRECTORY_BIN} + PDB_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_DIRECTORY_BIN}) + + add_subdirectory(tests/mock/pyngraph_fe_mock_api) + add_dependencies(_pyngraph pybind_mock_frontend) +endif() diff --git a/ngraph/python/requirements.txt b/runtime/bindings/python/requirements.txt similarity index 100% rename from ngraph/python/requirements.txt rename to runtime/bindings/python/requirements.txt diff --git a/ngraph/python/requirements_test.txt b/runtime/bindings/python/requirements_test.txt similarity index 100% rename from ngraph/python/requirements_test.txt rename to runtime/bindings/python/requirements_test.txt diff --git a/ngraph/python/setup.py b/runtime/bindings/python/setup.py similarity index 99% rename from ngraph/python/setup.py rename to runtime/bindings/python/setup.py index 5aae74ceb1e..d8c620ab4b5 100644 --- a/ngraph/python/setup.py +++ b/runtime/bindings/python/setup.py @@ -217,7 +217,7 @@ setup( url="https://github.com/openvinotoolkit/openvino", license="License :: OSI Approved :: Apache Software License", ext_modules=[CMakeExtension(name="_pyngraph")], - package_dir={"": "src"}, + package_dir={"": "src/compatibility"}, packages=packages, install_requires=requirements, data_files=data_files, diff --git a/runtime/bindings/python/src/compatibility/CMakeLists.txt b/runtime/bindings/python/src/compatibility/CMakeLists.txt new file mode 100644 index 00000000000..e56cfdb9084 --- /dev/null +++ b/runtime/bindings/python/src/compatibility/CMakeLists.txt @@ -0,0 +1,6 @@ +# Copyright (C) 2018-2021 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +# + + +add_subdirectory(pyngraph) diff --git a/ngraph/python/src/ngraph/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/__init__.py diff --git a/ngraph/python/src/ngraph/exceptions.py b/runtime/bindings/python/src/compatibility/ngraph/exceptions.py similarity index 100% rename from ngraph/python/src/ngraph/exceptions.py rename to runtime/bindings/python/src/compatibility/ngraph/exceptions.py diff --git a/ngraph/python/src/ngraph/frontend/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/frontend/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/frontend/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/frontend/__init__.py diff --git a/ngraph/python/src/ngraph/helpers.py b/runtime/bindings/python/src/compatibility/ngraph/helpers.py similarity index 100% rename from ngraph/python/src/ngraph/helpers.py rename to runtime/bindings/python/src/compatibility/ngraph/helpers.py diff --git a/ngraph/python/src/ngraph/impl/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/impl/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/impl/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/impl/__init__.py diff --git a/ngraph/python/src/ngraph/impl/op/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/impl/op/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/impl/op/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/impl/op/__init__.py diff --git a/ngraph/python/src/ngraph/impl/op/util/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/impl/op/util/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/impl/op/util/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/impl/op/util/__init__.py diff --git a/ngraph/python/src/ngraph/impl/passes/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/impl/passes/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/impl/passes/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/impl/passes/__init__.py diff --git a/ngraph/python/src/ngraph/opset1/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/opset1/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/opset1/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/opset1/__init__.py diff --git a/ngraph/python/src/ngraph/opset1/ops.py b/runtime/bindings/python/src/compatibility/ngraph/opset1/ops.py similarity index 100% rename from ngraph/python/src/ngraph/opset1/ops.py rename to runtime/bindings/python/src/compatibility/ngraph/opset1/ops.py diff --git a/ngraph/python/src/ngraph/opset2/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/opset2/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/opset2/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/opset2/__init__.py diff --git a/ngraph/python/src/ngraph/opset2/ops.py b/runtime/bindings/python/src/compatibility/ngraph/opset2/ops.py similarity index 100% rename from ngraph/python/src/ngraph/opset2/ops.py rename to runtime/bindings/python/src/compatibility/ngraph/opset2/ops.py diff --git a/ngraph/python/src/ngraph/opset3/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/opset3/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/opset3/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/opset3/__init__.py diff --git a/ngraph/python/src/ngraph/opset3/ops.py b/runtime/bindings/python/src/compatibility/ngraph/opset3/ops.py similarity index 100% rename from ngraph/python/src/ngraph/opset3/ops.py rename to runtime/bindings/python/src/compatibility/ngraph/opset3/ops.py diff --git a/ngraph/python/src/ngraph/opset4/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/opset4/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/opset4/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/opset4/__init__.py diff --git a/ngraph/python/src/ngraph/opset4/ops.py b/runtime/bindings/python/src/compatibility/ngraph/opset4/ops.py similarity index 100% rename from ngraph/python/src/ngraph/opset4/ops.py rename to runtime/bindings/python/src/compatibility/ngraph/opset4/ops.py diff --git a/ngraph/python/src/ngraph/opset5/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/opset5/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/opset5/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/opset5/__init__.py diff --git a/ngraph/python/src/ngraph/opset5/ops.py b/runtime/bindings/python/src/compatibility/ngraph/opset5/ops.py similarity index 100% rename from ngraph/python/src/ngraph/opset5/ops.py rename to runtime/bindings/python/src/compatibility/ngraph/opset5/ops.py diff --git a/ngraph/python/src/ngraph/opset6/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/opset6/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/opset6/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/opset6/__init__.py diff --git a/ngraph/python/src/ngraph/opset6/ops.py b/runtime/bindings/python/src/compatibility/ngraph/opset6/ops.py similarity index 100% rename from ngraph/python/src/ngraph/opset6/ops.py rename to runtime/bindings/python/src/compatibility/ngraph/opset6/ops.py diff --git a/ngraph/python/src/ngraph/opset7/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/opset7/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/opset7/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/opset7/__init__.py diff --git a/ngraph/python/src/ngraph/opset7/ops.py b/runtime/bindings/python/src/compatibility/ngraph/opset7/ops.py similarity index 100% rename from ngraph/python/src/ngraph/opset7/ops.py rename to runtime/bindings/python/src/compatibility/ngraph/opset7/ops.py diff --git a/ngraph/python/src/ngraph/opset8/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/opset8/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/opset8/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/opset8/__init__.py diff --git a/ngraph/python/src/ngraph/opset8/ops.py b/runtime/bindings/python/src/compatibility/ngraph/opset8/ops.py similarity index 100% rename from ngraph/python/src/ngraph/opset8/ops.py rename to runtime/bindings/python/src/compatibility/ngraph/opset8/ops.py diff --git a/ngraph/python/src/ngraph/opset_utils.py b/runtime/bindings/python/src/compatibility/ngraph/opset_utils.py similarity index 100% rename from ngraph/python/src/ngraph/opset_utils.py rename to runtime/bindings/python/src/compatibility/ngraph/opset_utils.py diff --git a/ngraph/python/src/ngraph/utils/__init__.py b/runtime/bindings/python/src/compatibility/ngraph/utils/__init__.py similarity index 100% rename from ngraph/python/src/ngraph/utils/__init__.py rename to runtime/bindings/python/src/compatibility/ngraph/utils/__init__.py diff --git a/ngraph/python/src/ngraph/utils/broadcasting.py b/runtime/bindings/python/src/compatibility/ngraph/utils/broadcasting.py similarity index 100% rename from ngraph/python/src/ngraph/utils/broadcasting.py rename to runtime/bindings/python/src/compatibility/ngraph/utils/broadcasting.py diff --git a/ngraph/python/src/ngraph/utils/decorators.py b/runtime/bindings/python/src/compatibility/ngraph/utils/decorators.py similarity index 100% rename from ngraph/python/src/ngraph/utils/decorators.py rename to runtime/bindings/python/src/compatibility/ngraph/utils/decorators.py diff --git a/ngraph/python/src/ngraph/utils/input_validation.py b/runtime/bindings/python/src/compatibility/ngraph/utils/input_validation.py similarity index 100% rename from ngraph/python/src/ngraph/utils/input_validation.py rename to runtime/bindings/python/src/compatibility/ngraph/utils/input_validation.py diff --git a/ngraph/python/src/ngraph/utils/node_factory.py b/runtime/bindings/python/src/compatibility/ngraph/utils/node_factory.py similarity index 100% rename from ngraph/python/src/ngraph/utils/node_factory.py rename to runtime/bindings/python/src/compatibility/ngraph/utils/node_factory.py diff --git a/ngraph/python/src/ngraph/utils/reduction.py b/runtime/bindings/python/src/compatibility/ngraph/utils/reduction.py similarity index 100% rename from ngraph/python/src/ngraph/utils/reduction.py rename to runtime/bindings/python/src/compatibility/ngraph/utils/reduction.py diff --git a/ngraph/python/src/ngraph/utils/tensor_iterator_types.py b/runtime/bindings/python/src/compatibility/ngraph/utils/tensor_iterator_types.py similarity index 100% rename from ngraph/python/src/ngraph/utils/tensor_iterator_types.py rename to runtime/bindings/python/src/compatibility/ngraph/utils/tensor_iterator_types.py diff --git a/ngraph/python/src/ngraph/utils/types.py b/runtime/bindings/python/src/compatibility/ngraph/utils/types.py similarity index 100% rename from ngraph/python/src/ngraph/utils/types.py rename to runtime/bindings/python/src/compatibility/ngraph/utils/types.py diff --git a/ngraph/python/CMakeLists.txt b/runtime/bindings/python/src/compatibility/pyngraph/CMakeLists.txt similarity index 74% rename from ngraph/python/CMakeLists.txt rename to runtime/bindings/python/src/compatibility/pyngraph/CMakeLists.txt index 7de595a5211..e3cacab6729 100644 --- a/ngraph/python/CMakeLists.txt +++ b/runtime/bindings/python/src/compatibility/pyngraph/CMakeLists.txt @@ -11,13 +11,10 @@ if(NOT DEFINED OpenVINO_SOURCE_DIR) find_package(ngraph REQUIRED) endif() -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/pybind11 EXCLUDE_FROM_ALL) - # PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11 set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) message(STATUS "Python version=${PYTHON_VERSION}") -set(LIBRARY_OUTPUT_DIRECTORY_BIN ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) if(OpenVINO_SOURCE_DIR) if(WIN32) set(PYTHON_BRIDGE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$/python_api/${PYTHON_VERSION}/) @@ -53,11 +50,11 @@ endif() # create target -file(GLOB_RECURSE SOURCES src/pyngraph/*.cpp) +file(GLOB_RECURSE SOURCES *.cpp) pybind11_add_module(_${PROJECT_NAME} MODULE ${SOURCES}) -target_include_directories(_${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src") +target_include_directories(_${PROJECT_NAME} PRIVATE "../") target_link_libraries(_${PROJECT_NAME} PRIVATE ngraph::ngraph ngraph::frontend_manager) @@ -65,24 +62,12 @@ if (TARGET ngraph::onnx_ngraph_frontend) add_dependencies(_${PROJECT_NAME} ngraph::onnx_ngraph_frontend) endif() -if(NGRAPH_UNIT_TEST_ENABLE) - add_subdirectory(tests/mock/mock_py_ngraph_frontend) - add_dependencies(_${PROJECT_NAME} mock_py_ngraph_frontend) - set_target_properties(mock_py_ngraph_frontend PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_DIRECTORY_BIN} - ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_DIRECTORY_BIN} - COMPILE_PDB_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_DIRECTORY_BIN} - PDB_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_DIRECTORY_BIN}) - - add_subdirectory(tests/mock/pyngraph_fe_mock_api) - add_dependencies(_${PROJECT_NAME} pybind_mock_frontend) -endif() # perform copy if(OpenVINO_SOURCE_DIR) add_custom_command(TARGET _${PROJECT_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/src/ngraph ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ngraph + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../ngraph ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/ngraph ) endif() @@ -99,12 +84,12 @@ if(OpenVINO_SOURCE_DIR OR InferenceEngineDeveloperPackage_FOUND) DESTINATION python/${PYTHON_VERSION} COMPONENT pyngraph_${PYTHON_VERSION}) - install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/src/ngraph + install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../ngraph DESTINATION python/${PYTHON_VERSION} COMPONENT pyngraph_${PYTHON_VERSION} USE_SOURCE_PERMISSIONS) - install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/tests + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../../tests DESTINATION tests/${PROJECT_NAME} COMPONENT tests EXCLUDE_FROM_ALL) diff --git a/ngraph/python/src/pyngraph/axis_set.cpp b/runtime/bindings/python/src/compatibility/pyngraph/axis_set.cpp similarity index 100% rename from ngraph/python/src/pyngraph/axis_set.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/axis_set.cpp diff --git a/ngraph/python/src/pyngraph/axis_set.hpp b/runtime/bindings/python/src/compatibility/pyngraph/axis_set.hpp similarity index 100% rename from ngraph/python/src/pyngraph/axis_set.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/axis_set.hpp diff --git a/ngraph/python/src/pyngraph/axis_vector.cpp b/runtime/bindings/python/src/compatibility/pyngraph/axis_vector.cpp similarity index 100% rename from ngraph/python/src/pyngraph/axis_vector.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/axis_vector.cpp diff --git a/ngraph/python/src/pyngraph/axis_vector.hpp b/runtime/bindings/python/src/compatibility/pyngraph/axis_vector.hpp similarity index 100% rename from ngraph/python/src/pyngraph/axis_vector.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/axis_vector.hpp diff --git a/ngraph/python/src/pyngraph/coordinate.cpp b/runtime/bindings/python/src/compatibility/pyngraph/coordinate.cpp similarity index 100% rename from ngraph/python/src/pyngraph/coordinate.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/coordinate.cpp diff --git a/ngraph/python/src/pyngraph/coordinate.hpp b/runtime/bindings/python/src/compatibility/pyngraph/coordinate.hpp similarity index 100% rename from ngraph/python/src/pyngraph/coordinate.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/coordinate.hpp diff --git a/ngraph/python/src/pyngraph/coordinate_diff.cpp b/runtime/bindings/python/src/compatibility/pyngraph/coordinate_diff.cpp similarity index 100% rename from ngraph/python/src/pyngraph/coordinate_diff.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/coordinate_diff.cpp diff --git a/ngraph/python/src/pyngraph/coordinate_diff.hpp b/runtime/bindings/python/src/compatibility/pyngraph/coordinate_diff.hpp similarity index 100% rename from ngraph/python/src/pyngraph/coordinate_diff.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/coordinate_diff.hpp diff --git a/ngraph/python/src/pyngraph/dict_attribute_visitor.cpp b/runtime/bindings/python/src/compatibility/pyngraph/dict_attribute_visitor.cpp similarity index 100% rename from ngraph/python/src/pyngraph/dict_attribute_visitor.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/dict_attribute_visitor.cpp diff --git a/ngraph/python/src/pyngraph/dict_attribute_visitor.hpp b/runtime/bindings/python/src/compatibility/pyngraph/dict_attribute_visitor.hpp similarity index 100% rename from ngraph/python/src/pyngraph/dict_attribute_visitor.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/dict_attribute_visitor.hpp diff --git a/ngraph/python/src/pyngraph/dimension.cpp b/runtime/bindings/python/src/compatibility/pyngraph/dimension.cpp similarity index 100% rename from ngraph/python/src/pyngraph/dimension.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/dimension.cpp diff --git a/ngraph/python/src/pyngraph/dimension.hpp b/runtime/bindings/python/src/compatibility/pyngraph/dimension.hpp similarity index 100% rename from ngraph/python/src/pyngraph/dimension.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/dimension.hpp diff --git a/ngraph/python/src/pyngraph/frontend/frontend.cpp b/runtime/bindings/python/src/compatibility/pyngraph/frontend/frontend.cpp similarity index 100% rename from ngraph/python/src/pyngraph/frontend/frontend.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/frontend/frontend.cpp diff --git a/ngraph/python/src/pyngraph/frontend/frontend.hpp b/runtime/bindings/python/src/compatibility/pyngraph/frontend/frontend.hpp similarity index 100% rename from ngraph/python/src/pyngraph/frontend/frontend.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/frontend/frontend.hpp diff --git a/ngraph/python/src/pyngraph/frontend/frontend_manager.cpp b/runtime/bindings/python/src/compatibility/pyngraph/frontend/frontend_manager.cpp similarity index 100% rename from ngraph/python/src/pyngraph/frontend/frontend_manager.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/frontend/frontend_manager.cpp diff --git a/ngraph/python/src/pyngraph/frontend/frontend_manager.hpp b/runtime/bindings/python/src/compatibility/pyngraph/frontend/frontend_manager.hpp similarity index 100% rename from ngraph/python/src/pyngraph/frontend/frontend_manager.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/frontend/frontend_manager.hpp diff --git a/ngraph/python/src/pyngraph/frontend/inputmodel.cpp b/runtime/bindings/python/src/compatibility/pyngraph/frontend/inputmodel.cpp similarity index 100% rename from ngraph/python/src/pyngraph/frontend/inputmodel.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/frontend/inputmodel.cpp diff --git a/ngraph/python/src/pyngraph/frontend/inputmodel.hpp b/runtime/bindings/python/src/compatibility/pyngraph/frontend/inputmodel.hpp similarity index 100% rename from ngraph/python/src/pyngraph/frontend/inputmodel.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/frontend/inputmodel.hpp diff --git a/ngraph/python/src/pyngraph/frontend/place.cpp b/runtime/bindings/python/src/compatibility/pyngraph/frontend/place.cpp similarity index 100% rename from ngraph/python/src/pyngraph/frontend/place.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/frontend/place.cpp diff --git a/ngraph/python/src/pyngraph/frontend/place.hpp b/runtime/bindings/python/src/compatibility/pyngraph/frontend/place.hpp similarity index 100% rename from ngraph/python/src/pyngraph/frontend/place.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/frontend/place.hpp diff --git a/ngraph/python/src/pyngraph/function.cpp b/runtime/bindings/python/src/compatibility/pyngraph/function.cpp similarity index 100% rename from ngraph/python/src/pyngraph/function.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/function.cpp diff --git a/ngraph/python/src/pyngraph/function.hpp b/runtime/bindings/python/src/compatibility/pyngraph/function.hpp similarity index 100% rename from ngraph/python/src/pyngraph/function.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/function.hpp diff --git a/ngraph/python/src/pyngraph/node.cpp b/runtime/bindings/python/src/compatibility/pyngraph/node.cpp similarity index 100% rename from ngraph/python/src/pyngraph/node.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/node.cpp diff --git a/ngraph/python/src/pyngraph/node.hpp b/runtime/bindings/python/src/compatibility/pyngraph/node.hpp similarity index 100% rename from ngraph/python/src/pyngraph/node.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/node.hpp diff --git a/ngraph/python/src/pyngraph/node_factory.cpp b/runtime/bindings/python/src/compatibility/pyngraph/node_factory.cpp similarity index 100% rename from ngraph/python/src/pyngraph/node_factory.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/node_factory.cpp diff --git a/ngraph/python/src/pyngraph/node_factory.hpp b/runtime/bindings/python/src/compatibility/pyngraph/node_factory.hpp similarity index 100% rename from ngraph/python/src/pyngraph/node_factory.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/node_factory.hpp diff --git a/ngraph/python/src/pyngraph/node_input.cpp b/runtime/bindings/python/src/compatibility/pyngraph/node_input.cpp similarity index 100% rename from ngraph/python/src/pyngraph/node_input.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/node_input.cpp diff --git a/ngraph/python/src/pyngraph/node_input.hpp b/runtime/bindings/python/src/compatibility/pyngraph/node_input.hpp similarity index 100% rename from ngraph/python/src/pyngraph/node_input.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/node_input.hpp diff --git a/ngraph/python/src/pyngraph/node_output.cpp b/runtime/bindings/python/src/compatibility/pyngraph/node_output.cpp similarity index 100% rename from ngraph/python/src/pyngraph/node_output.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/node_output.cpp diff --git a/ngraph/python/src/pyngraph/node_output.hpp b/runtime/bindings/python/src/compatibility/pyngraph/node_output.hpp similarity index 100% rename from ngraph/python/src/pyngraph/node_output.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/node_output.hpp diff --git a/ngraph/python/src/pyngraph/ops/constant.cpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/constant.cpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/constant.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/constant.cpp diff --git a/ngraph/python/src/pyngraph/ops/constant.hpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/constant.hpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/constant.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/constant.hpp diff --git a/ngraph/python/src/pyngraph/ops/parameter.cpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/parameter.cpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/parameter.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/parameter.cpp diff --git a/ngraph/python/src/pyngraph/ops/parameter.hpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/parameter.hpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/parameter.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/parameter.hpp diff --git a/ngraph/python/src/pyngraph/ops/result.cpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/result.cpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/result.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/result.cpp diff --git a/ngraph/python/src/pyngraph/ops/result.hpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/result.hpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/result.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/result.hpp diff --git a/ngraph/python/src/pyngraph/ops/util/arithmetic_reduction.cpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/arithmetic_reduction.cpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/arithmetic_reduction.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/arithmetic_reduction.cpp diff --git a/ngraph/python/src/pyngraph/ops/util/arithmetic_reduction.hpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/arithmetic_reduction.hpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/arithmetic_reduction.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/arithmetic_reduction.hpp diff --git a/ngraph/python/src/pyngraph/ops/util/binary_elementwise_arithmetic.cpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/binary_elementwise_arithmetic.cpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/binary_elementwise_arithmetic.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/binary_elementwise_arithmetic.cpp diff --git a/ngraph/python/src/pyngraph/ops/util/binary_elementwise_arithmetic.hpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/binary_elementwise_arithmetic.hpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/binary_elementwise_arithmetic.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/binary_elementwise_arithmetic.hpp diff --git a/ngraph/python/src/pyngraph/ops/util/binary_elementwise_comparison.cpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/binary_elementwise_comparison.cpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/binary_elementwise_comparison.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/binary_elementwise_comparison.cpp diff --git a/ngraph/python/src/pyngraph/ops/util/binary_elementwise_comparison.hpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/binary_elementwise_comparison.hpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/binary_elementwise_comparison.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/binary_elementwise_comparison.hpp diff --git a/ngraph/python/src/pyngraph/ops/util/binary_elementwise_logical.cpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/binary_elementwise_logical.cpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/binary_elementwise_logical.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/binary_elementwise_logical.cpp diff --git a/ngraph/python/src/pyngraph/ops/util/binary_elementwise_logical.hpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/binary_elementwise_logical.hpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/binary_elementwise_logical.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/binary_elementwise_logical.hpp diff --git a/ngraph/python/src/pyngraph/ops/util/index_reduction.cpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/index_reduction.cpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/index_reduction.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/index_reduction.cpp diff --git a/ngraph/python/src/pyngraph/ops/util/index_reduction.hpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/index_reduction.hpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/index_reduction.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/index_reduction.hpp diff --git a/ngraph/python/src/pyngraph/ops/util/op_annotations.cpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/op_annotations.cpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/op_annotations.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/op_annotations.cpp diff --git a/ngraph/python/src/pyngraph/ops/util/op_annotations.hpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/op_annotations.hpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/op_annotations.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/op_annotations.hpp diff --git a/ngraph/python/src/pyngraph/ops/util/regmodule_pyngraph_op_util.cpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/regmodule_pyngraph_op_util.cpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/regmodule_pyngraph_op_util.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/regmodule_pyngraph_op_util.cpp diff --git a/ngraph/python/src/pyngraph/ops/util/regmodule_pyngraph_op_util.hpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/regmodule_pyngraph_op_util.hpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/regmodule_pyngraph_op_util.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/regmodule_pyngraph_op_util.hpp diff --git a/ngraph/python/src/pyngraph/ops/util/unary_elementwise_arithmetic.cpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/unary_elementwise_arithmetic.cpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/unary_elementwise_arithmetic.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/unary_elementwise_arithmetic.cpp diff --git a/ngraph/python/src/pyngraph/ops/util/unary_elementwise_arithmetic.hpp b/runtime/bindings/python/src/compatibility/pyngraph/ops/util/unary_elementwise_arithmetic.hpp similarity index 100% rename from ngraph/python/src/pyngraph/ops/util/unary_elementwise_arithmetic.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/ops/util/unary_elementwise_arithmetic.hpp diff --git a/ngraph/python/src/pyngraph/partial_shape.cpp b/runtime/bindings/python/src/compatibility/pyngraph/partial_shape.cpp similarity index 100% rename from ngraph/python/src/pyngraph/partial_shape.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/partial_shape.cpp diff --git a/ngraph/python/src/pyngraph/partial_shape.hpp b/runtime/bindings/python/src/compatibility/pyngraph/partial_shape.hpp similarity index 100% rename from ngraph/python/src/pyngraph/partial_shape.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/partial_shape.hpp diff --git a/ngraph/python/src/pyngraph/passes/manager.cpp b/runtime/bindings/python/src/compatibility/pyngraph/passes/manager.cpp similarity index 100% rename from ngraph/python/src/pyngraph/passes/manager.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/passes/manager.cpp diff --git a/ngraph/python/src/pyngraph/passes/manager.hpp b/runtime/bindings/python/src/compatibility/pyngraph/passes/manager.hpp similarity index 100% rename from ngraph/python/src/pyngraph/passes/manager.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/passes/manager.hpp diff --git a/ngraph/python/src/pyngraph/passes/regmodule_pyngraph_passes.cpp b/runtime/bindings/python/src/compatibility/pyngraph/passes/regmodule_pyngraph_passes.cpp similarity index 100% rename from ngraph/python/src/pyngraph/passes/regmodule_pyngraph_passes.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/passes/regmodule_pyngraph_passes.cpp diff --git a/ngraph/python/src/pyngraph/passes/regmodule_pyngraph_passes.hpp b/runtime/bindings/python/src/compatibility/pyngraph/passes/regmodule_pyngraph_passes.hpp similarity index 100% rename from ngraph/python/src/pyngraph/passes/regmodule_pyngraph_passes.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/passes/regmodule_pyngraph_passes.hpp diff --git a/ngraph/python/src/pyngraph/pyngraph.cpp b/runtime/bindings/python/src/compatibility/pyngraph/pyngraph.cpp similarity index 100% rename from ngraph/python/src/pyngraph/pyngraph.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/pyngraph.cpp diff --git a/ngraph/python/src/pyngraph/rt_map.cpp b/runtime/bindings/python/src/compatibility/pyngraph/rt_map.cpp similarity index 100% rename from ngraph/python/src/pyngraph/rt_map.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/rt_map.cpp diff --git a/ngraph/python/src/pyngraph/rt_map.hpp b/runtime/bindings/python/src/compatibility/pyngraph/rt_map.hpp similarity index 100% rename from ngraph/python/src/pyngraph/rt_map.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/rt_map.hpp diff --git a/ngraph/python/src/pyngraph/shape.cpp b/runtime/bindings/python/src/compatibility/pyngraph/shape.cpp similarity index 100% rename from ngraph/python/src/pyngraph/shape.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/shape.cpp diff --git a/ngraph/python/src/pyngraph/shape.hpp b/runtime/bindings/python/src/compatibility/pyngraph/shape.hpp similarity index 100% rename from ngraph/python/src/pyngraph/shape.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/shape.hpp diff --git a/ngraph/python/src/pyngraph/strides.cpp b/runtime/bindings/python/src/compatibility/pyngraph/strides.cpp similarity index 100% rename from ngraph/python/src/pyngraph/strides.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/strides.cpp diff --git a/ngraph/python/src/pyngraph/strides.hpp b/runtime/bindings/python/src/compatibility/pyngraph/strides.hpp similarity index 100% rename from ngraph/python/src/pyngraph/strides.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/strides.hpp diff --git a/ngraph/python/src/pyngraph/types/element_type.cpp b/runtime/bindings/python/src/compatibility/pyngraph/types/element_type.cpp similarity index 100% rename from ngraph/python/src/pyngraph/types/element_type.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/types/element_type.cpp diff --git a/ngraph/python/src/pyngraph/types/element_type.hpp b/runtime/bindings/python/src/compatibility/pyngraph/types/element_type.hpp similarity index 100% rename from ngraph/python/src/pyngraph/types/element_type.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/types/element_type.hpp diff --git a/ngraph/python/src/pyngraph/types/regmodule_pyngraph_types.cpp b/runtime/bindings/python/src/compatibility/pyngraph/types/regmodule_pyngraph_types.cpp similarity index 100% rename from ngraph/python/src/pyngraph/types/regmodule_pyngraph_types.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/types/regmodule_pyngraph_types.cpp diff --git a/ngraph/python/src/pyngraph/types/regmodule_pyngraph_types.hpp b/runtime/bindings/python/src/compatibility/pyngraph/types/regmodule_pyngraph_types.hpp similarity index 100% rename from ngraph/python/src/pyngraph/types/regmodule_pyngraph_types.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/types/regmodule_pyngraph_types.hpp diff --git a/ngraph/python/src/pyngraph/util.cpp b/runtime/bindings/python/src/compatibility/pyngraph/util.cpp similarity index 100% rename from ngraph/python/src/pyngraph/util.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/util.cpp diff --git a/ngraph/python/src/pyngraph/util.hpp b/runtime/bindings/python/src/compatibility/pyngraph/util.hpp similarity index 100% rename from ngraph/python/src/pyngraph/util.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/util.hpp diff --git a/ngraph/python/src/pyngraph/util.py b/runtime/bindings/python/src/compatibility/pyngraph/util.py similarity index 100% rename from ngraph/python/src/pyngraph/util.py rename to runtime/bindings/python/src/compatibility/pyngraph/util.py diff --git a/ngraph/python/src/pyngraph/variant.cpp b/runtime/bindings/python/src/compatibility/pyngraph/variant.cpp similarity index 100% rename from ngraph/python/src/pyngraph/variant.cpp rename to runtime/bindings/python/src/compatibility/pyngraph/variant.cpp diff --git a/ngraph/python/src/pyngraph/variant.hpp b/runtime/bindings/python/src/compatibility/pyngraph/variant.hpp similarity index 100% rename from ngraph/python/src/pyngraph/variant.hpp rename to runtime/bindings/python/src/compatibility/pyngraph/variant.hpp diff --git a/ngraph/python/tests/__init__.py b/runtime/bindings/python/tests/__init__.py similarity index 100% rename from ngraph/python/tests/__init__.py rename to runtime/bindings/python/tests/__init__.py diff --git a/ngraph/python/tests/conftest.py b/runtime/bindings/python/tests/conftest.py similarity index 100% rename from ngraph/python/tests/conftest.py rename to runtime/bindings/python/tests/conftest.py diff --git a/ngraph/python/tests/mock/mock_py_ngraph_frontend/CMakeLists.txt b/runtime/bindings/python/tests/mock/mock_py_ngraph_frontend/CMakeLists.txt similarity index 100% rename from ngraph/python/tests/mock/mock_py_ngraph_frontend/CMakeLists.txt rename to runtime/bindings/python/tests/mock/mock_py_ngraph_frontend/CMakeLists.txt diff --git a/ngraph/python/tests/mock/mock_py_ngraph_frontend/mock_py_frontend.cpp b/runtime/bindings/python/tests/mock/mock_py_ngraph_frontend/mock_py_frontend.cpp similarity index 100% rename from ngraph/python/tests/mock/mock_py_ngraph_frontend/mock_py_frontend.cpp rename to runtime/bindings/python/tests/mock/mock_py_ngraph_frontend/mock_py_frontend.cpp diff --git a/ngraph/python/tests/mock/mock_py_ngraph_frontend/mock_py_frontend.hpp b/runtime/bindings/python/tests/mock/mock_py_ngraph_frontend/mock_py_frontend.hpp similarity index 100% rename from ngraph/python/tests/mock/mock_py_ngraph_frontend/mock_py_frontend.hpp rename to runtime/bindings/python/tests/mock/mock_py_ngraph_frontend/mock_py_frontend.hpp diff --git a/ngraph/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt b/runtime/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt similarity index 100% rename from ngraph/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt rename to runtime/bindings/python/tests/mock/pyngraph_fe_mock_api/CMakeLists.txt diff --git a/ngraph/python/tests/mock/pyngraph_fe_mock_api/pyngraph_mock_frontend_api.cpp b/runtime/bindings/python/tests/mock/pyngraph_fe_mock_api/pyngraph_mock_frontend_api.cpp similarity index 100% rename from ngraph/python/tests/mock/pyngraph_fe_mock_api/pyngraph_mock_frontend_api.cpp rename to runtime/bindings/python/tests/mock/pyngraph_fe_mock_api/pyngraph_mock_frontend_api.cpp diff --git a/ngraph/python/tests/runtime.py b/runtime/bindings/python/tests/runtime.py similarity index 100% rename from ngraph/python/tests/runtime.py rename to runtime/bindings/python/tests/runtime.py diff --git a/ngraph/python/tests/test_frontend/test_frontend_onnx.py b/runtime/bindings/python/tests/test_frontend/test_frontend_onnx.py similarity index 100% rename from ngraph/python/tests/test_frontend/test_frontend_onnx.py rename to runtime/bindings/python/tests/test_frontend/test_frontend_onnx.py diff --git a/ngraph/python/tests/test_frontend/test_frontend_onnx_editor.py b/runtime/bindings/python/tests/test_frontend/test_frontend_onnx_editor.py similarity index 100% rename from ngraph/python/tests/test_frontend/test_frontend_onnx_editor.py rename to runtime/bindings/python/tests/test_frontend/test_frontend_onnx_editor.py diff --git a/ngraph/python/tests/test_frontend/test_frontendmanager.py b/runtime/bindings/python/tests/test_frontend/test_frontendmanager.py similarity index 100% rename from ngraph/python/tests/test_frontend/test_frontendmanager.py rename to runtime/bindings/python/tests/test_frontend/test_frontendmanager.py diff --git a/ngraph/python/tests/test_ngraph/__init__.py b/runtime/bindings/python/tests/test_ngraph/__init__.py similarity index 100% rename from ngraph/python/tests/test_ngraph/__init__.py rename to runtime/bindings/python/tests/test_ngraph/__init__.py diff --git a/ngraph/python/tests/test_ngraph/test_adaptive_pool.py b/runtime/bindings/python/tests/test_ngraph/test_adaptive_pool.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_adaptive_pool.py rename to runtime/bindings/python/tests/test_ngraph/test_adaptive_pool.py diff --git a/ngraph/python/tests/test_ngraph/test_basic.py b/runtime/bindings/python/tests/test_ngraph/test_basic.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_basic.py rename to runtime/bindings/python/tests/test_ngraph/test_basic.py diff --git a/ngraph/python/tests/test_ngraph/test_convolution.py b/runtime/bindings/python/tests/test_ngraph/test_convolution.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_convolution.py rename to runtime/bindings/python/tests/test_ngraph/test_convolution.py diff --git a/ngraph/python/tests/test_ngraph/test_core.py b/runtime/bindings/python/tests/test_ngraph/test_core.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_core.py rename to runtime/bindings/python/tests/test_ngraph/test_core.py diff --git a/ngraph/python/tests/test_ngraph/test_create_op.py b/runtime/bindings/python/tests/test_ngraph/test_create_op.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_create_op.py rename to runtime/bindings/python/tests/test_ngraph/test_create_op.py diff --git a/ngraph/python/tests/test_ngraph/test_ctc_loss.py b/runtime/bindings/python/tests/test_ngraph/test_ctc_loss.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_ctc_loss.py rename to runtime/bindings/python/tests/test_ngraph/test_ctc_loss.py diff --git a/ngraph/python/tests/test_ngraph/test_data_movement.py b/runtime/bindings/python/tests/test_ngraph/test_data_movement.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_data_movement.py rename to runtime/bindings/python/tests/test_ngraph/test_data_movement.py diff --git a/ngraph/python/tests/test_ngraph/test_dft.py b/runtime/bindings/python/tests/test_ngraph/test_dft.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_dft.py rename to runtime/bindings/python/tests/test_ngraph/test_dft.py diff --git a/ngraph/python/tests/test_ngraph/test_dyn_attributes.py b/runtime/bindings/python/tests/test_ngraph/test_dyn_attributes.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_dyn_attributes.py rename to runtime/bindings/python/tests/test_ngraph/test_dyn_attributes.py diff --git a/ngraph/python/tests/test_ngraph/test_einsum.py b/runtime/bindings/python/tests/test_ngraph/test_einsum.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_einsum.py rename to runtime/bindings/python/tests/test_ngraph/test_einsum.py diff --git a/ngraph/python/tests/test_ngraph/test_gather.py b/runtime/bindings/python/tests/test_ngraph/test_gather.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_gather.py rename to runtime/bindings/python/tests/test_ngraph/test_gather.py diff --git a/ngraph/python/tests/test_ngraph/test_idft.py b/runtime/bindings/python/tests/test_ngraph/test_idft.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_idft.py rename to runtime/bindings/python/tests/test_ngraph/test_idft.py diff --git a/ngraph/python/tests/test_ngraph/test_input_validation.py b/runtime/bindings/python/tests/test_ngraph/test_input_validation.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_input_validation.py rename to runtime/bindings/python/tests/test_ngraph/test_input_validation.py diff --git a/ngraph/python/tests/test_ngraph/test_log_softmax.py b/runtime/bindings/python/tests/test_ngraph/test_log_softmax.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_log_softmax.py rename to runtime/bindings/python/tests/test_ngraph/test_log_softmax.py diff --git a/ngraph/python/tests/test_ngraph/test_manager.py b/runtime/bindings/python/tests/test_ngraph/test_manager.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_manager.py rename to runtime/bindings/python/tests/test_ngraph/test_manager.py diff --git a/ngraph/python/tests/test_ngraph/test_node_factory.py b/runtime/bindings/python/tests/test_ngraph/test_node_factory.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_node_factory.py rename to runtime/bindings/python/tests/test_ngraph/test_node_factory.py diff --git a/ngraph/python/tests/test_ngraph/test_normalization.py b/runtime/bindings/python/tests/test_ngraph/test_normalization.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_normalization.py rename to runtime/bindings/python/tests/test_ngraph/test_normalization.py diff --git a/ngraph/python/tests/test_ngraph/test_ops.py b/runtime/bindings/python/tests/test_ngraph/test_ops.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_ops.py rename to runtime/bindings/python/tests/test_ngraph/test_ops.py diff --git a/ngraph/python/tests/test_ngraph/test_ops_binary.py b/runtime/bindings/python/tests/test_ngraph/test_ops_binary.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_ops_binary.py rename to runtime/bindings/python/tests/test_ngraph/test_ops_binary.py diff --git a/ngraph/python/tests/test_ngraph/test_ops_fused.py b/runtime/bindings/python/tests/test_ngraph/test_ops_fused.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_ops_fused.py rename to runtime/bindings/python/tests/test_ngraph/test_ops_fused.py diff --git a/ngraph/python/tests/test_ngraph/test_ops_matmul.py b/runtime/bindings/python/tests/test_ngraph/test_ops_matmul.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_ops_matmul.py rename to runtime/bindings/python/tests/test_ngraph/test_ops_matmul.py diff --git a/ngraph/python/tests/test_ngraph/test_ops_multioutput.py b/runtime/bindings/python/tests/test_ngraph/test_ops_multioutput.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_ops_multioutput.py rename to runtime/bindings/python/tests/test_ngraph/test_ops_multioutput.py diff --git a/ngraph/python/tests/test_ngraph/test_ops_reshape.py b/runtime/bindings/python/tests/test_ngraph/test_ops_reshape.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_ops_reshape.py rename to runtime/bindings/python/tests/test_ngraph/test_ops_reshape.py diff --git a/ngraph/python/tests/test_ngraph/test_ops_scatter.py b/runtime/bindings/python/tests/test_ngraph/test_ops_scatter.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_ops_scatter.py rename to runtime/bindings/python/tests/test_ngraph/test_ops_scatter.py diff --git a/ngraph/python/tests/test_ngraph/test_ops_unary.py b/runtime/bindings/python/tests/test_ngraph/test_ops_unary.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_ops_unary.py rename to runtime/bindings/python/tests/test_ngraph/test_ops_unary.py diff --git a/ngraph/python/tests/test_ngraph/test_pooling.py b/runtime/bindings/python/tests/test_ngraph/test_pooling.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_pooling.py rename to runtime/bindings/python/tests/test_ngraph/test_pooling.py diff --git a/ngraph/python/tests/test_ngraph/test_proposal.py b/runtime/bindings/python/tests/test_ngraph/test_proposal.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_proposal.py rename to runtime/bindings/python/tests/test_ngraph/test_proposal.py diff --git a/ngraph/python/tests/test_ngraph/test_reduction.py b/runtime/bindings/python/tests/test_ngraph/test_reduction.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_reduction.py rename to runtime/bindings/python/tests/test_ngraph/test_reduction.py diff --git a/ngraph/python/tests/test_ngraph/test_roll.py b/runtime/bindings/python/tests/test_ngraph/test_roll.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_roll.py rename to runtime/bindings/python/tests/test_ngraph/test_roll.py diff --git a/ngraph/python/tests/test_ngraph/test_sequence_processing.py b/runtime/bindings/python/tests/test_ngraph/test_sequence_processing.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_sequence_processing.py rename to runtime/bindings/python/tests/test_ngraph/test_sequence_processing.py diff --git a/ngraph/python/tests/test_ngraph/test_swish.py b/runtime/bindings/python/tests/test_ngraph/test_swish.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_swish.py rename to runtime/bindings/python/tests/test_ngraph/test_swish.py diff --git a/ngraph/python/tests/test_ngraph/test_utils.py b/runtime/bindings/python/tests/test_ngraph/test_utils.py similarity index 100% rename from ngraph/python/tests/test_ngraph/test_utils.py rename to runtime/bindings/python/tests/test_ngraph/test_utils.py diff --git a/ngraph/python/tests/test_ngraph/util.py b/runtime/bindings/python/tests/test_ngraph/util.py similarity index 100% rename from ngraph/python/tests/test_ngraph/util.py rename to runtime/bindings/python/tests/test_ngraph/util.py diff --git a/ngraph/python/tests/test_onnx/__init__.py b/runtime/bindings/python/tests/test_onnx/__init__.py similarity index 100% rename from ngraph/python/tests/test_onnx/__init__.py rename to runtime/bindings/python/tests/test_onnx/__init__.py diff --git a/ngraph/python/tests/test_onnx/model_zoo_preprocess.sh b/runtime/bindings/python/tests/test_onnx/model_zoo_preprocess.sh similarity index 100% rename from ngraph/python/tests/test_onnx/model_zoo_preprocess.sh rename to runtime/bindings/python/tests/test_onnx/model_zoo_preprocess.sh diff --git a/ngraph/python/tests/test_onnx/models/add_abc.onnx b/runtime/bindings/python/tests/test_onnx/models/add_abc.onnx similarity index 100% rename from ngraph/python/tests/test_onnx/models/add_abc.onnx rename to runtime/bindings/python/tests/test_onnx/models/add_abc.onnx diff --git a/ngraph/python/tests/test_onnx/models/data/tensor.data b/runtime/bindings/python/tests/test_onnx/models/data/tensor.data similarity index 100% rename from ngraph/python/tests/test_onnx/models/data/tensor.data rename to runtime/bindings/python/tests/test_onnx/models/data/tensor.data diff --git a/ngraph/python/tests/test_onnx/models/external_data.onnx b/runtime/bindings/python/tests/test_onnx/models/external_data.onnx similarity index 100% rename from ngraph/python/tests/test_onnx/models/external_data.onnx rename to runtime/bindings/python/tests/test_onnx/models/external_data.onnx diff --git a/ngraph/python/tests/test_onnx/test_backend.py b/runtime/bindings/python/tests/test_onnx/test_backend.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_backend.py rename to runtime/bindings/python/tests/test_onnx/test_backend.py diff --git a/ngraph/python/tests/test_onnx/test_onnx_external_data.py b/runtime/bindings/python/tests/test_onnx/test_onnx_external_data.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_onnx_external_data.py rename to runtime/bindings/python/tests/test_onnx/test_onnx_external_data.py diff --git a/ngraph/python/tests/test_onnx/test_onnx_import.py b/runtime/bindings/python/tests/test_onnx/test_onnx_import.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_onnx_import.py rename to runtime/bindings/python/tests/test_onnx/test_onnx_import.py diff --git a/ngraph/python/tests/test_onnx/test_ops_batchnorm.py b/runtime/bindings/python/tests/test_onnx/test_ops_batchnorm.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_ops_batchnorm.py rename to runtime/bindings/python/tests/test_onnx/test_ops_batchnorm.py diff --git a/ngraph/python/tests/test_onnx/test_ops_binary.py b/runtime/bindings/python/tests/test_onnx/test_ops_binary.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_ops_binary.py rename to runtime/bindings/python/tests/test_onnx/test_ops_binary.py diff --git a/ngraph/python/tests/test_onnx/test_ops_convpool.py b/runtime/bindings/python/tests/test_onnx/test_ops_convpool.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_ops_convpool.py rename to runtime/bindings/python/tests/test_onnx/test_ops_convpool.py diff --git a/ngraph/python/tests/test_onnx/test_ops_logical.py b/runtime/bindings/python/tests/test_onnx/test_ops_logical.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_ops_logical.py rename to runtime/bindings/python/tests/test_onnx/test_ops_logical.py diff --git a/ngraph/python/tests/test_onnx/test_ops_matmul.py b/runtime/bindings/python/tests/test_onnx/test_ops_matmul.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_ops_matmul.py rename to runtime/bindings/python/tests/test_onnx/test_ops_matmul.py diff --git a/ngraph/python/tests/test_onnx/test_ops_nonlinear.py b/runtime/bindings/python/tests/test_onnx/test_ops_nonlinear.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_ops_nonlinear.py rename to runtime/bindings/python/tests/test_onnx/test_ops_nonlinear.py diff --git a/ngraph/python/tests/test_onnx/test_ops_reduction.py b/runtime/bindings/python/tests/test_onnx/test_ops_reduction.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_ops_reduction.py rename to runtime/bindings/python/tests/test_onnx/test_ops_reduction.py diff --git a/ngraph/python/tests/test_onnx/test_ops_reshape.py b/runtime/bindings/python/tests/test_onnx/test_ops_reshape.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_ops_reshape.py rename to runtime/bindings/python/tests/test_onnx/test_ops_reshape.py diff --git a/ngraph/python/tests/test_onnx/test_ops_unary.py b/runtime/bindings/python/tests/test_onnx/test_ops_unary.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_ops_unary.py rename to runtime/bindings/python/tests/test_onnx/test_ops_unary.py diff --git a/ngraph/python/tests/test_onnx/test_ops_variadic.py b/runtime/bindings/python/tests/test_onnx/test_ops_variadic.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_ops_variadic.py rename to runtime/bindings/python/tests/test_onnx/test_ops_variadic.py diff --git a/ngraph/python/tests/test_onnx/test_zoo_models.py b/runtime/bindings/python/tests/test_onnx/test_zoo_models.py similarity index 100% rename from ngraph/python/tests/test_onnx/test_zoo_models.py rename to runtime/bindings/python/tests/test_onnx/test_zoo_models.py diff --git a/ngraph/python/tests/test_onnx/utils/__init__.py b/runtime/bindings/python/tests/test_onnx/utils/__init__.py similarity index 100% rename from ngraph/python/tests/test_onnx/utils/__init__.py rename to runtime/bindings/python/tests/test_onnx/utils/__init__.py diff --git a/ngraph/python/tests/test_onnx/utils/model_importer.py b/runtime/bindings/python/tests/test_onnx/utils/model_importer.py similarity index 100% rename from ngraph/python/tests/test_onnx/utils/model_importer.py rename to runtime/bindings/python/tests/test_onnx/utils/model_importer.py diff --git a/ngraph/python/tests/test_onnx/utils/onnx_backend.py b/runtime/bindings/python/tests/test_onnx/utils/onnx_backend.py similarity index 100% rename from ngraph/python/tests/test_onnx/utils/onnx_backend.py rename to runtime/bindings/python/tests/test_onnx/utils/onnx_backend.py diff --git a/ngraph/python/tests/test_onnx/utils/onnx_helpers.py b/runtime/bindings/python/tests/test_onnx/utils/onnx_helpers.py similarity index 100% rename from ngraph/python/tests/test_onnx/utils/onnx_helpers.py rename to runtime/bindings/python/tests/test_onnx/utils/onnx_helpers.py diff --git a/runtime/bindings/python/thirdparty/pybind11 b/runtime/bindings/python/thirdparty/pybind11 new file mode 160000 index 00000000000..d71ba0cb736 --- /dev/null +++ b/runtime/bindings/python/thirdparty/pybind11 @@ -0,0 +1 @@ +Subproject commit d71ba0cb73616c493d35699a8a9283aa64ef0f6b diff --git a/ngraph/python/tox.ini b/runtime/bindings/python/tox.ini similarity index 100% rename from ngraph/python/tox.ini rename to runtime/bindings/python/tox.ini diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index ac094ce648b..4a56a98229a 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -10,14 +10,14 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}" SKIP "${OpenVINO_SOURCE_DIR}/bin" "${OpenVINO_SOURCE_DIR}/build" "${OpenVINO_SOURCE_DIR}/thirdparty" - "${OpenVINO_SOURCE_DIR}/ngraph/python/pybind11" + "${OpenVINO_SOURCE_DIR}/runtime/bindings/python/thirdparty/pybind11" "${IE_MAIN_SOURCE_DIR}/thirdparty" "${TEMP}" # TODO fix and enable back: "${OpenVINO_SOURCE_DIR}/inference-engine/scripts/dependencies.sh" "${OpenVINO_SOURCE_DIR}/scripts/install_dependencies/install_NEO_OCL_driver.sh" "${OpenVINO_SOURCE_DIR}/scripts/install_dependencies/install_openvino_dependencies.sh" - "${OpenVINO_SOURCE_DIR}/ngraph/python/tests/test_onnx/model_zoo_preprocess.sh" + "${OpenVINO_SOURCE_DIR}/runtime/bindings/python/tests/test_onnx/model_zoo_preprocess.sh" ) #