Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into final-remove-api
Browse files Browse the repository at this point in the history
  • Loading branch information
ilya-lavrenov committed Feb 7, 2024
2 parents 52a87e8 + 1ad9611 commit b2d6b2b
Show file tree
Hide file tree
Showing 1,088 changed files with 5,992 additions and 3,103 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
merge_group:
push:
branches:
- master
# - master
- 'releases/**'

concurrency:
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,15 @@ jobs:
--form description="https://github.com/openvinotoolkit/openvino/runs/${{ github.run_number }}" \
https://scan.coverity.com/builds?project=openvino
popd
- name: Show Coverity configure logs
continue-on-error: true
run: cov-configure -c ${COVERITY_TOOL_DIR}/cov-analysis-linux64-2023.6.2/config/coverity_config.xml -lscc text

- name: Upload Coverity logs
uses: actions/upload-artifact@v3
if: always()
with:
name: coverity_logs
path: ${{ env.BUILD_DIR }}/cov-int/build-log.txt
if-no-files-found: 'error'
2 changes: 1 addition & 1 deletion .github/workflows/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
merge_group:
push:
branches:
- master
# - master
- 'releases/**'

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
merge_group:
push:
branches:
- master
# - master
- 'releases/**'

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/webassembly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
merge_group:
push:
branches:
- master
# - master
- 'releases/**'

concurrency:
Expand Down
30 changes: 16 additions & 14 deletions cmake/developer_package/cross_compile/cross_compiled_disp_gen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Generates cpp file with dispatcher for cross compiled function
# Parameters:
# XARCH_API_HEADER -- path to header with function declaration
# XARCH_FUNC_NAME -- name of function to dispatch
# XARCH_FUNC_NAMES -- names of functions to dispatch
# XARCH_NAMESPACES -- full namespace used to keep ODR
# XARCH_DISP_FILE -- dispatcher file name to generate
# XARCH_SET -- set of ARCH supported by dispatcher. semicolon-delimited
Expand All @@ -21,9 +21,6 @@ set(_CPU_CHECK_AVX2 "with_cpu_x86_avx2()")
set(_CPU_CHECK_AVX512F "with_cpu_x86_avx512f()")

function(_generate_dispatcher)
_find_signature_in_file(${XARCH_API_HEADER} ${XARCH_FUNC_NAME} SIGNATURE)
_generate_call_line_from_signature("${SIGNATURE}" CALL_LINE)

string(REPLACE "::" ";" XARCH_NAMESPACES "${XARCH_NAMESPACES}")

list(GET XARCH_NAMESPACES -1 XARCH_CURRENT_NAMESPACE)
Expand All @@ -46,20 +43,25 @@ function(_generate_dispatcher)
"namespace ${_namespace} {\n")
endforeach()

foreach(_arch ${XARCH_SET})
string(APPEND DISP_CONTENT
"namespace ${_arch} {\n ${SIGNATURE}\; \n}\n")
endforeach()
foreach(_func_name ${XARCH_FUNC_NAMES})
_find_signature_in_file(${XARCH_API_HEADER} ${_func_name} SIGNATURE)
_generate_call_line_from_signature("${SIGNATURE}" CALL_LINE)

string(APPEND DISP_CONTENT
"namespace ${XARCH_CURRENT_NAMESPACE} {\n\n${SIGNATURE} {\n")
foreach(_arch ${XARCH_SET})
string(APPEND DISP_CONTENT
"namespace ${_arch} {\n ${SIGNATURE}\; \n}\n")
endforeach()

foreach(_arch ${XARCH_SET})
string(APPEND DISP_CONTENT
" if (${_CPU_CHECK_${_arch}}) {\n return ${_arch}::${CALL_LINE}\;\n }\n")
endforeach()
"namespace ${XARCH_CURRENT_NAMESPACE} {\n\n${SIGNATURE} {\n")

foreach(_arch ${XARCH_SET})
string(APPEND DISP_CONTENT
" if (${_CPU_CHECK_${_arch}}) {\n return ${_arch}::${CALL_LINE}\;\n }\n")
endforeach()

string(APPEND DISP_CONTENT "}\n\n}\n")
string(APPEND DISP_CONTENT "}\n\n}\n")
endforeach()

