Skip to content

Commit 2eaed97

Browse files
vurusovsilyachur
andauthored
Remove G-API (openvinotoolkit#21131)
* Remove G-API * Apply comments * Revert "Apply comments" - tests shared classes only This reverts commit 8d07082. --------- Co-authored-by: Ilya Churaev <ilyachur@gmail.com>
1 parent b6ba240 commit 2eaed97

File tree

63 files changed

+37
-24525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+37
-24525
lines changed

.gitmodules

-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
path = thirdparty/pugixml
1515
url = https://github.com/zeux/pugixml.git
1616
ignore = dirty
17-
[submodule "thirdparty/ade"]
18-
path = thirdparty/ade
19-
url = https://github.com/opencv/ade.git
20-
ignore = dirty
2117
[submodule "thirdparty/gflags/gflags"]
2218
path = thirdparty/gflags/gflags
2319
url = https://github.com/gflags/gflags.git

cmake/features.cmake

-4
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ endif()
103103
ov_dependent_option (ENABLE_TBBBIND_2_5 "Enable TBBBind_2_5 static usage in OpenVINO runtime" ${ENABLE_TBBBIND_2_5_DEFAULT} "THREADING MATCHES TBB; NOT APPLE" OFF)
104104
ov_dependent_option (ENABLE_TBB_RELEASE_ONLY "Only Release TBB libraries are linked to the OpenVINO Runtime binaries" ON "THREADING MATCHES TBB;LINUX" OFF)
105105

106-
ov_dependent_option (ENABLE_GAPI_PREPROCESSING "Enables G-API preprocessing" ON "NOT MINGW64" OFF)
107-
108106
ov_option (ENABLE_MULTI "Enables MULTI Device Plugin" ON)
109107
ov_option (ENABLE_AUTO "Enables AUTO Device Plugin" ON)
110108
ov_option (ENABLE_AUTO_BATCH "Enables Auto-Batching Plugin" ON)
@@ -113,8 +111,6 @@ ov_option (ENABLE_TEMPLATE "Enable template plugin" ON)
113111

114112
ov_dependent_option (ENABLE_PLUGINS_XML "Generate plugins.xml configuration file or not" OFF "BUILD_SHARED_LIBS" OFF)
115113

116-
ov_dependent_option (GAPI_TEST_PERF "if GAPI unit tests should examine performance" OFF "ENABLE_TESTS;ENABLE_GAPI_PREPROCESSING" OFF)
117-
118114
ov_dependent_option (ENABLE_FUNCTIONAL_TESTS "functional tests" ON "ENABLE_TESTS" OFF)
119115

120116
ov_option (ENABLE_SAMPLES "console samples are part of OpenVINO Runtime package" ON)

cmake/templates/OpenVINOConfig.cmake.in

-14
Original file line numberDiff line numberDiff line change
@@ -333,17 +333,6 @@ macro(_ov_find_itt)
333333
unset(_ENABLE_SYSTEM_ITTAPI)
334334
endmacro()
335335

336-
macro(_ov_find_ade)
337-
set(_OV_ENABLE_GAPI_PREPROCESSING "@ENABLE_GAPI_PREPROCESSING@")
338-
# whether 'ade' is found via find_package
339-
set(_ENABLE_SYSTEM_ADE "@ade_FOUND@")
340-
if(_OV_ENABLE_GAPI_PREPROCESSING AND _ENABLE_SYSTEM_ADE)
341-
_ov_find_dependency(ade @ade_VERSION@)
342-
endif()
343-
unset(_OV_ENABLE_GAPI_PREPROCESSING)
344-
unset(_ENABLE_SYSTEM_ADE)
345-
endmacro()
346-
347336
macro(_ov_find_intel_cpu_dependencies)
348337
set(_OV_ENABLE_CPU_ACL "@DNNL_USE_ACL@")
349338
if(_OV_ENABLE_CPU_ACL)
@@ -493,9 +482,6 @@ if(NOT _OV_ENABLE_OPENVINO_BUILD_SHARED)
493482
_ov_find_itt()
494483
_ov_find_pugixml()
495484

496-
# preprocessing dependencies
497-
_ov_find_ade()
498-
499485
# frontend dependencies
500486
_ov_find_protobuf_frontend_dependency()
501487
_ov_find_tensorflow_frontend_dependencies()

docs/articles_en/documentation/openvino_legacy_features/api_2_0_transition_guide/deployment_migration.rst

-3
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ OpenVINO 2022.1 introduced a reorganization of the libraries, to make deployment
205205
Below are detailed comparisons of the library structure between OpenVINO 2022.1 and the previous versions:
206206

207207
* Starting with 2022.1 release, a single core library with all the functionalities (``openvino`` for C++ Runtime, ``openvino_c`` for Inference Engine API C interface) is used, instead of the previous core libraries which contained ``inference_engine``, ``ngraph``, ``inference_engine_transformations`` and ``inference_engine_lp_transformations``.
208-
* The optional ``inference_engine_preproc`` preprocessing library (if `InferenceEngine::PreProcessInfo::setColorFormat <classInferenceEngine_1_1PreProcessInfo.html#doxid-class-inference-engine-1-1-pre-process-info-1a3a10ba0d562a2268fe584d4d2db94cac>`__ or `InferenceEngine::PreProcessInfo::setResizeAlgorithm <classInferenceEngine_1_1PreProcessInfo.html#doxid-class-inference-engine-1-1-pre-process-info-1a0c083c43d01c53c327f09095e3e3f004>`__ is used) has been renamed to ``openvino_gapi_preproc`` and deprecated in 2022.1. For more details, see the :doc:`Preprocessing capabilities of OpenVINO API 2.0 <openvino_2_0_preprocessing>`.
209208

210209
* The libraries of plugins have been renamed as follows:
211210

@@ -234,8 +233,6 @@ Older versions of OpenVINO had several core libraries and plugin modules:
234233
Now, the modularity is more clear:
235234
- A single core library with all the functionality ``openvino`` for C++ runtime
236235
- ``openvino_c`` with Inference Engine API C interface
237-
- **Deprecated** Optional ``openvino_gapi_preproc`` preprocessing library (if ``InferenceEngine::PreProcessInfo::setColorFormat`` or ``InferenceEngine::PreProcessInfo::setResizeAlgorithm`` are used)
238-
- Use :doc:`preprocessing capabilities of OpenVINO API 2.0 <openvino_2_0_preprocessing>`
239236
- Plugin libraries with clear names:
240237
- ``openvino_intel_cpu_plugin``
241238
- ``openvino_intel_gpu_plugin``

docs/articles_en/openvino_workflow/deployment_intro/conditional_compilation_deployment.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ Generate final optimal binaries size of OpenVINO package
278278
md build
279279
cd build
280280
281-
cmake -G "Visual Studio 16 2019" -A x64 -DENABLE_CPPLINT=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DENABLE_FASTER_BUILD=ON -DENABLE_PROFILING_ITT=OFF -DSELECTIVE_BUILD=ON -DENABLE_INTEL_GPU=OFF -DENABLE_MULTI=OFF -DENABLE_AUTO=OFF -DENABLE_AUTO_BATCH=OFF -DENABLE_HETERO=OFF -DENABLE_TEMPLATE=OFF -DENABLE_OV_ONNX_FRONTEND=OFF -DENABLE_OV_PADDLE_FRONTEND=OFF -DENABLE_OV_PYTORCH_FRONTEND=OFF -DENABLE_OV_TF_FRONTEND=OFF -DSELECTIVE_BUILD_STAT=%OPENVINO_HOME%\cc_data\*.csv -DBUILD_SHARED_LIBS=OFF -DENABLE_LTO=ON -DENABLE_ONEDNN_FOR_GPU=OFF -DENABLE_GAPI_PREPROCESSING=OFF -DENABLE_OV_TF_LITE_FRONTEND=OFF -DENABLE_PROFILING_FIRST_INFERENCE=OFF ..
281+
cmake -G "Visual Studio 16 2019" -A x64 -DENABLE_CPPLINT=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DENABLE_FASTER_BUILD=ON -DENABLE_PROFILING_ITT=OFF -DSELECTIVE_BUILD=ON -DENABLE_INTEL_GPU=OFF -DENABLE_MULTI=OFF -DENABLE_AUTO=OFF -DENABLE_AUTO_BATCH=OFF -DENABLE_HETERO=OFF -DENABLE_TEMPLATE=OFF -DENABLE_OV_ONNX_FRONTEND=OFF -DENABLE_OV_PADDLE_FRONTEND=OFF -DENABLE_OV_PYTORCH_FRONTEND=OFF -DENABLE_OV_TF_FRONTEND=OFF -DSELECTIVE_BUILD_STAT=%OPENVINO_HOME%\cc_data\*.csv -DBUILD_SHARED_LIBS=OFF -DENABLE_LTO=ON -DENABLE_ONEDNN_FOR_GPU=OFF -DENABLE_OV_TF_LITE_FRONTEND=OFF -DENABLE_PROFILING_FIRST_INFERENCE=OFF ..
282282
283283
cmake --build . --config Release
284284

docs/dev/cmake_options_for_custom_compilation.md

-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ This document provides description and default values for CMake options that can
4444
* `ON` is default.
4545
* `ENABLE_OV_IR_FRONTEND` enables OpenVINO Intermediate Representation frontend plugin for OpenVINO Runtime:
4646
* `ON` is default.
47-
* `ENABLE_GAPI_PREPROCESSING` enables G-API preprocessing:
48-
* `ON` is default.
4947
* `OPENVINO_EXTRA_MODULES` specifies path to add extra OpenVINO modules to the build.
5048
* See [OpenVINO Contrib] to add extra modules from.
5149
* `ENABLE_SAMPLES` enables OpenVINO Runtime samples build:

docs/dev/static_libaries.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ cmake -DENABLE_INTEL_GPU=OFF \
4747
-DENABLE_OV_TF_FRONTEND=OFF \
4848
-DENABLE_OV_TF_LITE_FRONTEND=OFF \
4949
-DENABLE_OV_PYTORCH_FRONTEND=OFF \
50-
-DENABLE_GAPI_PREPROCESSING=OFF \
5150
-DENABLE_INTEL_CPU=ON \
5251
-DENABLE_OV_IR_FRONTEND=ON
5352
```
@@ -150,4 +149,4 @@ cmake -DCMAKE_TOOLCHAIN_FILE=<openvino source dir>/cmake/toolchains/mt.runtime.w
150149
* [OpenVINO Developer Documentation](index.md)
151150
* [How to Build OpenVINO](build.md)
152151

153-
152+

src/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ add_subdirectory(frontends)
1818
add_subdirectory(plugins)
1919
add_subdirectory(inference)
2020
include(cmake/openvino.cmake)
21-
# preprocessing has dependency on `openvino` for static build
22-
add_subdirectory(common/preprocessing)
2321
add_subdirectory(bindings)
2422

2523
if(ENABLE_TESTS)

src/cmake/openvino.cmake

+1-5
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,7 @@ add_library(openvino::runtime::dev ALIAS openvino_runtime_dev)
108108

109109
target_include_directories(openvino_runtime_dev INTERFACE
110110
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/inference/dev_api>
111-
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/common/low_precision_transformations/include>
112-
$<BUILD_INTERFACE:$<TARGET_PROPERTY:openvino_gapi_preproc,INTERFACE_INCLUDE_DIRECTORIES>>)
113-
114-
target_compile_definitions(openvino_runtime_dev INTERFACE
115-
$<TARGET_PROPERTY:openvino_gapi_preproc,INTERFACE_COMPILE_DEFINITIONS>)
111+
$<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/common/low_precision_transformations/include>)
116112

117113
target_link_libraries(openvino_runtime_dev INTERFACE ${TARGET_NAME} openvino::core::dev)
118114

src/cmake/ov_parallel.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ function(ov_set_threading_interface_for TARGET_NAME)
265265
set(LINK_TYPE "PRIVATE")
266266
set(COMPILE_DEF_TYPE "PRIVATE")
267267
elseif(target_type STREQUAL "STATIC_LIBRARY")
268-
# Affected libraries: inference_engine_s, openvino_gapi_preproc_s
268+
# Affected libraries: inference_engine_s
269269
# they don't have TBB in public headers => PRIVATE
270270
set(LINK_TYPE "PRIVATE")
271271
set(COMPILE_DEF_TYPE "PUBLIC")

src/common/preprocessing/CMakeLists.txt

-11
This file was deleted.

src/common/preprocessing/src/CMakeLists.txt

-224
This file was deleted.

0 commit comments

Comments
 (0)