From 6b1d2f8978f53df46c9279b0d95e3ee693580089 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 22 Dec 2023 15:47:40 +0400 Subject: [PATCH] Additional clean-up for legacy components removal (#21841) --- .gitattributes | 12 ------------ .github/CODEOWNERS | 3 +-- .github/components.yml | 9 --------- .github/dependabot.yml | 17 ----------------- .github/github_org_control/config.json | 2 -- .github/labeler.yml | 4 ---- src/cmake/openvino.cmake | 7 ------- .../utils/cfg_samples/blob_cmp.json | 2 +- .../utils/cfg_samples/bm_output.json | 2 +- .../utils/cfg_samples/bm_perf.json | 2 +- .../commit_slider/utils/cfg_samples/e2e.json | 2 +- 11 files changed, 5 insertions(+), 57 deletions(-) diff --git a/.gitattributes b/.gitattributes index 6d8beedfe09..dfeac125fb1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -65,15 +65,3 @@ *.vsdx filter=lfs diff=lfs merge=lfs -text *.bmp filter=lfs diff=lfs merge=lfs -text *.svg filter=lfs diff=lfs merge=lfs -text - -#POT attributes -tools/pot/tests/data/test_cases_refs/* filter=lfs diff=lfs merge=lfs -text -tools/pot/tests/data/models/*/* filter=lfs diff=lfs merge=lfs -text -tools/pot/tests/data/reference_models/* filter=lfs diff=lfs merge=lfs -text -tools/pot/tests/data/video/* filter=lfs diff=lfs merge=lfs -text -tools/pot/tests/data/reference_fake_quantize_conf/* filter=lfs diff=lfs merge=lfs -text -/tools/pot/tests/** -pot_package -/tools/pot/tools/auxilary/** -pot_package -/tools/pot/tools/run_series_experiments.py -pot_package -/tools/pot/.pylintrc -pot_package -/tools/pot/README_dev.md -pot_package diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 39cf4c0301c..f513c829cbd 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -102,8 +102,7 @@ /tools/openvino_dev/ @openvinotoolkit/openvino-tools-maintainers @openvinotoolkit/openvino-ie-python-api-maintainers /tools/mo/ @openvinotoolkit/openvino-mo-maintainers /tools/ovc/ @openvinotoolkit/openvino-mo-maintainers -/tools/pot/ @openvinotoolkit/openvino-pot-maintainers -/thirdparty/open_model_zoo/ @openvinotoolkit/omz-maintainers @openvinotoolkit/openvino-pot-maintainers +/thirdparty/open_model_zoo/ @openvinotoolkit/omz-maintainers # Documentation /docs/ @openvinotoolkit/openvino-docs-maintainers diff --git a/.github/components.yml b/.github/components.yml index f5337d1b61a..77311e4e332 100644 --- a/.github/components.yml +++ b/.github/components.yml @@ -13,7 +13,6 @@ LP_transformations: - TFL_FE - ONNX_FE - PDPD_FE - - POT preprocessing: revalidate: @@ -157,7 +156,6 @@ Python_API: revalidate: - samples - MO - - POT - tools build: - CPU @@ -201,16 +199,9 @@ IE_Tests: - IR_FE MO: - revalidate: - - POT build: - Python_API -POT: - build: - - CPU - - Python_API - tools: build: - CPU diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 80e95ea5a9f..1511e6a2c30 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -61,23 +61,6 @@ updates: dependency-type: "production" versioning-strategy: increase-if-necessary - # POT requirements - - package-ecosystem: pip - directory: "/tools/pot" - schedule: - interval: "daily" - time: "09:00" - timezone: "Asia/Dubai" - open-pull-requests-limit: 3 - assignees: - - "AlexKoff88" - - "KodiaqQ" - - "jiwaszki" - - "p-wysocki" - - "akuporos" - - "rkazants" - versioning-strategy: increase-if-necessary - # # Python Samples # diff --git a/.github/github_org_control/config.json b/.github/github_org_control/config.json index 1eaab07c42b..717403f27d1 100644 --- a/.github/github_org_control/config.json +++ b/.github/github_org_control/config.json @@ -6,7 +6,6 @@ "openvino-ci", "openvino-pushbot", "workbench-ci-bot", - "openvino-pot-ci", "sysicvvpux", "ote-ci-bot" ], @@ -42,7 +41,6 @@ "openvino-scripts-maintainers": "category: build", "openvino-tests-maintainers": "category: IE Tests", "openvino-tools-maintainers": "category: tools", - "openvino-pot-maintainers": "category: POT", "openvino-configuration-mgmt": "category: dependency_changes", "openvino-samples-maintainers": "category: samples", "openvino-c-api-maintainers": "category: C API" diff --git a/.github/labeler.yml b/.github/labeler.yml index 3fdc9fb5735..0605e7d879f 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -115,9 +115,6 @@ - 'src/frontends/paddle/**/*' - 'tests/layer_tests/py_frontend_tests/test_paddle_frontend.py' -'category: POT': -- 'tools/pot/**/*' - 'category: preprocessing': - 'src/common/preprocessing/**/*' @@ -163,7 +160,6 @@ 'category: tools': - any: ['tools/**', - '!tools/pot/**/*', '!tools/mo/**/*', '!tools/ovc/**/*'] diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake index 723d07eb982..44660671e60 100644 --- a/src/cmake/openvino.cmake +++ b/src/cmake/openvino.cmake @@ -164,9 +164,6 @@ install(EXPORT OpenVINOTargets # build tree -if(ENABLE_INTEL_GNA) - list(APPEND PATH_VARS "GNA_PATH") -endif() if(DNNL_USE_ACL) list(APPEND BUILD_PATH_VARS "FIND_ACL_PATH;CMAKE_ARCHIVE_OUTPUT_DIRECTORY") set(FIND_ACL_PATH "${intel_cpu_thirdparty_SOURCE_DIR}") @@ -191,10 +188,6 @@ string(REPLACE "$" "" OPENVINO_LIB_DIR "${OV_CPACK_LIBRARYDIR}") set(OV_TBB_DIR "${OV_TBB_DIR_INSTALL}") set(OV_TBBBIND_DIR "${OV_TBBBIND_DIR_INSTALL}") -set(GNA_PATH "${OV_CPACK_RUNTIMEDIR}") -if(WIN32) - set(GNA_PATH "${OV_CPACK_LIBRARYDIR}/../Release") -endif() configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig.cmake.in" "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" diff --git a/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/blob_cmp.json b/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/blob_cmp.json index 35b95d8e392..1df96f5092a 100644 --- a/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/blob_cmp.json +++ b/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/blob_cmp.json @@ -1,5 +1,5 @@ { - "makeCmd" : "cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON=OFF -DTHREADING=TBB -DENABLE_INTEL_GPU=OFF -DENABLE_INTEL_GNA=OFF -DENABLE_MODELS=OFF -DENABLE_SAMPLES=ON -DENABLE_TESTS=OFF -DENABLE_HETERO=OFF -DENABLE_TEMPLATE=OFF -DENABLE_CPU_DEBUG_CAPS=ON -DENABLE_DEBUG_CAPS=ON -DENABLE_OPENVINO_DEBUG=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated -DCMAKE_C_FLAGS=-Wno-deprecated -DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -DCMAKE_C_FLAGS=-Wno-deprecated-declarations ..", + "makeCmd" : "cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON=OFF -DTHREADING=TBB -DENABLE_INTEL_GPU=OFF -DENABLE_SAMPLES=ON -DENABLE_TESTS=OFF -DENABLE_HETERO=OFF -DENABLE_TEMPLATE=OFF -DENABLE_CPU_DEBUG_CAPS=ON -DENABLE_DEBUG_CAPS=ON -DENABLE_OPENVINO_DEBUG=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated -DCMAKE_C_FLAGS=-Wno-deprecated -DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -DCMAKE_C_FLAGS=-Wno-deprecated-declarations ..", "appCmd" : "./benchmark_app -m -t 10", "envVars" : [ {"name" : "OV_CPU_BLOB_DUMP_NODE_TYPE", "val" : "Output"}, diff --git a/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/bm_output.json b/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/bm_output.json index 0ac6815058e..3ec3d96d596 100644 --- a/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/bm_output.json +++ b/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/bm_output.json @@ -1,6 +1,6 @@ { "appCmd" : "./benchmark_app -m -d CPU -t 10", - "makeCmd" : "cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON=OFF -DTHREADING=TBB -DENABLE_INTEL_GPU=OFF -DENABLE_INTEL_GNA=OFF -DENABLE_MODELS=OFF -DENABLE_SAMPLES=ON -DENABLE_TESTS=OFF -DENABLE_HETERO=OFF -DENABLE_TEMPLATE=OFF -DENABLE_CPU_DEBUG_CAPS=OFF -DENABLE_DEBUG_CAPS=OFF -DENABLE_OPENVINO_DEBUG=OFF -DCMAKE_CXX_FLAGS=-Wno-deprecated -DCMAKE_C_FLAGS=-Wno-deprecated -DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -DCMAKE_C_FLAGS=-Wno-deprecated-declarations ..", + "makeCmd" : "cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON=OFF -DTHREADING=TBB -DENABLE_INTEL_GPU=OFF -DENABLE_SAMPLES=ON -DENABLE_TESTS=OFF -DENABLE_HETERO=OFF -DENABLE_TEMPLATE=OFF -DENABLE_CPU_DEBUG_CAPS=OFF -DENABLE_DEBUG_CAPS=OFF -DENABLE_OPENVINO_DEBUG=OFF -DCMAKE_CXX_FLAGS=-Wno-deprecated -DCMAKE_C_FLAGS=-Wno-deprecated -DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -DCMAKE_C_FLAGS=-Wno-deprecated-declarations ..", "runConfig" : { "commitList" : { "getCommitListCmd" : "git log .. --boundary --pretty=\"%h\"" diff --git a/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/bm_perf.json b/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/bm_perf.json index 1925f479c23..a6a0467b08c 100644 --- a/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/bm_perf.json +++ b/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/bm_perf.json @@ -1,6 +1,6 @@ { "appCmd" : "./benchmark_app -m -d CPU -hint throughput -inference_only=false -t 60", - "makeCmd" : "cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON=OFF -DTHREADING=TBB -DENABLE_INTEL_GPU=OFF -DENABLE_INTEL_GNA=OFF -DENABLE_MODELS=OFF -DENABLE_SAMPLES=ON -DENABLE_TESTS=OFF -DENABLE_HETERO=OFF -DENABLE_TEMPLATE=OFF -DENABLE_CPU_DEBUG_CAPS=OFF -DENABLE_DEBUG_CAPS=OFF -DENABLE_OPENVINO_DEBUG=OFF -DCMAKE_CXX_FLAGS=-Wno-deprecated -DCMAKE_C_FLAGS=-Wno-deprecated -DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -DCMAKE_C_FLAGS=-Wno-deprecated-declarations ..", + "makeCmd" : "cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON=OFF -DTHREADING=TBB -DENABLE_INTEL_GPU=OFF -DENABLE_SAMPLES=ON -DENABLE_TESTS=OFF -DENABLE_HETERO=OFF -DENABLE_TEMPLATE=OFF -DENABLE_CPU_DEBUG_CAPS=OFF -DENABLE_DEBUG_CAPS=OFF -DENABLE_OPENVINO_DEBUG=OFF -DCMAKE_CXX_FLAGS=-Wno-deprecated -DCMAKE_C_FLAGS=-Wno-deprecated -DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -DCMAKE_C_FLAGS=-Wno-deprecated-declarations ..", "runConfig" : { "commitList" : { "getCommitListCmd" : "git log .. --boundary --pretty=\"%h\"" diff --git a/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/e2e.json b/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/e2e.json index 0d3e87088d5..5fe0ecaa165 100644 --- a/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/e2e.json +++ b/src/plugins/intel_cpu/tools/commit_slider/utils/cfg_samples/e2e.json @@ -7,7 +7,7 @@ {"name" : "MO_ROOT", "val" : "//tools/mo/openvino/tools/"}, {"name" : "OPENVINO_ROOT_DIR", "val" : "//"} ], - "makeCmd" : "cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON=ON -DPython3_EXECUTABLE=/usr/bin/python3.8 -DTHREADING=TBB -DENABLE_INTEL_GPU=OFF -DENABLE_INTEL_GNA=OFF -DENABLE_MODELS=OFF -DENABLE_SAMPLES=OFF -DENABLE_TESTS=OFF -DENABLE_CPU_DEBUG_CAPS=OFF -DENABLE_HETERO=OFF -DENABLE_TEMPLATE=OFF -DENABLE_CPU_DEBUG_CAPS=OFF -DENABLE_DEBUG_CAPS=OFF -DENABLE_OPENVINO_DEBUG=OFF -DCMAKE_CXX_FLAGS=-Wno-deprecated -DCMAKE_C_FLAGS=-Wno-deprecated -DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -DCMAKE_C_FLAGS=-Wno-deprecated-declarations ..", + "makeCmd" : "cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON=ON -DPython3_EXECUTABLE=/usr/bin/python3.8 -DTHREADING=TBB -DENABLE_INTEL_GPU=OFF -DENABLE_SAMPLES=OFF -DENABLE_TESTS=OFF -DENABLE_CPU_DEBUG_CAPS=OFF -DENABLE_HETERO=OFF -DENABLE_TEMPLATE=OFF -DENABLE_CPU_DEBUG_CAPS=OFF -DENABLE_DEBUG_CAPS=OFF -DENABLE_OPENVINO_DEBUG=OFF -DCMAKE_CXX_FLAGS=-Wno-deprecated -DCMAKE_C_FLAGS=-Wno-deprecated -DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -DCMAKE_C_FLAGS=-Wno-deprecated-declarations ..", "runConfig" : { "commitList" : { "getCommitListCmd" : "git log .. --boundary --pretty=\"%h\""