Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/openvinotoolkit/openvino
Browse files Browse the repository at this point in the history
…into mateuszm/emb/py
  • Loading branch information
mmikolajcz committed Jun 17, 2024
2 parents e9a8eed + f59d42c commit 32d70ad
Show file tree
Hide file tree
Showing 103 changed files with 4,001 additions and 1,016 deletions.
2 changes: 1 addition & 1 deletion .github/actions/smart-ci/smart_ci.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def main():

skip_workflow = False
if is_merge_queue or (args.pr and not run_full_scope):
if args.skip_when_only_listed_labels_set:
if args.skip_when_only_listed_labels_set and changed_component_names:
excepted_labels = set(args.skip_when_only_listed_labels_set.split(','))
excepted_labels_only = changed_component_names - excepted_labels == set()
skip_workflow = excepted_labels_only
Expand Down
2 changes: 2 additions & 0 deletions .github/dependency_review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ allow-licenses:
- 'BSD-2-Clause'
- 'BSD-3-Clause'
- 'BSD-2-Clause AND BSD-3-Clause'
- 'BSD-3-Clause AND BSD-3-Clause-Clear'
- 'MIT'
- 'Apache-2.0'
- 'Apache-2.0 AND BSD-3-Clause'
- 'ISC'
- 'Apache-2.0 AND MIT'
- 'BlueOak-1.0.0'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,6 @@ jobs:
lcov --capture --directory ${{ github.workspace }}/. --output-file coverage.info
genhtml coverage.info --output-directory coverage-report
- name: Collect coverage
uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
with:
verbose: true
16 changes: 2 additions & 14 deletions .github/workflows/job_tokenizers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,6 @@ jobs:
Expand-Archive openvino_package.zip -DestinationPath "${{ env.INSTALL_DIR }}"
popd
#
# Dependencies
#

- name: Install python dependencies
run: |
# wheel packaging
python3 -m pip install -r ${{ env.OPENVINO_TOKENIZERS_REPO }}/requirements-build.txt
#
# Build
#
Expand All @@ -109,19 +100,16 @@ jobs:
if: runner.os != 'Windows'
run: |
source ${INSTALL_DIR}/setupvars.sh
python -m build --wheel --outdir ${EXTENSION_BUILD_DIR} ${OPENVINO_TOKENIZERS_REPO}
python -m pip wheel -v --no-deps --wheel-dir ${EXTENSION_BUILD_DIR} ${OPENVINO_TOKENIZERS_REPO}
env:
CMAKE_ARGS: '-DBUILD_FAST_TOKENIZERS=OFF'
CMAKE_BUILD_PARALLEL_LEVEL: '4'
CMAKE_GENERATOR: 'Unix Makefiles'

- name: Build tokenizers wheel (Windows)
if: runner.os == 'Windows'
run: |
. "${{ env.INSTALL_DIR }}/setupvars.ps1"
python3 -m build --wheel --outdir ${env:EXTENSION_BUILD_DIR} ${env:OPENVINO_TOKENIZERS_REPO}
python3 -m pip wheel -v --no-deps --wheel-dir ${env:EXTENSION_BUILD_DIR} ${env:OPENVINO_TOKENIZERS_REPO}
env:
CMAKE_ARGS: '-DBUILD_FAST_TOKENIZERS=OFF'
CMAKE_BUILD_PARALLEL_LEVEL: '4'

#
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ jobs:
run: |
/usr/bin/python3.8 -m pip install -U pip
/usr/bin/python3.8 -m pip install -r ${OPENVINO_REPO}/src/bindings/python/wheel/requirements-dev.txt
cmake -UPYTHON* \
cmake -UPython* -U_Python* -UPYTHON* \
-UTBB* \
-DENABLE_SYSTEM_TBB=ON \
-DENABLE_PYTHON_PACKAGING=ON \
Expand All @@ -245,11 +245,9 @@ jobs:
- name: CMake configure, build and install - OpenVINO JS API
if: fromJSON(needs.smart_ci.outputs.affected_components).JS_API
run:
cmake -DCPACK_GENERATOR=NPM -DENABLE_SYSTEM_TBB=OFF -UTBB* -S ${OPENVINO_REPO} -B ${BUILD_DIR}

run: |
cmake -UTBB* -DCPACK_GENERATOR=NPM -DENABLE_SYSTEM_TBB=OFF -S ${OPENVINO_REPO} -B ${BUILD_DIR}
cmake --build ${BUILD_DIR} --parallel

cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR_JS} -P ${BUILD_DIR}/cmake_install.cmake
#
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/linux_sanitizers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ jobs:
include:
- SANITIZER: 'AddressAndLeak'
SANITIZER_CMAKE_OPTION: '-DENABLE_SANITIZER=ON'
- SANITIZER: 'UndefinedBehavior'
SANITIZER_CMAKE_OPTION: '-DENABLE_UB_SANITIZER=ON'
# - SANITIZER: 'UndefinedBehavior' # Ticket: 144163
# SANITIZER_CMAKE_OPTION: '-DENABLE_UB_SANITIZER=ON'
# - SANITIZER: 'Thread' # Problems with protobuf
# SANITIZER_CMAKE_OPTION: '-DENABLE_THREAD_SANITIZER=ON'
env:
Expand Down Expand Up @@ -135,7 +135,6 @@ jobs:
-DENABLE_NCC_STYLE=OFF \
-DENABLE_TESTS=ON \
-DENABLE_STRICT_DEPENDENCIES=OFF \
-DENABLE_SYSTEM_TBB=ON \
-DENABLE_SYSTEM_OPENCL=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCPACK_GENERATOR=TGZ \
Expand Down Expand Up @@ -360,7 +359,7 @@ jobs:
--gtest_output=xml:${INSTALL_TEST_DIR}/TEST-TensorFlowLiteFrontend.xml
- name: Transformations func tests
if: always()
if: ${{ 'false' }} # Ticket: 143900
run: |
source ${INSTALL_DIR}/setupvars.sh
Expand Down Expand Up @@ -389,7 +388,7 @@ jobs:
--gtest_output=xml:${INSTALL_TEST_DIR}/TEST-CPUUnitTests.xml
- name: ov_subgraphs_dumper_tests tests
if: ${{ 'false' }} # Ticket: 134419
if: always()
run: |
source ${INSTALL_DIR}/setupvars.sh
${INSTALL_TEST_DIR}/ov_subgraphs_dumper_tests --gtest_print_time=1 \
Expand Down
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ if(POLICY CMP0149)
cmake_policy(SET CMP0149 NEW)
endif()

project(OpenVINO DESCRIPTION "OpenVINO toolkit")
project(OpenVINO
DESCRIPTION "OpenVINO toolkit"
HOMEPAGE_URL "https://docs.openvino.ai/2024/home.html"
LANGUAGES C CXX)

find_package(OpenVINODeveloperScripts REQUIRED
PATHS "${OpenVINO_SOURCE_DIR}/cmake/developer_package"
Expand Down
7 changes: 7 additions & 0 deletions cmake/developer_package/OpenVINODeveloperScriptsConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@ set(CMAKE_POLICY_DEFAULT_CMP0068 NEW)
set(CMAKE_POLICY_DEFAULT_CMP0074 NEW)
# CMake 3.13+: option() honors normal variables.
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
# CMake 3.15+: export(PACKAGE) does not populate package registry by default.
set(CMAKE_POLICY_DEFAULT_CMP0090 NEW)
# CMake 3.15: Modules FindPython3, FindPython2 and FindPython use LOCATION for lookup strategy
set(CMAKE_POLICY_DEFAULT_CMP0094 NEW)
# CMake 3.19+: An imported target missing its location property fails during generation.
Expand All @@ -222,6 +224,11 @@ set(CMAKE_POLICY_DEFAULT_CMP0135 NEW)
# CMake 3.27+ :Visual Studio Generators select latest Windows SDK by default.
set(CMAKE_POLICY_DEFAULT_CMP0149 NEW)

set(CMAKE_FIND_USE_PACKAGE_REGISTRY OFF CACHE BOOL "Disables search in user / system package registries")
set(CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY ON CACHE BOOL "Disables search in user package registries")
set(CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY ON CACHE BOOL "Disables search in system package registries")
set(CMAKE_EXPORT_PACKAGE_REGISTRY OFF CACHE BOOL "Disables package registry. Required for 3rd party projects like rapidjson, gflags")
set(CMAKE_EXPORT_NO_PACKAGE_REGISTRY ON CACHE BOOL "Disables package registry. Required for 3rd party projects like rapidjson, gflags")
set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "Don't warn about obsolete cmake versions in 3rdparty")
set(CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION ON CACHE BOOL "Warn about absolute paths in destination")

Expand Down
13 changes: 13 additions & 0 deletions cmake/developer_package/cross_compile/python_helpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,19 @@ endfunction()

