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

Removed NGRAPH_PYTHON_BUILD_ENABLE (#6556)

Browse Source
This commit is contained in:
Ilya Lavrenov 2021-07-07 21:23:36 +03:00 committed by GitHub
parent e9011a9536
commit 35d9bd0f63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -63,12 +63,6 @@ function(build_ngraph)
ngraph_set(NGRAPH_PDPD_FRONTEND_ENABLE OFF) ngraph_set(NGRAPH_PDPD_FRONTEND_ENABLE OFF)
endif() endif()
if(ENABLE_PYTHON)
ngraph_set(NGRAPH_PYTHON_BUILD_ENABLE ON)
else()
ngraph_set(NGRAPH_PYTHON_BUILD_ENABLE OFF)
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$") if(CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
ie_add_compiler_flags(-Wno-error=uninitialized -Wno-error=literal-conversion) ie_add_compiler_flags(-Wno-error=uninitialized -Wno-error=literal-conversion)
elseif(UNIX) elseif(UNIX)

2
inference-engine/ie_bridges/python/CMakeLists.txt
View File

@ -68,7 +68,7 @@ if(ENABLE_WHEEL)
add_subdirectory(wheel) add_subdirectory(wheel)
endif() endif()
if (NGRAPH_PYTHON_BUILD_ENABLE) if(TARGET _pyngraph)
add_dependencies(ie_api _pyngraph) add_dependencies(ie_api _pyngraph)
endif() endif()

5
inference-engine/ie_bridges/python/README.md
View File

@ -61,11 +61,6 @@ sudo apt install patchelf
-DENABLE_PYTHON=ON -DENABLE_PYTHON=ON
-DENABLE_WHEEL=ON -DENABLE_WHEEL=ON
``` ```
If you need to include other components to the package you need to enable them too.
For example, to include ngraph python API:
```shellscript
-NGRAPH_PYTHON_BUILD_ENABLE=ON
```
## Running sample ## Running sample

6
model-optimizer/CMakeLists.txt
View File

@ -1,10 +1,8 @@
# Copyright (C) 2018-2021 Intel Corporation # Copyright (C) 2018-2021 Intel Corporation
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if (NOT NGRAPH_PYTHON_BUILD_ENABLE) if(NOT ENABLE_PYTHON)
message(WARNING "Please enable nGraph Python API (_pyngraph) target to enable Model Optimizer target") message(WARNING "Please enable IE & nGraph Python API (ie_api and offline_transformations_api) targets to enable Model Optimizer target")
elseif(NOT ENABLE_PYTHON)
message(WARNING "Please enable IE Python API (ie_api and offline_transformations_api) targets to enable Model Optimizer target")
else() else()
add_custom_target(model_optimizer DEPENDS ie_api offline_transformations_api inference_engine_ir_reader) add_custom_target(model_optimizer DEPENDS ie_api offline_transformations_api inference_engine_ir_reader)
if(ENABLE_TESTS) if(ENABLE_TESTS)

4
ngraph/CMakeLists.txt
View File

@ -23,7 +23,6 @@ option(NGRAPH_DEBUG_ENABLE "Enable output for NGRAPH_DEBUG statements" OFF)
option(NGRAPH_ONNX_IMPORT_ENABLE "Enable ONNX importer" OFF) option(NGRAPH_ONNX_IMPORT_ENABLE "Enable ONNX importer" OFF)
option(NGRAPH_ONNX_EDITOR_ENABLE "Enable ONNX Editor" OFF) option(NGRAPH_ONNX_EDITOR_ENABLE "Enable ONNX Editor" OFF)
option(NGRAPH_PDPD_FRONTEND_ENABLE "Enable PaddlePaddle FrontEnd" OFF) option(NGRAPH_PDPD_FRONTEND_ENABLE "Enable PaddlePaddle FrontEnd" OFF)
option(NGRAPH_PYTHON_BUILD_ENABLE "Enable build nGraph python package wheel" OFF)
option(NGRAPH_USE_PROTOBUF_LITE "Compiles and links with protobuf-lite" OFF) option(NGRAPH_USE_PROTOBUF_LITE "Compiles and links with protobuf-lite" OFF)
if (NGRAPH_ONNX_IMPORT_ENABLE OR NGRAPH_PDPD_FRONTEND_ENABLE) if (NGRAPH_ONNX_IMPORT_ENABLE OR NGRAPH_PDPD_FRONTEND_ENABLE)
@ -37,7 +36,6 @@ message(STATUS "NGRAPH_DEBUG_ENABLE: ${NGRAPH_DEBUG_ENABLE}")
message(STATUS "NGRAPH_ONNX_IMPORT_ENABLE: ${NGRAPH_ONNX_IMPORT_ENABLE}") message(STATUS "NGRAPH_ONNX_IMPORT_ENABLE: ${NGRAPH_ONNX_IMPORT_ENABLE}")
message(STATUS "NGRAPH_ONNX_EDITOR_ENABLE: ${NGRAPH_ONNX_EDITOR_ENABLE}") message(STATUS "NGRAPH_ONNX_EDITOR_ENABLE: ${NGRAPH_ONNX_EDITOR_ENABLE}")
message(STATUS "NGRAPH_PDPD_FRONTEND_ENABLE: ${NGRAPH_PDPD_FRONTEND_ENABLE}") message(STATUS "NGRAPH_PDPD_FRONTEND_ENABLE: ${NGRAPH_PDPD_FRONTEND_ENABLE}")
message(STATUS "NGRAPH_PYTHON_BUILD_ENABLE: ${NGRAPH_PYTHON_BUILD_ENABLE}")
message(STATUS "NGRAPH_USE_PROTOBUF_LITE: ${NGRAPH_USE_PROTOBUF_LITE}") message(STATUS "NGRAPH_USE_PROTOBUF_LITE: ${NGRAPH_USE_PROTOBUF_LITE}")
message(STATUS "NGRAPH_UNIT_TEST_ENABLE: ${NGRAPH_UNIT_TEST_ENABLE}") message(STATUS "NGRAPH_UNIT_TEST_ENABLE: ${NGRAPH_UNIT_TEST_ENABLE}")
message(STATUS "NGRAPH_UNIT_TEST_BACKENDS_ENABLE: ${NGRAPH_UNIT_TEST_BACKENDS_ENABLE}") message(STATUS "NGRAPH_UNIT_TEST_BACKENDS_ENABLE: ${NGRAPH_UNIT_TEST_BACKENDS_ENABLE}")
@ -202,6 +200,6 @@ add_subdirectory(frontend)
add_subdirectory(test) add_subdirectory(test)
if (NGRAPH_PYTHON_BUILD_ENABLE) if (ENABLE_PYTHON)
add_subdirectory(python) add_subdirectory(python)
endif() endif()

2
ngraph/python/BUILDING.md
View File

@ -48,7 +48,6 @@ set the mentioned flags to `ON`. Note the `CMAKE_INSTALL_PREFIX`, which defaults
-DENABLE_OPENCV=OFF \ -DENABLE_OPENCV=OFF \
-DENABLE_VPU=OFF \ -DENABLE_VPU=OFF \
-DENABLE_PYTHON=ON \ -DENABLE_PYTHON=ON \
-DNGRAPH_PYTHON_BUILD_ENABLE=ON \
-DNGRAPH_ONNX_IMPORT_ENABLE=ON \ -DNGRAPH_ONNX_IMPORT_ENABLE=ON \
-DCMAKE_INSTALL_PREFIX="${OPENVINO_BASEDIR}/openvino_dist" -DCMAKE_INSTALL_PREFIX="${OPENVINO_BASEDIR}/openvino_dist"
@ -111,7 +110,6 @@ cmake .. ^
-DENABLE_CLDNN=OFF ^ -DENABLE_CLDNN=OFF ^
-DENABLE_OPENCV=OFF ^ -DENABLE_OPENCV=OFF ^
-DENABLE_VPU=OFF ^ -DENABLE_VPU=OFF ^
-DNGRAPH_PYTHON_BUILD_ENABLE=ON ^
-DNGRAPH_ONNX_IMPORT_ENABLE=ON ^ -DNGRAPH_ONNX_IMPORT_ENABLE=ON ^
-DENABLE_PYTHON=ON ^ -DENABLE_PYTHON=ON ^
-DCMAKE_CXX_COMPILER="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.27.29110\bin\Hostx64\x64" -DCMAKE_CXX_COMPILER="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.27.29110\bin\Hostx64\x64"

2
ngraph/python/setup.py
View File

@ -155,7 +155,7 @@ class BuildCMakeExt(build_ext):
ext_args = self.cmake_args.split() if self.cmake_args else [] ext_args = self.cmake_args.split() if self.cmake_args else []
self.spawn(["cmake", "-H" + root_dir, "-B" + self.build_temp, self.spawn(["cmake", "-H" + root_dir, "-B" + self.build_temp,
"-DCMAKE_BUILD_TYPE={}".format(self.config), "-DCMAKE_BUILD_TYPE={}".format(self.config),
"-DNGRAPH_PYTHON_BUILD_ENABLE=ON", "-DENABLE_PYTHON=ON",
"-DNGRAPH_ONNX_IMPORT_ENABLE=ON"] + ext_args) "-DNGRAPH_ONNX_IMPORT_ENABLE=ON"] + ext_args)
self.announce("Building binaries", level=3) self.announce("Building binaries", level=3)