foreach(_namespace ${PARENT_NAMESPACES})
string(APPEND DISP_CONTENT "} // namespace ${_namespace}\n")
Expand Down
11 changes: 6 additions & 5 deletions cmake/developer_package/cross_compile/cross_compiled_func.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,15 @@ set(DISPATCHER_GEN_OPTIONS_HOLDER ${CMAKE_CURRENT_LIST_DIR}/cross_compiled_disp_
# AVX512F <source_file>
# API <header_file>
# NAMESPACE <namespace> # like "IE::Ext::CPU::XARCH"
# NAME <function_name> # like "my_fun"
# NAME <function_names> # like "my_fun1 my_fun2"
# )
#
function(cross_compiled_file TARGET)
set(oneValueArgs API ## Header with declaration of cross compiled function
NAMESPACE ## The namespace where cross compiled function was declared
NAME) ## String with function signature to make cross compiled
set(multiValueArgs ARCH) ## List of architecture described in _ARCH_LIST
)
set(multiValueArgs NAME ## String with function signatures to make cross compiled
ARCH) ## List of architecture described in _ARCH_LIST
cmake_parse_arguments(X "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

## verification
Expand Down Expand Up @@ -92,7 +93,7 @@ function(cross_compiled_file TARGET)
endif()
endforeach()

_add_dispatcher_to_target(${TARGET} ${X_API} ${X_NAME} "${X_NAMESPACE}" "${_FULL_ARCH_SET}")
_add_dispatcher_to_target(${TARGET} ${X_API} "${X_NAME}" "${X_NAMESPACE}" "${_FULL_ARCH_SET}")
endfunction()


Expand Down Expand Up @@ -155,7 +156,7 @@ function(_add_dispatcher_to_target TARGET HEADER FUNC_NAME NAMESPACE ARCH_SET)
add_custom_command(
OUTPUT ${DISPATCHER_SOURCE}
COMMAND ${CMAKE_COMMAND}
-D "XARCH_FUNC_NAME=${X_NAME}"
-D "XARCH_FUNC_NAMES=${X_NAME}"
-D "XARCH_NAMESPACES=${NAMESPACE}"
-D "XARCH_API_HEADER=${CMAKE_CURRENT_SOURCE_DIR}/${HEADER}"
-D "XARCH_DISP_FILE=${CMAKE_CURRENT_BINARY_DIR}/${DISPATCHER_SOURCE}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Swish


.. meta::
:description: Learn about Swish-4 - an element-wise, activation operation, which
:description: Learn about Swish-4 - an element-wise, activation operation, which
can be performed on a single tensor in OpenVINO.

**Versioned name**: *Swish-4*
Expand Down Expand Up @@ -55,7 +55,7 @@ Example: Second input ``beta`` provided
<dim>256</dim>
<dim>56</dim>
</port>
<port id="1"> < !-- beta value: 2.0 -->
<port id="1"> <!-- beta value: 2.0 -->
</port>
</input>
<output>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CumSum


.. meta::
:description: Learn about CumSum-3 - an element-wise, arithmetic operation, which
:description: Learn about CumSum-3 - an element-wise, arithmetic operation, which
can be performed on a single tensor in OpenVINO.

**Versioned name**: *CumSum-3*
Expand All @@ -24,7 +24,7 @@ To perform the summation in the opposite direction of the axis, set reverse attr

* **Description**: If the attribute is set to ``true``, then exclusive sums are returned, the ``j-th`` element is not included in the ``j-th`` sum. Otherwise, the inclusive sum of the first ``j`` elements for the ``j-th`` element is calculated.
* **Range of values**:

* ``false`` - include the top element
* ``true`` - do not include the top element
* **Type**: ``boolean``
Expand All @@ -35,7 +35,7 @@ To perform the summation in the opposite direction of the axis, set reverse attr

* **Description**: If set to ``true`` will perform the sums in reverse direction.
* **Range of values**:

* ``false`` - do not perform sums in reverse direction
* ``true`` - perform sums in reverse direction
* **Type**: ``boolean``
Expand Down Expand Up @@ -63,16 +63,16 @@ To perform the summation in the opposite direction of the axis, set reverse attr

.. code-block:: xml
:force:
<layer ... type="CumSum" exclusive="0" reverse="0">
<input>
<port id="0"> < !-- input value is: [1., 2., 3., 4., 5.] -->
<port id="0"> <!-- input value is: [1., 2., 3., 4., 5.] -->
<dim>5</dim>
</port>
<port id="1"/> < !-- axis value is: 0 -->
<port id="1"/> <!-- axis value is: 0 -->
</input>
<output>
<port id="2"> < !-- output value is: [1., 3., 6., 10., 15.] -->
<port id="2"> <!-- output value is: [1., 3., 6., 10., 15.] -->
<dim>5</dim>
</port>
</output>
Expand All @@ -82,16 +82,16 @@ To perform the summation in the opposite direction of the axis, set reverse attr

.. code-block:: xml
:force:
<layer ... type="CumSum" exclusive="1" reverse="0">
<input>
<port id="0"> < !-- input value is: [1., 2., 3., 4., 5.] -->
<port id="0"> <!-- input value is: [1., 2., 3., 4., 5.] -->
<dim>5</dim>
</port>
<port id="1"/> < !-- axis value is: 0 -->
<port id="1"/> <!-- axis value is: 0 -->
</input>
<output>
<port id="2"> < !-- output value is: [0., 1., 3., 6., 10.] -->
<port id="2"> <!-- output value is: [0., 1., 3., 6., 10.] -->
<dim>5</dim>
</port>
</output>
Expand All @@ -101,16 +101,16 @@ To perform the summation in the opposite direction of the axis, set reverse attr

.. code-block:: xml
:force:
<layer ... type="CumSum" exclusive="0" reverse="1">
<input>
<port id="0"> < !-- input value is: [1., 2., 3., 4., 5.] -->
<port id="0"> <!-- input value is: [1., 2., 3., 4., 5.] -->
<dim>5</dim>
</port>
<port id="1"/> < !-- axis value is: 0 -->
<port id="1"/> <!-- axis value is: 0 -->
</input>
<output>
<port id="2"> < !-- output value is: [15., 14., 12., 9., 5.] -->
<port id="2"> <!-- output value is: [15., 14., 12., 9., 5.] -->
<dim>5</dim>
</port>
</output>
Expand All @@ -120,7 +120,7 @@ To perform the summation in the opposite direction of the axis, set reverse attr

.. code-block:: xml
:force:
<layer ... type="CumSum" exclusive="1" reverse="1">
<input>
<port id="0"> < -- input value is: [1., 2., 3., 4., 5.] -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Sqrt


.. meta::
:description: Learn about Sqrt-1 - an element-wise, arithmetic operation, which
:description: Learn about Sqrt-1 - an element-wise, arithmetic operation, which
can be performed on a single tensor in OpenVINO.

**Versioned name**: *Sqrt-1*
Expand Down Expand Up @@ -48,12 +48,12 @@ Sqrt
<layer ... type="Sqrt">
<input>
<port id="0">
<dim>4</dim> < !-- float input values: [4.0, 7.0, 9.0, 10.0] -->
<dim>4</dim> <!-- float input values: [4.0, 7.0, 9.0, 10.0] -->
</port>
</input>
<output>
<port id="1">
<dim>4</dim> < !-- float output values: [2.0, 2.6457512, 3.0, 3.1622777] -->
<dim>4</dim> <!-- float output values: [2.0, 2.6457512, 3.0, 3.1622777] -->
</port>
</output>
</layer>
Expand All @@ -66,12 +66,12 @@ Sqrt
<layer ... type="Sqrt">
<input>
<port id="0">
<dim>4</dim> < !-- int input values: [4, 7, 9, 10] -->
<dim>4</dim> <!-- int input values: [4, 7, 9, 10] -->
</port>
</input>
<output>
<port id="1">
<dim>4</dim> < !-- int output values: [2, 3, 3, 3] -->
<dim>4</dim> <!-- int output values: [2, 3, 3, 3] -->
</port>
</output>
</layer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ IsFinite


.. meta::
:description: Learn about IsFinite-10 - an element-wise, comparison operation, which
:description: Learn about IsFinite-10 - an element-wise, comparison operation, which
can be performed on a single tensor in OpenVINO.

**Versioned name**: *IsFinite-10*
Expand Down Expand Up @@ -64,12 +64,12 @@ IsFinite
<layer ... type="IsFinite">
<input>
<port id="0" precision="FP32">
<dim>4</dim> < !-- Input value is: [NaN, 2.1, 3.7, Inf] -->
<dim>4</dim<!-- Input value is: [NaN, 2.1, 3.7, Inf] -->
</port>
</input>
<output>
<port id="1" precision="BOOL">
<dim>4</dim> < !-- Output value is: [False, True, True, False] -->
<dim>4</dim<!-- Output value is: [False, True, True, False] -->
</port>
</output>
</layer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Select


.. meta::
:description: Learn about Select-1 - an element-wise, condition operation, which
:description: Learn about Select-1 - an element-wise, condition operation, which
can be performed on three given tensors in OpenVINO.

**Versioned name**: *Select-1*
Expand Down Expand Up @@ -58,21 +58,21 @@ Select
<layer ... type="Select">
<input>
<port id="0"> < !-- cond value is: [[false, false], [true, false], [true, true]] -->
<port id="0"> <!-- cond value is: [[false, false], [true, false], [true, true]] -->
<dim>3</dim>
<dim>2</dim>
</port>
<port id="1"> < !-- then value is: [[-1, 0], [1, 2], [3, 4]] -->
<port id="1"> <!-- then value is: [[-1, 0], [1, 2], [3, 4]] -->
<dim>3</dim>
<dim>2</dim>
</port>
<port id="2"> < !-- else value is: [[11, 10], [9, 8], [7, 6]] -->
<port id="2"> <!-- else value is: [[11, 10], [9, 8], [7, 6]] -->
<dim>3</dim>
<dim>2</dim>
</port>
</input>
<output>
<port id="1"> < !-- output value is: [[11, 10], [1, 8], [3, 4]] -->
<port id="1"> <!-- output value is: [[11, 10], [1, 8], [3, 4]] -->
<dim>3</dim>
<dim>2</dim>
</port>
Expand Down
Loading

0 comments on commit b2d6b2b

Please sign in to comment.