# Wrapper for find_package(Python3) to allow cross-compilation
macro(ov_find_python3 find_package_mode)
# Settings for FindPython3.cmake
if(NOT DEFINED Python3_USE_STATIC_LIBS)
set(Python3_USE_STATIC_LIBS OFF)
endif()

if(NOT DEFINED Python3_FIND_VIRTUALENV)
set(Python3_FIND_VIRTUALENV FIRST)
endif()

if(NOT DEFINED Python3_FIND_IMPLEMENTATIONS)
set(Python3_FIND_IMPLEMENTATIONS CPython PyPy)
endif()

if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.18)
set(python3_development_component Development.Module)
else()
Expand Down
7 changes: 5 additions & 2 deletions cmake/developer_package/features.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
include(options)
include(target_flags)

set (CPACK_GENERATOR "TGZ" CACHE STRING "Cpack generator for OpenVINO")
list (APPEND OV_OPTIONS CPACK_GENERATOR)
if(WIN32)
set (CPACK_GENERATOR "ZIP" CACHE STRING "Cpack generator for OpenVINO")
else()
set (CPACK_GENERATOR "TGZ" CACHE STRING "Cpack generator for OpenVINO")
endif()

ov_dependent_option (ENABLE_LTO "Enable Link Time Optimization" OFF "LINUX;NOT ARM;CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9" OFF)

Expand Down
3 changes: 3 additions & 0 deletions cmake/developer_package/options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ endif()
macro(ov_option variable description value)
option(${variable} "${description}" ${value})
list(APPEND OV_OPTIONS ${variable})
set(OV_OPTIONS "${OV_OPTIONS}" CACHE INTERNAL "A list of OpenVINO cmake options")
endmacro()

macro(ov_dependent_option variable description def_value condition fallback_value)
cmake_dependent_option(${variable} "${description}" ${def_value} "${condition}" ${fallback_value})
list(APPEND OV_OPTIONS ${variable})
set(OV_OPTIONS "${OV_OPTIONS}" CACHE INTERNAL "A list of OpenVINO cmake options")
endmacro()

macro(ov_option_enum variable description value)
Expand All @@ -29,6 +31,7 @@ macro(ov_option_enum variable description value)
endif()

list(APPEND OV_OPTIONS ${variable})
set(OV_OPTIONS "${OV_OPTIONS}" CACHE INTERNAL "A list of OpenVINO cmake options")

