Skip to content

Commit

Permalink
Merge branch 'master' into segmentmax_core
Browse files Browse the repository at this point in the history
  • Loading branch information
p-wysocki authored Feb 6, 2025
2 parents 303f383 + e4611ea commit 999b613
Show file tree
Hide file tree
Showing 508 changed files with 24,071 additions and 21,889 deletions.
2 changes: 1 addition & 1 deletion .github/dockerfiles/docker_tag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pr-28040
pr-28725
6 changes: 4 additions & 2 deletions .github/dockerfiles/ov_build/ubuntu_22_04_x64_cc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ ENV DEBIAN_FRONTEND="noninteractive" \
TZ="Europe/London"

RUN apt-get update && \
apt-get install software-properties-common && \
apt-get install software-properties-common wget && \
add-apt-repository --yes --no-update ppa:git-core/ppa && \
add-apt-repository --yes --no-update "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" && \
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/llvm.asc && \
add-apt-repository --yes --no-update ppa:deadsnakes/ppa && \
apt-get update && \
apt-get install \
Expand All @@ -38,7 +40,7 @@ RUN apt-get update && \
# Compiler \
clang-15 \
# Static analyzer
clang-tidy-15 \
clang-tidy-18 \
# clang-tidy uses clang-format as a dependency
clang-format-15 \
&& \
Expand Down
4 changes: 4 additions & 0 deletions .github/scripts/workflow_rerun/errors_to_look_for.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,9 @@
{
"error_text": "the runner has received a shutdown signal",
"ticket": 160818
},
{
"error_text": "Timed out waiting for server startup",
"ticket": 161077
}
]
4 changes: 2 additions & 2 deletions .github/workflows/export_workflow_metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ on:
- "macOS ARM64 (Python 3.11)"
- "Manylinux 2014"
- "Webassembly"
- "Windows (VS 2019, Python 3.11, Release)"
- "Windows (VS 2019, Python 3.11, Debug)"
- "Windows (VS 2022, Python 3.11, Release)"
- "Windows (VS 2022, Python 3.11, Debug)"
- "Windows Conditional Compilation (VS 2022, Python 3.11)"
- "Rerun Workflow with Known Errors"
types:
Expand Down
File renamed without changes.
6 changes: 4 additions & 2 deletions .github/workflows/workflow_rerunner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ on:
- Linux ARM64 (Ubuntu 20.04, Python 3.11)
- Linux Static CC (Ubuntu 22.04, Python 3.11, Clang)
- Linux RISC-V with Conan (Ubuntu 22.04, Python 3.10)
- Windows (VS 2019, Python 3.11, Release)
- Windows (VS 2019, Python 3.11, Debug)
- Fedora 29 (RHEL 8.4), Python 3.9
- Windows (VS 2022, Python 3.11, Release)
- Windows (VS 2022, Python 3.11, Debug)
- Windows Conditional Compilation (VS 2022, Python 3.11)
- Manylinux 2014
types:
- completed
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion cmake/developer_package/clang_tidy/clang_tidy.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#

if(ENABLE_CLANG_TIDY)
set(CLANG_TIDY_REQUIRED_VERSION 15 CACHE STRING "clang-tidy version to use")
set(CLANG_TIDY_REQUIRED_VERSION 18 CACHE STRING "clang-tidy version to use")
set(CLANG_TIDY_FILENAME clang-tidy-${CLANG_TIDY_REQUIRED_VERSION} clang-tidy)
find_host_program(CLANG_TIDY NAMES ${CLANG_TIDY_FILENAME} PATHS ENV PATH)
if(CLANG_TIDY)
Expand Down
34 changes: 34 additions & 0 deletions cmake/developer_package/compile_flags/os_flags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -669,3 +669,37 @@ function(ov_try_use_gold_linker)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold" PARENT_SCOPE)
endif()
endfunction()

#
# ov_target_link_libraries_as_system(<TARGET NAME> <PUBLIC | PRIVATE | INTERFACE> <target1 target2 ...>)
#
function(ov_target_link_libraries_as_system TARGET_NAME LINK_TYPE)
message("Link to ${TARGET_NAME} using ${LINK_TYPE} the following ${ARGN}")
target_link_libraries(${TARGET_NAME} ${LINK_TYPE} ${ARGN})

# include directories as SYSTEM
foreach(library IN LISTS ARGN)
if(TARGET ${library})
get_target_property(include_directories ${library} INTERFACE_INCLUDE_DIRECTORIES)
if(include_directories)
foreach(include_directory IN LISTS include_directories)
# cannot include /usr/include headers as SYSTEM
if(NOT "${include_directory}" MATCHES ".*/usr/include.*$")
# Note, some include dirs can be wrapper with $<BUILD_INTERFACE:dir1 dir2 ...> and we need to clean it
string(REGEX REPLACE "^\\$<BUILD_INTERFACE:" "" include_directory "${include_directory}")
string(REGEX REPLACE ">$" "" include_directory "${include_directory}")
target_include_directories(${TARGET_NAME} SYSTEM ${LINK_TYPE} $<BUILD_INTERFACE:${include_directory}>)
else()
set(_system_library ON)
endif()
endforeach()
endif()
endif()
endforeach()

if(_system_library)
# if we deal with system library (e.i. having /usr/include as header paths)
# we cannot use SYSTEM key word for such library
set_target_properties(${TARGET_NAME} PROPERTIES NO_SYSTEM_FROM_IMPORTED ON)
endif()
endfunction()
3 changes: 2 additions & 1 deletion cmake/developer_package/plugins/plugins.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ function(ov_add_plugin)

if (OV_PLUGIN_ADD_CLANG_TIDY)
if (ENABLE_CLANG_TIDY)
set_target_properties(${OV_PLUGIN_NAME} PROPERTIES CXX_CLANG_TIDY clang-tidy-${CLANG_TIDY_REQUIRED_VERSION})
set_target_properties(${OV_PLUGIN_NAME} PROPERTIES
CXX_CLANG_TIDY "clang-tidy-${CLANG_TIDY_REQUIRED_VERSION};--extra-arg=-Wno-unused-command-line-argument")
endif()
endif()

Expand Down
8 changes: 4 additions & 4 deletions docs/articles_en/about-openvino/performance-benchmarks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,21 +132,21 @@ For a listing of all platforms and configurations used for testing, refer to the

.. grid-item::

.. button-link:: ../_static/downloads/benchmarking_OV_platform_list.pdf
.. button-link:: ../_static/download/benchmarking_OV_platform_list.pdf
:color: primary
:outline:
:expand:

:material-regular:`download;1.5em` Click for Hardware Platforms [PDF]

.. button-link:: ../_static/downloads/benchmarking_OV_system_info_detailed.xlsx
.. button-link:: ../_static/download/benchmarking_OV_system_info_detailed.xlsx
:color: primary
:outline:
:expand:

:material-regular:`download;1.5em` Click for Configuration Details [XLSX]

.. button-link:: ../_static/downloads/benchmarking_OV_performance-data.xlsx
.. button-link:: ../_static/download/benchmarking_OV_performance-data.xlsx
:color: primary
:outline:
:expand:
Expand All @@ -160,7 +160,7 @@ For a listing of all platforms and configurations used for testing, refer to the
**Disclaimers**

* Intel® Distribution of OpenVINO™ toolkit performance results are based on release
2024.6, as of December 18, 2024.
2025.0 as of January 28, 2025.

* OpenVINO Model Server performance results are based on release
2024.5, as of November 20, 2024.
Expand Down
Loading

0 comments on commit 999b613

Please sign in to comment.