diff --git a/cmake/developer_package/packaging/archive.cmake b/cmake/developer_package/packaging/archive.cmake index e64c982a4d9..8d0225bb83d 100644 --- a/cmake/developer_package/packaging/archive.cmake +++ b/cmake/developer_package/packaging/archive.cmake @@ -22,8 +22,6 @@ macro(ov_archive_cpack_set_dirs) # common "archive" package locations # TODO: move current variables to OpenVINO specific locations set(OV_CPACK_INCLUDEDIR runtime/include) - set(OV_CPACK_IE_CMAKEDIR runtime/cmake) - set(OV_CPACK_NGRAPH_CMAKEDIR runtime/cmake) set(OV_CPACK_OPENVINO_CMAKEDIR runtime/cmake) set(OV_CPACK_DOCDIR docs) set(OV_CPACK_LICENSESDIR licenses) diff --git a/cmake/developer_package/packaging/common-libraries.cmake b/cmake/developer_package/packaging/common-libraries.cmake index 5c948c0840b..0ded13dccaa 100644 --- a/cmake/developer_package/packaging/common-libraries.cmake +++ b/cmake/developer_package/packaging/common-libraries.cmake @@ -21,13 +21,9 @@ macro(ov_common_libraries_cpack_set_dirs) endif() set(OV_CPACK_ARCHIVEDIR ${CMAKE_INSTALL_LIBDIR}) if(CPACK_GENERATOR MATCHES "^(CONAN|VCPKG)$") - set(OV_CPACK_IE_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/openvino) - set(OV_CPACK_NGRAPH_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/openvino) set(OV_CPACK_OPENVINO_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/openvino) set(OV_CPACK_PLUGINSDIR ${OV_CPACK_RUNTIMEDIR}) else() - set(OV_CPACK_IE_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/inferenceengine${OpenVINO_VERSION}) - set(OV_CPACK_NGRAPH_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph${OpenVINO_VERSION}) set(OV_CPACK_OPENVINO_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/openvino${OpenVINO_VERSION}) set(OV_CPACK_PLUGINSDIR ${OV_CPACK_RUNTIMEDIR}/openvino-${OpenVINO_VERSION}) endif() diff --git a/cmake/developer_package/packaging/debian/debian.cmake b/cmake/developer_package/packaging/debian/debian.cmake index a2e547617fc..d8e7bdc869b 100644 --- a/cmake/developer_package/packaging/debian/debian.cmake +++ b/cmake/developer_package/packaging/debian/debian.cmake @@ -30,8 +30,6 @@ macro(ov_debian_cpack_set_dirs) set(OV_CPACK_LIBRARYDIR ${OV_CPACK_RUNTIMEDIR}) set(OV_CPACK_ARCHIVEDIR ${OV_CPACK_RUNTIMEDIR}) set(OV_CPACK_PLUGINSDIR ${OV_CPACK_RUNTIMEDIR}/openvino-${OpenVINO_VERSION}) - set(OV_CPACK_IE_CMAKEDIR ${OV_CPACK_RUNTIMEDIR}/cmake/inferenceengine${OpenVINO_VERSION}) - set(OV_CPACK_NGRAPH_CMAKEDIR ${OV_CPACK_RUNTIMEDIR}/cmake/ngraph${OpenVINO_VERSION}) set(OV_CPACK_OPENVINO_CMAKEDIR ${OV_CPACK_RUNTIMEDIR}/cmake/openvino${OpenVINO_VERSION}) set(OV_CPACK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/openvino-${OpenVINO_VERSION}) set(OV_CPACK_LICENSESDIR ${OV_CPACK_DOCDIR}/licenses) diff --git a/cmake/developer_package/packaging/npm.cmake b/cmake/developer_package/packaging/npm.cmake index 3566223d3f8..cbf47dc7783 100644 --- a/cmake/developer_package/packaging/npm.cmake +++ b/cmake/developer_package/packaging/npm.cmake @@ -14,49 +14,18 @@ set(CMAKE_SKIP_INSTALL_RPATH OFF) # macro(ov_npm_cpack_set_dirs) set(OV_CPACK_INCLUDEDIR .) - set(OV_CPACK_IE_CMAKEDIR .) - set(OV_CPACK_NGRAPH_CMAKEDIR .) set(OV_CPACK_OPENVINO_CMAKEDIR .) set(OV_CPACK_DOCDIR .) - set(OV_CPACK_LICENSESDIR .) + set(OV_CPACK_LICENSESDIR licenses) set(OV_CPACK_SAMPLESDIR .) set(OV_CPACK_WHEELSDIR .) set(OV_CPACK_TOOLSDIR .) set(OV_CPACK_DEVREQDIR .) set(OV_CPACK_PYTHONDIR .) - if(WIN32) - set(OV_CPACK_LIBRARYDIR .) - set(OV_CPACK_RUNTIMEDIR .) - set(OV_CPACK_ARCHIVEDIR .) - elseif(APPLE) - set(OV_CPACK_LIBRARYDIR .) - set(OV_CPACK_RUNTIMEDIR .) - set(OV_CPACK_ARCHIVEDIR .) - else() - set(OV_CPACK_LIBRARYDIR .) - set(OV_CPACK_RUNTIMEDIR .) - set(OV_CPACK_ARCHIVEDIR .) - endif() - set(OV_CPACK_LIBRARYDIR .) set(OV_CPACK_ARCHIVEDIR .) set(OV_CPACK_PLUGINSDIR .) - set(OV_CPACK_IE_CMAKEDIR .) - set(OV_CPACK_NGRAPH_CMAKEDIR .) - set(OV_CPACK_OPENVINO_CMAKEDIR .) - set(OV_CPACK_DOCDIR .) - set(OV_CPACK_LICENSESDIR licenses) - set(OV_CPACK_PYTHONDIR .) - - # non-native stuff - set(OV_CPACK_SHAREDIR .) - set(OV_CPACK_SAMPLESDIR .) - set(OV_CPACK_DEVREQDIR .) - unset(OV_CPACK_SHAREDIR) - - # skipped during debian packaging - set(OV_CPACK_WHEELSDIR .) endmacro() ov_npm_cpack_set_dirs() diff --git a/cmake/developer_package/packaging/nsis.cmake b/cmake/developer_package/packaging/nsis.cmake index 31f5d674158..a0d90923d47 100644 --- a/cmake/developer_package/packaging/nsis.cmake +++ b/cmake/developer_package/packaging/nsis.cmake @@ -54,8 +54,6 @@ macro(ov_archive_cpack_set_dirs) # common "archive" package locations # TODO: move current variables to OpenVINO specific locations set(OV_CPACK_INCLUDEDIR runtime/include) - set(OV_CPACK_IE_CMAKEDIR runtime/cmake) - set(OV_CPACK_NGRAPH_CMAKEDIR runtime/cmake) set(OV_CPACK_OPENVINO_CMAKEDIR runtime/cmake) set(OV_CPACK_DOCDIR docs) set(OV_CPACK_LICENSESDIR licenses) diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake index d80aa5708e3..8c493b5a50f 100644 --- a/cmake/developer_package/packaging/rpm/rpm.cmake +++ b/cmake/developer_package/packaging/rpm/rpm.cmake @@ -17,8 +17,6 @@ macro(ov_rpm_cpack_set_dirs) set(OV_CPACK_RUNTIMEDIR ${CMAKE_INSTALL_LIBDIR}) set(OV_CPACK_ARCHIVEDIR ${CMAKE_INSTALL_LIBDIR}) set(OV_CPACK_PLUGINSDIR ${CMAKE_INSTALL_LIBDIR}/openvino-${OpenVINO_VERSION}) - set(OV_CPACK_IE_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/inferenceengine${OpenVINO_VERSION}) - set(OV_CPACK_NGRAPH_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph${OpenVINO_VERSION}) set(OV_CPACK_OPENVINO_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/openvino${OpenVINO_VERSION}) set(OV_CPACK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/openvino-${OpenVINO_VERSION}) set(OV_CPACK_LICENSESDIR ${OV_CPACK_DOCDIR}/licenses) diff --git a/cmake/templates/InferenceEngineConfig-version.cmake.in b/cmake/templates/InferenceEngineConfig-version.cmake.in deleted file mode 100644 index 2da3f42e1c6..00000000000 --- a/cmake/templates/InferenceEngineConfig-version.cmake.in +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2018-2023 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 -# - -set(PACKAGE_VERSION_MAJOR @OpenVINO_VERSION_MAJOR@) -set(PACKAGE_VERSION_MINOR @OpenVINO_VERSION_MINOR@) -set(PACKAGE_VERSION_PATCH @OpenVINO_VERSION_PATCH@) -set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}") - -set(PACKAGE_VERSION_EXACT False) -set(PACKAGE_VERSION_COMPATIBLE False) - -# Compatibility with old versioning for 2.x -if(PACKAGE_FIND_VERSION_MAJOR VERSION_EQUAL 2) - set(PACKAGE_VERSION_COMPATIBLE True) - if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) - message(WARNING "Inference Engine versioning has changed. Use ${PACKAGE_VERSION} instead of ${PACKAGE_FIND_VERSION}") - endif() -endif() - -if(PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) - set(PACKAGE_VERSION_EXACT True) - set(PACKAGE_VERSION_COMPATIBLE True) -endif() - -if(PACKAGE_FIND_VERSION_MAJOR EQUAL PACKAGE_VERSION_MAJOR AND - PACKAGE_FIND_VERSION VERSION_LESS PACKAGE_VERSION) - set(PACKAGE_VERSION_COMPATIBLE True) -endif() diff --git a/cmake/templates/InferenceEngineConfig.cmake.in b/cmake/templates/InferenceEngineConfig.cmake.in deleted file mode 100644 index 5c4a9ca5c14..00000000000 --- a/cmake/templates/InferenceEngineConfig.cmake.in +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright (C) 2018-2023 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 -# -# -# Inference Engine cmake config -# ------ -# -# This config defines the following variables: -# -# InferenceEngine_FOUND - True if the system has the Inference Engine library -# InferenceEngine_INCLUDE_DIRS - Inference Engine include directories -# InferenceEngine_LIBRARIES - Inference Engine libraries -# -# and the following imported targets: -# -# IE::inference_engine - The Inference Engine library -# IE::inference_engine_c_api - The Inference Engine C API library -# -# Inference Engine version variables: -# -# InferenceEngine_VERSION_MAJOR - major version component -# InferenceEngine_VERSION_MINOR - minor version component -# InferenceEngine_VERSION_PATCH - patch version component -# - -@PACKAGE_INIT@ - -message(WARNING "find_package(InferenceEngine) is deprecated and will be removed in 2024.0 release. Please, use find_package(OpenVINO)") - -if(NOT DEFINED CMAKE_FIND_PACKAGE_NAME) - set(CMAKE_FIND_PACKAGE_NAME InferenceEngine) - set(_ie_need_package_name_reset ON) -endif() - -# need to store current PACKAGE_PREFIX_DIR, because it's overwritten by sub-package one -set(_ie_package_prefix_dir "${PACKAGE_PREFIX_DIR}") - -include(CMakeFindDependencyMacro) - -find_dependency(OpenVINO - PATHS "${CMAKE_CURRENT_LIST_DIR}" - "${CMAKE_CURRENT_LIST_DIR}/../openvino${InferenceEngine_VERSION}" - NO_CMAKE_FIND_ROOT_PATH - NO_DEFAULT_PATH) - -# create targets with old names for compatibility -if(TARGET openvino::runtime AND NOT TARGET IE::inference_engine) - add_library(IE::inference_engine INTERFACE IMPORTED) - set_target_properties(IE::inference_engine PROPERTIES - INTERFACE_LINK_LIBRARIES openvino::runtime) -endif() - -if(TARGET openvino::runtime::c AND NOT TARGET IE::inference_engine_c_api) - add_library(IE::inference_engine_c_api INTERFACE IMPORTED) - set_target_properties(IE::inference_engine_c_api PROPERTIES - INTERFACE_LINK_LIBRARIES openvino::runtime::c) -endif() - -# mark components as available -foreach(comp inference_engine inference_engine_c_api) - set(${CMAKE_FIND_PACKAGE_NAME}_${comp}_FOUND ON) -endforeach() - -if(NOT ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS) - set(${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS inference_engine inference_engine_c_api) -endif() - -unset(InferenceEngine_LIBRARIES) -foreach(comp IN LISTS ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS) - # check if the component is available - if(${CMAKE_FIND_PACKAGE_NAME}_${comp}_FOUND) - set(pcomp IE::${comp}) - - list(APPEND InferenceEngine_LIBRARIES ${pcomp}) - endif() -endforeach() - -# restore PACKAGE_PREFIX_DIR -set(PACKAGE_PREFIX_DIR ${_ie_package_prefix_dir}) -unset(_ie_package_prefix_dir) - -set_and_check(InferenceEngine_INCLUDE_DIRS "@PACKAGE_OV_INCLUDE_DIR@") - -check_required_components(${CMAKE_FIND_PACKAGE_NAME}) - -if(_ie_need_package_name_reset) - unset(CMAKE_FIND_PACKAGE_NAME) - unset(_ie_need_package_name_reset) -endif() diff --git a/cmake/templates/ngraphConfig.cmake.in b/cmake/templates/ngraphConfig.cmake.in deleted file mode 100644 index a0111c23021..00000000000 --- a/cmake/templates/ngraphConfig.cmake.in +++ /dev/null @@ -1,102 +0,0 @@ -# ****************************************************************************** -# Copyright 2017-2023 Intel Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ****************************************************************************** -# -# -# ngraph config file -# ------ -# -# This script defines the following variables and imported targets: -# -# ngraph::ngraph - nGraph core target -# ngraph_FOUND - True if the system has the nGraph library -# NGRAPH_LIBRARIES - nGraph libraries -# -# Frontends: -# -# ngraph_onnx_frontend_FOUND - True if the system has ngraph::onnx_frontend library -# ngraph::onnx_frontend - ONNX FrontEnd target (optional) -# -# ngraph_paddle_frontend_FOUND - True if the system has Paddle frontend -# ngraph::paddle_frontend - nGraph Paddle frontend (optional) -# -# ngraph_ir_frontend_FOUND - True if the system has OpenVINO IR frontend -# -# ngraph_tensorflow_frontend_FOUND - True if the system has TensorFlow frontend -# ngraph::tensorflow_frontend - nGraph TensorFlow frontend (optional) -# - -@PACKAGE_INIT@ - -include(CMakeFindDependencyMacro) - -message(WARNING "find_package(ngraph) is deprecated and will be removed in 2024.0 release. Please, use find_package(OpenVINO)") - -find_dependency(OpenVINO - PATHS "${CMAKE_CURRENT_LIST_DIR}" - "${CMAKE_CURRENT_LIST_DIR}/../openvino${ngraph_VERSION}" - NO_CMAKE_FIND_ROOT_PATH - NO_DEFAULT_PATH) - -# create targets with old names for compatibility -if(TARGET openvino::runtime AND NOT TARGET ngraph::ngraph) - add_library(ngraph::ngraph INTERFACE IMPORTED) - set_target_properties(ngraph::ngraph PROPERTIES - INTERFACE_LINK_LIBRARIES openvino::runtime) -endif() - -if(TARGET openvino::frontend::onnx AND NOT TARGET ngraph::onnx_frontend) - add_library(ngraph::onnx_frontend INTERFACE IMPORTED) - set_target_properties(ngraph::onnx_frontend PROPERTIES - INTERFACE_LINK_LIBRARIES openvino::frontend::onnx) -endif() - -if(TARGET openvino::frontend::paddle AND NOT TARGET ngraph::paddle_frontend) - add_library(ngraph::paddle_frontend INTERFACE IMPORTED) - set_target_properties(ngraph::paddle_frontend PROPERTIES - INTERFACE_LINK_LIBRARIES openvino::frontend::paddle) -endif() - -if(TARGET openvino::frontend::tensorflow AND NOT TARGET ngraph::tensorflow_frontend) - add_library(ngraph::tensorflow_frontend INTERFACE IMPORTED) - set_target_properties(ngraph::tensorflow_frontend PROPERTIES - INTERFACE_LINK_LIBRARIES openvino::frontend::tensorflow) -endif() - -set(ngraph_ngraph_FOUND ON) -set(NGRAPH_LIBRARIES ngraph::ngraph) - -set(ngraph_onnx_frontend_FOUND ${OpenVINO_Frontend_ONNX_FOUND}) -set(ngraph_tensorflow_frontend_FOUND ${OpenVINO_Frontend_TensorFlow_FOUND}) -set(ngraph_paddle_frontend_FOUND ${OpenVINO_Frontend_Paddle_FOUND}) -set(ngraph_onnx_importer_FOUND ${OpenVINO_Frontend_ONNX_FOUND}) - -if(ngraph_onnx_importer_FOUND) - set(ONNX_IMPORTER_LIBRARIES ngraph::onnx_frontend) - # ngraph::onnx_importer target and variables are deprecated - # but need to create a dummy target for BW compatibility - if(NOT TARGET ngraph::onnx_importer) - add_library(ngraph::onnx_importer INTERFACE IMPORTED) - set_target_properties(ngraph::onnx_importer PROPERTIES - INTERFACE_LINK_LIBRARIES ngraph::onnx_frontend) - endif() -endif() - -set(ngraph_paddle_frontend_FOUND ${OpenVINO_Frontend_Paddle_FOUND}) -set(ngraph_tensorflow_frontend_FOUND ${OpenVINO_Frontend_TensorFlow_FOUND}) -set(ngraph_onnx_frontend_FOUND ${OpenVINO_Frontend_ONNX_FOUND}) -set(ngraph_ir_frontend_FOUND ${OpenVINO_Frontend_IR_FOUND}) - -check_required_components(ngraph) diff --git a/docs/dev/pypi_publish/pypi-openvino-dev.md b/docs/dev/pypi_publish/pypi-openvino-dev.md index 08b3086527e..c9077cc78f2 100644 --- a/docs/dev/pypi_publish/pypi-openvino-dev.md +++ b/docs/dev/pypi_publish/pypi-openvino-dev.md @@ -122,8 +122,6 @@ For example, to install and configure the components for working with TensorFlow | Component | Console Script | Description | |------------------|---------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | [Legacy Model conversion API](https://docs.openvino.ai/nightly/openvino_docs_MO_DG_Deep_Learning_Model_Optimizer_DevGuide.html) | `mo` |**Model conversion API** imports, converts, and optimizes models that were trained in popular frameworks to a format usable by OpenVINO components.
Supported frameworks include Caffe\*, TensorFlow\*, MXNet\*, PaddlePaddle\*, and ONNX\*. | | -| [Accuracy Checker](https://docs.openvino.ai/nightly/omz_tools_accuracy_checker.html) and
[Annotation Converter](https://docs.openvino.ai/nightly/omz_tools_accuracy_checker_annotation_converters.html) | `accuracy_check`
`convert_annotation` |**Accuracy Checker** is a deep learning accuracy validation tool that allows you to collect accuracy metrics against popular datasets. The main advantages of the tool are the flexibility of configuration and a set of supported datasets, preprocessing, postprocessing, and metrics.
**Annotation Converter** is a utility that prepares datasets for evaluation with Accuracy Checker. | -| [Post-Training Optimization Tool](https://docs.openvino.ai/nightly/pot_introduction.html)| `pot` |**Post-Training Optimization Tool** allows you to optimize trained models with advanced capabilities, such as quantization and low-precision optimizations, without the need to retrain or fine-tune models. | | [Model Downloader and other Open Model Zoo tools](https://docs.openvino.ai/nightly/omz_tools_downloader.html)| `omz_downloader`
`omz_converter`
`omz_quantizer`
`omz_info_dumper`| **Model Downloader** is a tool for getting access to the collection of high-quality and extremely fast pre-trained deep learning [public](@ref omz_models_group_public) and [Intel](@ref omz_models_group_intel)-trained models. These free pre-trained models can be used to speed up the development and production deployment process without training your own models. The tool downloads model files from online sources and, if necessary, patches them to make them more usable with model conversion API. A number of additional tools are also provided to automate the process of working with downloaded models:
**Model Converter** is a tool for converting Open Model Zoo models that are stored in an original deep learning framework format into the OpenVINO Intermediate Representation (IR) using model conversion API.
**Model Quantizer** is a tool for automatic quantization of full-precision models in the IR format into low-precision versions using the Post-Training Optimization Tool.
**Model Information Dumper** is a helper utility for dumping information about the models to a stable, machine-readable format. | ## Troubleshooting diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake index 355d7ed13f1..50ad2a3d7d3 100644 --- a/src/cmake/openvino.cmake +++ b/src/cmake/openvino.cmake @@ -94,8 +94,7 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets ARCHIVE DESTINATION ${OV_CPACK_ARCHIVEDIR} COMPONENT ${OV_CPACK_COMP_CORE} ${OV_CPACK_COMP_CORE_EXCLUDE_ALL} LIBRARY DESTINATION ${OV_CPACK_LIBRARYDIR} COMPONENT ${OV_CPACK_COMP_CORE} ${OV_CPACK_COMP_CORE_EXCLUDE_ALL} NAMELINK_COMPONENT ${OV_CPACK_COMP_CORE_DEV} - INCLUDES DESTINATION ${OV_CPACK_INCLUDEDIR} - ${OV_CPACK_INCLUDEDIR}/ie) + INCLUDES DESTINATION ${OV_CPACK_INCLUDEDIR}) # OpenVINO runtime library dev @@ -164,7 +163,6 @@ install(EXPORT OpenVINOTargets # build tree -list(APPEND PATH_VARS "OV_INCLUDE_DIR") # TODO: remove obsolete variable for API 1.0 before 2024.0 if(ENABLE_INTEL_GNA) list(APPEND PATH_VARS "GNA_PATH") endif() @@ -177,14 +175,8 @@ if(ENABLE_ONEDNN_FOR_GPU) endif() set(PUBLIC_HEADERS_DIR "${OpenVINO_SOURCE_DIR}/src/inference/include") -set(OV_INCLUDE_DIR "${PUBLIC_HEADERS_DIR}/ie") set(OV_TBB_DIR "${TBB_DIR}") -configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig.cmake.in" - "${CMAKE_BINARY_DIR}/InferenceEngineConfig.cmake" - INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}" - PATH_VARS ${PATH_VARS} ${BUILD_PATH_VARS}) - configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig.cmake.in" "${CMAKE_BINARY_DIR}/OpenVINOConfig.cmake" INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}" @@ -197,7 +189,6 @@ list(APPEND INSTALL_PATH_VARS "OPENVINO_LIB_DIR") # will be done by inside OpenVINOConfig.cmak / ACLConfig.cmake string(REPLACE "$" "" OPENVINO_LIB_DIR "${OV_CPACK_LIBRARYDIR}") -set(OV_INCLUDE_DIR "${OV_CPACK_INCLUDEDIR}/ie") set(OV_TBB_DIR "${OV_TBB_DIR_INSTALL}") set(OV_TBBBIND_DIR "${OV_TBBBIND_DIR_INSTALL}") set(GNA_PATH "${OV_CPACK_RUNTIMEDIR}") @@ -205,27 +196,14 @@ 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" - INSTALL_DESTINATION ${OV_CPACK_IE_CMAKEDIR} - PATH_VARS ${PATH_VARS} ${INSTALL_PATH_VARS}) - configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig.cmake.in" "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake" INSTALL_DESTINATION ${OV_CPACK_OPENVINO_CMAKEDIR} PATH_VARS ${PATH_VARS} ${INSTALL_PATH_VARS}) -configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" - "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" @ONLY) configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake" @ONLY) -install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" - "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" - DESTINATION ${OV_CPACK_IE_CMAKEDIR} - COMPONENT ${OV_CPACK_COMP_CORE_DEV} - ${OV_CPACK_COMP_CORE_DEV_EXCLUDE_ALL}) - install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake" "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake" DESTINATION ${OV_CPACK_OPENVINO_CMAKEDIR} diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 0d0d42795cc..2d2db9b18e8 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -158,17 +158,3 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h") - -configure_package_config_file(${OpenVINO_SOURCE_DIR}/cmake/templates/ngraphConfig.cmake.in - ${CMAKE_BINARY_DIR}/ngraphConfig.cmake - INSTALL_DESTINATION ${OV_CPACK_NGRAPH_CMAKEDIR}) - -write_basic_package_version_file(${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake - VERSION ${OpenVINO_VERSION_MAJOR}.${OpenVINO_VERSION_MINOR}.${OpenVINO_VERSION_PATCH} - COMPATIBILITY SameMajorVersion) - -install(FILES ${CMAKE_BINARY_DIR}/ngraphConfig.cmake - ${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake - DESTINATION ${OV_CPACK_NGRAPH_CMAKEDIR} - COMPONENT ${OV_CPACK_COMP_CORE_DEV} - ${OV_CPACK_COMP_CORE_DEV_EXCLUDE_ALL}) diff --git a/thirdparty/open_model_zoo b/thirdparty/open_model_zoo index f7b5e2cd34d..ba076620b6b 160000 --- a/thirdparty/open_model_zoo +++ b/thirdparty/open_model_zoo @@ -1 +1 @@ -Subproject commit f7b5e2cd34d6495292f59795261396edbc98d92b +Subproject commit ba076620b6b02e16876e7a4edf5f6a08880802c6 diff --git a/tools/openvino_dev/readme.txt b/tools/openvino_dev/readme.txt index af3c3c51ab4..a189f27d55a 100644 --- a/tools/openvino_dev/readme.txt +++ b/tools/openvino_dev/readme.txt @@ -5,9 +5,6 @@ Components and their third party programs: * OpenVINO(TM) Development Tools (Apache 2.0): - Model Optimizer: /dev-third-party-programs.txt - - Benchmark Tool: /dev-third-party-programs.txt - - Post-Training Optimization Toolkit: /dev-third-party-programs.txt - - Accuracy Checker: /omz-third-party-programs.txt - Open Model Zoo Tools: /omz-third-party-programs.txt ------------------------------------------------------------------------ diff --git a/tools/openvino_dev/setup.py b/tools/openvino_dev/setup.py index 1e0fe3dd108..04d3e435535 100644 --- a/tools/openvino_dev/setup.py +++ b/tools/openvino_dev/setup.py @@ -37,13 +37,6 @@ PKG_INSTALL_CFG = { 'extract_requirements': True, 'extract_extras': True, }, - "accuracy_checker": { - 'src_dir': OPENVINO_DIR / 'thirdparty' / 'open_model_zoo' / 'tools' / 'accuracy_checker', # noqa:E501 - 'black_list': ['*tests*'], - 'prefix': 'accuracy_checker', - 'extract_entry_points': True, - 'extract_requirements': True, - }, "omz_tools": { 'src_dir': OPENVINO_DIR / 'thirdparty' / 'open_model_zoo' / 'tools' / 'model_tools', # noqa:E501 'black_list': [],