set(${variable} ${value} CACHE STRING "${description}")
set_property(CACHE ${variable} PROPERTY STRINGS ${OPTION_ENUM_ALLOWED_VALUES})
Expand Down
5 changes: 3 additions & 2 deletions docs/articles_en/about-openvino/compatibility-and-support.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
.. {#compatibility_and_support}
Compatibility and Support
=========================

Expand All @@ -9,12 +7,15 @@ Compatibility and Support
:hidden:

compatibility-and-support/supported-devices
compatibility-and-support/supported-models
compatibility-and-support/supported-operations-inference-devices
compatibility-and-support/supported-operations-framework-frontend


:doc:`Supported Devices <compatibility-and-support/supported-devices>` - compatibility information for supported hardware accelerators.

:doc:`Supported Models <compatibility-and-support/supported-models>` - a list of selected models confirmed to work with given hardware.

:doc:`Supported Operations <compatibility-and-support/supported-operations-inference-devices>` - a listing of framework layers supported by OpenVINO.

:doc:`Supported Operations <compatibility-and-support/supported-operations-framework-frontend>` - a listing of layers supported by OpenVINO inference devices.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,6 @@ Feature Support and API Coverage
| || as of OpenVINO 2023.3, 08 Jan, 2024. |
+-------------------------+-----------+------------------+-------------------+


Devices similar to the ones used for benchmarking can be accessed using
`Intel® DevCloud for the Edge <https://devcloud.intel.com/edge/>`__,
a remote development environment with access to Intel® hardware and the latest versions
of the Intel® Distribution of OpenVINO™ Toolkit.
`Learn more <https://devcloud.intel.com/edge/../../get-started/devcloud/>`__ or
`Register here <https://inteliot.force.com/DevcloudForEdge/s/>`__.

For setting up a relevant configuration, refer to the
:doc:`Integrate with Customer Application <../../openvino-workflow/running-inference/integrate-openvino-with-your-application>`
topic (step 3 "Configure input and output").
Expand Down
Original file line number Diff line number Diff line change
@@ -1,44 +1,49 @@
Supported Models
========================

.. toctree::
:maxdepth: 1
:hidden:
The following table lists a selection of models that are validated against various hardware
devices. The list includes only models used in validation, other models from frameworks supported
by OpenVINO may also work properly.

about-openvino/performance-benchmarks
about-openvino/compatibility-and-support
Release Notes <about-openvino/release-notes-openvino>
Additional Resources <about-openvino/additional-resources>

.. raw:: html

<link rel="stylesheet" type="text/css" href="../../_static/css/openVinoDataTables.css">
<label>hide/reveal additional columns:</label><br/>
<label class="column-container">
Topology
<input type="checkbox" id="topology" name="topology" value="topology" data-column="0" class="toggle-vis"/>
<label for="topology" class="checkmark"></label>
</label>
<label class="column-container">
Source framework
<input type="checkbox" checked id="source" name="source" value="source" data-column="1" class="toggle-vis"/>
<label for="source" class="checkmark"></label>
CPU
<input type="checkbox" id="AI PC CPU" name="AI PC CPU" value="AI PC CPU" data-column="3" class="toggle-vis"/>
<label for="AI PC CPU" class="checkmark"></label>
</label>
<label class="column-container">
Precision
<input type="checkbox" checked id="precision" name="precision" value="precision" data-column="2" class="toggle-vis"/>
<label for="precision" class="checkmark"></label>
GPU
<input type="checkbox" checked id="AI PC GPU" name="AI PC GPU" value="AI PC GPU" data-column="4" class="toggle-vis"/>
<label for="AI PC GPU" class="checkmark"></label>
</label>
<label class="column-container">
Arc
<input type="checkbox" checked id="arc" name="arc" value="arc" data-column="6" class="toggle-vis"/>
<label for="arc" class="checkmark"></label>
NPU
<input type="checkbox" checked id="AI PC NPU" name="AI PC NPU" value="AI PC NPU" data-column="5" class="toggle-vis"/>
<label for="AI PC NPU" class="checkmark"></label>
</label>


.. csv-table::
:class: modeldata stripe
:name: supportedModelsTable
:header-rows: 1
:file: ../../_static/models.csv
:file: ../../_static/download/supported_models.csv


| Note:
| The results as of June 17 2024, for OpenVINO version 2024.2.
| The validation process involves using OpenVINO, natively or as a backend, to load each model
onto the designated hardware and execute inference. If no errors are reported and inference
finishes, the model receives the **passed** status (indicated by a check mark in the table).
The models that are not tested are indicated by **empty** status cells.
| The models come from different public model repositories, such as, OpenVINO Model Zoo,
ONNX Model Zoo, Pytorch Model Zoo, and HuggingFace.
| In the precision column, the "optimum-intel default" label corresponds to FP32 for small
models and INT8 for models greater than 1B parameters.
11 changes: 1 addition & 10 deletions docs/articles_en/about-openvino/performance-benchmarks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -199,15 +199,6 @@ connection is dedicated only to measuring performance.
You can also test performance for your system yourself, following the guide on
:doc:`getting performance numbers <performance-benchmarks/getting-performance-numbers>`.

Performance of a particular application can also be evaluated virtually using
`Intel® DevCloud for the Edge <https://devcloud.intel.com/edge/>`__.
It is a remote development environment with access to Intel® hardware and the latest versions
of the Intel® Distribution of the OpenVINO™ Toolkit. To learn more about it, visit
`the website <https://www.intel.com/content/www/us/en/developer/tools/devcloud/edge/overview.html>`__
or
`create an account <https://www.intel.com/content/www/us/en/secure/forms/devcloud-enrollment/account-provisioning.html>`__.


.. raw:: html

<h2>Disclaimers</h2>
Expand All @@ -217,7 +208,7 @@ or
2024.2, as of June 17, 2024.

* OpenVINO Model Server performance results are based on release
2024.0, as of March 15, 2024.
2024.1, as of April 26, 2024.

The results may not reflect all publicly available updates. Intel technologies' features and
benefits depend on system configuration and may require enabled hardware, software, or service
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ This page is regularly updated to help you identify the best-performing LLMs on

The table below lists the key performance indicators for a selection of Large Language Models running on an Intel® Core™ Ultra 7-165H based system.

.. raw:: html
For complete information on the system config, see: `Hardware Platforms [PDF] <https://docs.openvino.ai/2024/_static/benchmarks_files/OV-2024.2-platform_list.pdf>`__

For complete information on the system config, see: <a href="https://docs.openvino.ai/2024/_static/benchmarks_files/OV-2024.2-platform_list.pdf">Hardware Platforms [PDF]</a>

.. raw:: html

Expand Down
Loading

0 comments on commit 32d70ad

Please sign in to comment.