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 <[email protected]>
kumaripa-13 · Dec 25, 2023 · 2eaed97 · 2eaed97
1 parent b6ba240
commit 2eaed97
Show file tree

Hide file tree

Showing 63 changed files with 37 additions and 24,525 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -14,10 +14,6 @@
 	path = thirdparty/pugixml
 	url = https://github.com/zeux/pugixml.git
 	ignore = dirty
-[submodule "thirdparty/ade"]
-	path = thirdparty/ade
-	url = https://github.com/opencv/ade.git
-	ignore = dirty
 [submodule "thirdparty/gflags/gflags"]
 	path = thirdparty/gflags/gflags
 	url = https://github.com/gflags/gflags.git

diff --git a/cmake/features.cmake b/cmake/features.cmake
@@ -103,8 +103,6 @@ endif()
 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)
 ov_dependent_option (ENABLE_TBB_RELEASE_ONLY "Only Release TBB libraries are linked to the OpenVINO Runtime binaries" ON "THREADING MATCHES TBB;LINUX" OFF)
 
-ov_dependent_option (ENABLE_GAPI_PREPROCESSING "Enables G-API preprocessing" ON "NOT MINGW64" OFF)
-
 ov_option (ENABLE_MULTI "Enables MULTI Device Plugin" ON)
 ov_option (ENABLE_AUTO "Enables AUTO Device Plugin" ON)
 ov_option (ENABLE_AUTO_BATCH "Enables Auto-Batching Plugin" ON)
@@ -113,8 +111,6 @@ ov_option (ENABLE_TEMPLATE "Enable template plugin" ON)
 
 ov_dependent_option (ENABLE_PLUGINS_XML "Generate plugins.xml configuration file or not" OFF "BUILD_SHARED_LIBS" OFF)
 
-ov_dependent_option (GAPI_TEST_PERF "if GAPI unit tests should examine performance" OFF "ENABLE_TESTS;ENABLE_GAPI_PREPROCESSING" OFF)
-
 ov_dependent_option (ENABLE_FUNCTIONAL_TESTS "functional tests" ON "ENABLE_TESTS" OFF)
 
 ov_option (ENABLE_SAMPLES "console samples are part of OpenVINO Runtime package" ON)

diff --git a/cmake/templates/OpenVINOConfig.cmake.in b/cmake/templates/OpenVINOConfig.cmake.in
@@ -333,17 +333,6 @@ macro(_ov_find_itt)
     unset(_ENABLE_SYSTEM_ITTAPI)
 endmacro()
 
-macro(_ov_find_ade)
-    set(_OV_ENABLE_GAPI_PREPROCESSING "@ENABLE_GAPI_PREPROCESSING@")
-    # whether 'ade' is found via find_package
-    set(_ENABLE_SYSTEM_ADE "@ade_FOUND@")
-    if(_OV_ENABLE_GAPI_PREPROCESSING AND _ENABLE_SYSTEM_ADE)
-        _ov_find_dependency(ade @ade_VERSION@)
-    endif()
-    unset(_OV_ENABLE_GAPI_PREPROCESSING)
-    unset(_ENABLE_SYSTEM_ADE)
-endmacro()
-
 macro(_ov_find_intel_cpu_dependencies)
     set(_OV_ENABLE_CPU_ACL "@DNNL_USE_ACL@")
     if(_OV_ENABLE_CPU_ACL)
@@ -493,9 +482,6 @@ if(NOT _OV_ENABLE_OPENVINO_BUILD_SHARED)
     _ov_find_itt()
     _ov_find_pugixml()
 
-    # preprocessing dependencies
-    _ov_find_ade()
-
     # frontend dependencies
     _ov_find_protobuf_frontend_dependency()
     _ov_find_tensorflow_frontend_dependencies()

diff --git a/...tion/openvino_legacy_features/api_2_0_transition_guide/deployment_migration.rst b/...tion/openvino_legacy_features/api_2_0_transition_guide/deployment_migration.rst
@@ -205,7 +205,6 @@ OpenVINO 2022.1 introduced a reorganization of the libraries, to make deployment
 Below are detailed comparisons of the library structure between OpenVINO 2022.1 and the previous versions:
 
 * 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``.
