Rename runtime to src (#8842)
* Renamed runtime to src * Removed old paths * Fixed cmake * Fixed doc
This commit is contained in:
parent
7cb378c92b
commit
b1fba3a675
@ -79,7 +79,7 @@ jobs:
|
|||||||
workingDirectory: $(WORK_DIR)
|
workingDirectory: $(WORK_DIR)
|
||||||
displayName: 'Install dependencies'
|
displayName: 'Install dependencies'
|
||||||
|
|
||||||
- script: runtime/bindings/python/tests/test_onnx/model_zoo_preprocess.sh -d $(MODELS_DIR)/models_data -o -s "$(ONNX_MODEL_ZOO_SHA)"
|
- script: src/bindings/python/tests/test_onnx/model_zoo_preprocess.sh -d $(MODELS_DIR)/models_data -o -s "$(ONNX_MODEL_ZOO_SHA)"
|
||||||
displayName: 'Update models'
|
displayName: 'Update models'
|
||||||
condition: ne(variables['BUILD_TYPE'], 'Debug')
|
condition: ne(variables['BUILD_TYPE'], 'Debug')
|
||||||
|
|
||||||
|
@ -72,7 +72,7 @@ RUN cmake .. \
|
|||||||
RUN make -j $(nproc) install
|
RUN make -j $(nproc) install
|
||||||
|
|
||||||
# Run tests via tox
|
# Run tests via tox
|
||||||
WORKDIR /openvino/runtime/bindings/python
|
WORKDIR /openvino/src/bindings/python
|
||||||
ENV OpenVINO_DIR=/openvino/dist/runtime/cmake
|
ENV OpenVINO_DIR=/openvino/dist/runtime/cmake
|
||||||
ENV LD_LIBRARY_PATH=/openvino/dist/runtime/lib:/openvino/dist/runtime/3rdparty/tbb/lib
|
ENV LD_LIBRARY_PATH=/openvino/dist/runtime/lib:/openvino/dist/runtime/3rdparty/tbb/lib
|
||||||
ENV PYTHONPATH=/openvino/bin/intel64/${BUILD_TYPE}/lib/python_api/python3.8:${PYTHONPATH}
|
ENV PYTHONPATH=/openvino/bin/intel64/${BUILD_TYPE}/lib/python_api/python3.8:${PYTHONPATH}
|
||||||
|
4
.ci/openvino-onnx/Jenkinsfile
vendored
4
.ci/openvino-onnx/Jenkinsfile
vendored
@ -93,7 +93,7 @@ def prepare_repository(String workdir) {
|
|||||||
|
|
||||||
def updateModels() {
|
def updateModels() {
|
||||||
sh """
|
sh """
|
||||||
./runtime/bindings/python/tests/test_onnx/model_zoo_preprocess.sh -d ${HOME}/ONNX_CI/models_data -o -s ${ONNX_MODEL_ZOO_SHA}
|
./src/bindings/python/tests/test_onnx/model_zoo_preprocess.sh -d ${HOME}/ONNX_CI/models_data -o -s ${ONNX_MODEL_ZOO_SHA}
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -210,4 +210,4 @@ pipeline {
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
2
.github/dependabot.yml
vendored
2
.github/dependabot.yml
vendored
@ -4,7 +4,7 @@ version: 2
|
|||||||
updates:
|
updates:
|
||||||
# Enable version updates for nGraph Python API
|
# Enable version updates for nGraph Python API
|
||||||
- package-ecosystem: pip
|
- package-ecosystem: pip
|
||||||
directory: "/runtime/bindings/python"
|
directory: "/src/bindings/python"
|
||||||
schedule:
|
schedule:
|
||||||
interval: weekly
|
interval: weekly
|
||||||
day: monday
|
day: monday
|
||||||
|
4
.gitmodules
vendored
4
.gitmodules
vendored
@ -44,8 +44,8 @@
|
|||||||
[submodule "thirdparty/protobuf"]
|
[submodule "thirdparty/protobuf"]
|
||||||
path = thirdparty/protobuf/protobuf
|
path = thirdparty/protobuf/protobuf
|
||||||
url = https://github.com/protocolbuffers/protobuf.git
|
url = https://github.com/protocolbuffers/protobuf.git
|
||||||
[submodule "runtime/bindings/python/thirdparty/pybind11"]
|
[submodule "src/bindings/python/thirdparty/pybind11"]
|
||||||
path = runtime/bindings/python/thirdparty/pybind11
|
path = src/bindings/python/thirdparty/pybind11
|
||||||
url = https://github.com/pybind/pybind11.git
|
url = https://github.com/pybind/pybind11.git
|
||||||
[submodule "thirdparty/ittapi/ittapi"]
|
[submodule "thirdparty/ittapi/ittapi"]
|
||||||
path = thirdparty/ittapi/ittapi
|
path = thirdparty/ittapi/ittapi
|
||||||
|
@ -94,7 +94,7 @@ add_subdirectory(thirdparty)
|
|||||||
add_subdirectory(openvino)
|
add_subdirectory(openvino)
|
||||||
add_subdirectory(ngraph)
|
add_subdirectory(ngraph)
|
||||||
add_subdirectory(inference-engine)
|
add_subdirectory(inference-engine)
|
||||||
add_subdirectory(runtime)
|
add_subdirectory(src)
|
||||||
add_subdirectory(samples)
|
add_subdirectory(samples)
|
||||||
include(cmake/extra_modules.cmake)
|
include(cmake/extra_modules.cmake)
|
||||||
add_subdirectory(model-optimizer)
|
add_subdirectory(model-optimizer)
|
||||||
|
@ -70,7 +70,7 @@ function(build_docs)
|
|||||||
set(C_API "${IE_SOURCE_DIR}/ie_bridges/c/include")
|
set(C_API "${IE_SOURCE_DIR}/ie_bridges/c/include")
|
||||||
set(PLUGIN_API_DIR "${DOCS_BUILD_DIR}/IE_PLUGIN_DG")
|
set(PLUGIN_API_DIR "${DOCS_BUILD_DIR}/IE_PLUGIN_DG")
|
||||||
set(NGRAPH_DIR "${OpenVINO_SOURCE_DIR}/ngraph")
|
set(NGRAPH_DIR "${OpenVINO_SOURCE_DIR}/ngraph")
|
||||||
set(NGRAPH_PY_DIR "${OpenVINO_SOURCE_DIR}/runtime/bindings/python/src/compatibility/ngraph/")
|
set(NGRAPH_PY_DIR "${OpenVINO_SOURCE_DIR}/src/bindings/python/src/compatibility/ngraph/")
|
||||||
set(NGRAPH_CPP_DIR "${NGRAPH_DIR}/core/include/" "${NGRAPH_DIR}/frontend/onnx_import/include")
|
set(NGRAPH_CPP_DIR "${NGRAPH_DIR}/core/include/" "${NGRAPH_DIR}/frontend/onnx_import/include")
|
||||||
|
|
||||||
# Preprocessing scripts
|
# Preprocessing scripts
|
||||||
@ -222,10 +222,10 @@ function(build_docs)
|
|||||||
"${OpenVINO_SOURCE_DIR}/inference-engine/*.png"
|
"${OpenVINO_SOURCE_DIR}/inference-engine/*.png"
|
||||||
"${OpenVINO_SOURCE_DIR}/inference-engine/*.gif"
|
"${OpenVINO_SOURCE_DIR}/inference-engine/*.gif"
|
||||||
"${OpenVINO_SOURCE_DIR}/inference-engine/*.jpg"
|
"${OpenVINO_SOURCE_DIR}/inference-engine/*.jpg"
|
||||||
"${OpenVINO_SOURCE_DIR}/runtime/*.md"
|
"${OpenVINO_SOURCE_DIR}/src/*.md"
|
||||||
"${OpenVINO_SOURCE_DIR}/runtime/*.png"
|
"${OpenVINO_SOURCE_DIR}/src/*.png"
|
||||||
"${OpenVINO_SOURCE_DIR}/runtime/*.gif"
|
"${OpenVINO_SOURCE_DIR}/src/*.gif"
|
||||||
"${OpenVINO_SOURCE_DIR}/runtime/*.jpg"
|
"${OpenVINO_SOURCE_DIR}/src/*.jpg"
|
||||||
"${OpenVINO_SOURCE_DIR}/samples/*.md"
|
"${OpenVINO_SOURCE_DIR}/samples/*.md"
|
||||||
"${OpenVINO_SOURCE_DIR}/samples/*.png"
|
"${OpenVINO_SOURCE_DIR}/samples/*.png"
|
||||||
"${OpenVINO_SOURCE_DIR}/samples/*.gif"
|
"${OpenVINO_SOURCE_DIR}/samples/*.gif"
|
||||||
|
@ -7,7 +7,7 @@ The OpenVINO™ Python\* package available in the `<INSTALL_DIR>/python/python3.
|
|||||||
|
|
||||||
The OpenVINO™ Python\* package includes the following sub-packages:
|
The OpenVINO™ Python\* package includes the following sub-packages:
|
||||||
|
|
||||||
- [openvino.inference_engine](../../runtime/bindings/python/docs/api_overview.md) - Python\* wrapper on OpenVINO™ Inference Engine.
|
- [openvino.inference_engine](../../src/bindings/python/docs/api_overview.md) - Python\* wrapper on OpenVINO™ Inference Engine.
|
||||||
- `openvino.tools.accuracy_checker` - Measure accuracy.
|
- `openvino.tools.accuracy_checker` - Measure accuracy.
|
||||||
- `openvino.tools.benchmark` - Measure latency and throughput.
|
- `openvino.tools.benchmark` - Measure latency and throughput.
|
||||||
|
|
||||||
|
@ -274,4 +274,4 @@ exec_net = ie.load_network(network=net, device_name="CPU")
|
|||||||
result_ie = exec_net.infer(input_data)
|
result_ie = exec_net.infer(input_data)
|
||||||
```
|
```
|
||||||
|
|
||||||
For more information about Python API, refer to [Inference Engine Python API Overview](../../../../../runtime/bindings/python/docs/api_overview.md).
|
For more information about Python API, refer to [Inference Engine Python API Overview](../../../../../src/bindings/python/docs/api_overview.md).
|
||||||
|
@ -10,15 +10,15 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}"
|
|||||||
SKIP "${OpenVINO_SOURCE_DIR}/bin"
|
SKIP "${OpenVINO_SOURCE_DIR}/bin"
|
||||||
"${OpenVINO_SOURCE_DIR}/build"
|
"${OpenVINO_SOURCE_DIR}/build"
|
||||||
"${OpenVINO_SOURCE_DIR}/thirdparty"
|
"${OpenVINO_SOURCE_DIR}/thirdparty"
|
||||||
"${OpenVINO_SOURCE_DIR}/runtime/bindings/python/thirdparty/pybind11"
|
"${OpenVINO_SOURCE_DIR}/src/bindings/python/thirdparty/pybind11"
|
||||||
"${IE_MAIN_SOURCE_DIR}/thirdparty"
|
"${IE_MAIN_SOURCE_DIR}/thirdparty"
|
||||||
"${OpenVINO_SOURCE_DIR}/tools/pot/thirdparty"
|
"${OpenVINO_SOURCE_DIR}/tools/pot/thirdparty"
|
||||||
"${TEMP}"
|
"${TEMP}"
|
||||||
# TODO fix and enable back:
|
# TODO fix and enable back:
|
||||||
"${OpenVINO_SOURCE_DIR}/scripts/install_dependencies/install_NEO_OCL_driver.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}/scripts/install_dependencies/install_openvino_dependencies.sh"
|
||||||
"${OpenVINO_SOURCE_DIR}/runtime/bindings/python/tests/test_onnx/model_zoo_preprocess.sh"
|
"${OpenVINO_SOURCE_DIR}/src/bindings/python/tests/test_onnx/model_zoo_preprocess.sh"
|
||||||
"${OpenVINO_SOURCE_DIR}/runtime/bindings/python/tests_compatibility/test_onnx/model_zoo_preprocess.sh"
|
"${OpenVINO_SOURCE_DIR}/src/bindings/python/tests_compatibility/test_onnx/model_zoo_preprocess.sh"
|
||||||
)
|
)
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -19,7 +19,7 @@ from distutils.command.build import build as _build
|
|||||||
__version__ = os.environ.get("NGRAPH_VERSION", "0.0.0.dev0")
|
__version__ = os.environ.get("NGRAPH_VERSION", "0.0.0.dev0")
|
||||||
PYTHON_API_ROOT_DIR = os.path.abspath(os.path.dirname(__file__))
|
PYTHON_API_ROOT_DIR = os.path.abspath(os.path.dirname(__file__))
|
||||||
OPENVINO_ROOT_DIR = os.path.normpath(os.path.join(PYTHON_API_ROOT_DIR, "../../.."))
|
OPENVINO_ROOT_DIR = os.path.normpath(os.path.join(PYTHON_API_ROOT_DIR, "../../.."))
|
||||||
# Change current working directory to runtime/bindings/python
|
# Change current working directory to src/bindings/python
|
||||||
os.chdir(PYTHON_API_ROOT_DIR)
|
os.chdir(PYTHON_API_ROOT_DIR)
|
||||||
|
|
||||||
NGRAPH_LIBS = ["ngraph", "openvino"]
|
NGRAPH_LIBS = ["ngraph", "openvino"]
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user