-* 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>`.
 
 * The libraries of plugins have been renamed as follows:
 
@@ -234,8 +233,6 @@ Older versions of OpenVINO had several core libraries and plugin modules:
 Now, the modularity is more clear:
 - A single core library with all the functionality ``openvino`` for C++ runtime
 - ``openvino_c`` with Inference Engine API C interface
-- **Deprecated** Optional ``openvino_gapi_preproc`` preprocessing library (if ``InferenceEngine::PreProcessInfo::setColorFormat`` or ``InferenceEngine::PreProcessInfo::setResizeAlgorithm`` are used)
- - Use :doc:`preprocessing capabilities of OpenVINO API 2.0 <openvino_2_0_preprocessing>`
 - Plugin libraries with clear names:
  - ``openvino_intel_cpu_plugin``
  - ``openvino_intel_gpu_plugin``

diff --git a/...es_en/openvino_workflow/deployment_intro/conditional_compilation_deployment.rst b/...es_en/openvino_workflow/deployment_intro/conditional_compilation_deployment.rst
@@ -278,7 +278,7 @@ Generate final optimal binaries size of OpenVINO package
     md build
     cd build
 
-    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 ..
+    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 ..
 
     cmake --build . --config Release
 

diff --git a/docs/dev/cmake_options_for_custom_compilation.md b/docs/dev/cmake_options_for_custom_compilation.md
@@ -44,8 +44,6 @@ This document provides description and default values for CMake options that can
         * `ON` is default.
     * `ENABLE_OV_IR_FRONTEND` enables OpenVINO Intermediate Representation frontend plugin for OpenVINO Runtime:
         * `ON` is default.
-* `ENABLE_GAPI_PREPROCESSING` enables G-API preprocessing:
-    * `ON` is default.
 * `OPENVINO_EXTRA_MODULES` specifies path to add extra OpenVINO modules to the build.
     * See [OpenVINO Contrib] to add extra modules from.
 * `ENABLE_SAMPLES` enables OpenVINO Runtime samples build:

diff --git a/docs/dev/static_libaries.md b/docs/dev/static_libaries.md
@@ -47,7 +47,6 @@ cmake -DENABLE_INTEL_GPU=OFF \
       -DENABLE_OV_TF_FRONTEND=OFF \
       -DENABLE_OV_TF_LITE_FRONTEND=OFF \
       -DENABLE_OV_PYTORCH_FRONTEND=OFF \
-      -DENABLE_GAPI_PREPROCESSING=OFF \
       -DENABLE_INTEL_CPU=ON \
       -DENABLE_OV_IR_FRONTEND=ON
 ```
@@ -150,4 +149,4 @@ cmake -DCMAKE_TOOLCHAIN_FILE=<openvino source dir>/cmake/toolchains/mt.runtime.w
  * [OpenVINO Developer Documentation](index.md)
  * [How to Build OpenVINO](build.md)
 
-
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -18,8 +18,6 @@ add_subdirectory(frontends)
 add_subdirectory(plugins)
 add_subdirectory(inference)
 include(cmake/openvino.cmake)
-# preprocessing has dependency on `openvino` for static build
-add_subdirectory(common/preprocessing)
 add_subdirectory(bindings)
 
 if(ENABLE_TESTS)

diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake
@@ -108,11 +108,7 @@ add_library(openvino::runtime::dev ALIAS openvino_runtime_dev)
 
 target_include_directories(openvino_runtime_dev INTERFACE
     $<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/inference/dev_api>
-    $<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/common/low_precision_transformations/include>
-    $<BUILD_INTERFACE:$<TARGET_PROPERTY:openvino_gapi_preproc,INTERFACE_INCLUDE_DIRECTORIES>>)
-
-target_compile_definitions(openvino_runtime_dev INTERFACE
-    $<TARGET_PROPERTY:openvino_gapi_preproc,INTERFACE_COMPILE_DEFINITIONS>)
+    $<BUILD_INTERFACE:${OpenVINO_SOURCE_DIR}/src/common/low_precision_transformations/include>)
 
 target_link_libraries(openvino_runtime_dev INTERFACE ${TARGET_NAME} openvino::core::dev)
 

diff --git a/src/cmake/ov_parallel.cmake b/src/cmake/ov_parallel.cmake
@@ -265,7 +265,7 @@ function(ov_set_threading_interface_for TARGET_NAME)
         set(LINK_TYPE "PRIVATE")
         set(COMPILE_DEF_TYPE "PRIVATE")
     elseif(target_type STREQUAL "STATIC_LIBRARY")
-        # Affected libraries: inference_engine_s, openvino_gapi_preproc_s
+        # Affected libraries: inference_engine_s
         # they don't have TBB in public headers => PRIVATE
         set(LINK_TYPE "PRIVATE")
         set(COMPILE_DEF_TYPE "PUBLIC")

diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt
diff --git a/src/common/preprocessing/src/CMakeLists.txt b/src/common/preprocessing/src/CMakeLists.txt