Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
emmanuel-ferdman authored Dec 30, 2024
2 parents 10f3c24 + 2ef42d4 commit 6af5f9f
Show file tree
Hide file tree
Showing 155 changed files with 3,168 additions and 833 deletions.
20 changes: 20 additions & 0 deletions .github/scripts/workflow_rerun/errors_to_look_for.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,25 @@
{
"error_text": "because the GET request got Content-Type",
"ticket": 158400
},
{
"error_text": "Unable to make request:",
"ticket": 158401
},
{
"error_text": "Failed to make request",
"ticket": 158401
},
{
"error_text": "Failure when receiving data from the peer",
"ticket": 159323
},
{
"error_text": "HTTP response code said error",
"ticket": 159398
},
{
"error_text": "download failed after attempts",
"ticket": 159547
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@ models from OpenVINO-supported frameworks may also work properly but have not be

**AI Models that run on Intel® Core Ultra™ Processors with OpenVINO™ toolkit:**

.. raw:: html

<link rel="stylesheet" type="text/css" href="../../_static/css/openVinoDataTables.css">


.. csv-table::
.. data-table::
:class: modeldata stripe
:name: supportedModelsTable
:header-rows: 1
:file: ../../_static/download/supported_models.csv
:data-column-hidden: []
:data-order: [[ 0, "asc" ]]
:data-page-length: 10


| Marked cells indicate models that passed inference with no errors. Empty cells indicate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,27 +41,36 @@ Data as of OpenVINO 2024.4, 18 Oct. 2024.

.. tab-item:: PyTorch

.. csv-table::
.. data-table::
:class: modeldata stripe
:name: TensorFlow ops
:name: TensorFlow_ops_v1
:header-rows: 1
:file: ../../_static/conformance_files/pytorch_ops.csv
:data-column-hidden: []
:data-order: [[ 0, "asc" ]]
:data-page-length: 10

.. tab-item:: TensorFlow

.. csv-table::
.. data-table::
:class: modeldata stripe
:name: TensorFlow ops
:name: TensorFlow_ops_v2
:header-rows: 1
:file: ../../_static/conformance_files/tensorflow_ops.csv
:data-column-hidden: []
:data-order: [[ 0, "asc" ]]
:data-page-length: 10

.. tab-item:: PaddlePaddle

.. csv-table::
.. data-table::
:class: modeldata stripe
:name: Paddle ops
:name: Paddle_ops
:header-rows: 1
:file: ../../_static/conformance_files/paddlepaddle_ops.csv
:data-column-hidden: []
:data-order: [[ 0, "asc" ]]
:data-page-length: 10

.. tab-item:: ONNX

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ The current data is as of OpenVINO 2024.4, 20 Nov. 2024.
The tables below list the key performance indicators for inference on built-in GPUs.


.. raw:: html

<label><link rel="stylesheet" type="text/css" href="../../_static/css/openVinoDataTables.css"></label>


.. tab-set::

Expand All @@ -22,7 +18,9 @@ The tables below list the key performance indicators for inference on built-in G
:name: supportedModelsTable_V1
:header-rows: 1
:file: ../../_static/benchmarks_files/llm_models_9-288V.csv
:hidden: [3,4,6]
:data-column-hidden: [3,4,6]
:data-order: [[ 0, "asc" ]]
:data-page-length: 10

.. tab-item:: 7-268V

Expand All @@ -31,7 +29,8 @@ The tables below list the key performance indicators for inference on built-in G
:name: supportedModelsTable_V2
:header-rows: 1
:file: ../../_static/benchmarks_files/llm_models_7-258V.csv
:hidden: [3,4,6]
:data-column-hidden: [3,4,6]
:data-order: [[ 0, "asc" ]]

.. tab-item:: 7-155H

Expand All @@ -40,7 +39,8 @@ The tables below list the key performance indicators for inference on built-in G
:name: supportedModelsTable_V3
:header-rows: 1
:file: ../../_static/benchmarks_files/llm_models_7-155H.csv
:hidden: [3,4,6]
:data-column-hidden: [3,4,6]
:data-order: [[ 0, "asc" ]]


.. grid:: 1 1 2 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import requests
import re
import json

import html
import csv

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -147,7 +147,9 @@ class DataTable(Directive):
'file': directives.path,
'class': directives.unchanged,
'name': directives.unchanged,
'hidden': directives.unchanged
'data-column-hidden': directives.unchanged,
'data-page-length': directives.unchanged,
'data-order': directives.unchanged
}

def run(self) -> List[Node]:
Expand All @@ -159,10 +161,12 @@ def run(self) -> List[Node]:
csv_node = []
with open(csv_file, 'r') as j:
csv_data = list(csv.reader(j))
class_table_tag = ' class="' + "".join(c for c in str(self.options['class']) + '"') if 'class' in self.options is not None else ""
id_table_tag = ' id="' + "".join(c for c in str(self.options['name']) + '"') if 'name' in self.options is not None else ""
hidden_table_tag = ' data-columns-hidden="' + "".join(c for c in str(self.options['hidden']) + '"') if 'hidden' in self.options is not None else ""
csv_table_html = '<table' + class_table_tag + id_table_tag + hidden_table_tag + '>'
class_table_tag = f' class="{html.escape(self.options["class"])}"' if "class" in self.options else ""
id_table_tag = f' id="{html.escape(self.options["name"])}"' if "name" in self.options else ""
data_column_hidden_tag = f' data-column-hidden="{html.escape(self.options["data-column-hidden"])}"' if "data-column-hidden" in self.options else ""
data_order_tag = f' data-order="{html.escape(self.options["data-order"])}"' if "data-order" in self.options else ""
data_page_length_tag = f' data-page-length="{html.escape(self.options["data-page-length"])}"' if "data-page-length" in self.options else ""
csv_table_html = f'<table{class_table_tag}{id_table_tag}{data_column_hidden_tag}{data_order_tag}{data_page_length_tag}>'
head_rows = 0
head_rows += self.options.get('header-rows', 0)
row_count = 0
Expand Down
5 changes: 2 additions & 3 deletions docs/sphinx_setup/_static/css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ a#wap_dns {
/* Sphinx-design tabs override */
.sd-tab-set>input:checked+label {
color: var(--sd-color-black) !important;
background-color: #f8f8f8 !important;
background-color: white !important;
border: solid 1px #bdbdbd;
border-bottom: solid 0px;
margin-bottom: -1px;
Expand All @@ -96,7 +96,7 @@ a#wap_dns {
cursor: pointer;
font-size: var(--sd-fontsize-tabs-label);
font-weight: 400 !important;
padding: 5px 16px 2px !important;
padding: 5px 16px 0px !important;
transition: color 250ms;
width: auto;
z-index: 1;
Expand All @@ -110,7 +110,6 @@ a#wap_dns {
box-shadow: 0 0 0 0;
border: solid 1px var(--sd-color-tabs-overline);
border-color: #bdbdbd;
background-color: #f8f8f8;
padding-right: 4px;
padding-left: 4px;
padding-bottom: 6px;
Expand Down
6 changes: 2 additions & 4 deletions docs/sphinx_setup/_static/css/openVinoDataTables.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ div.dt-buttons>.dt-button, div.dt-buttons>div.dt-button-split .dt-button {
}

div.dt-container .dt-paging .dt-paging-button:hover {
color: white !important;
border: 1px solid #aaa;
border: 1px solid #aaa !important;
background:none !important;
background-color: var(--bttn-act-bg-hover) !important
}
Expand Down Expand Up @@ -190,10 +189,9 @@ div.dt-container .dt-paging .dt-paging-button {

div.dt-container .dt-paging .dt-paging-button.current, div.dt-container .dt-paging .dt-paging-button.current:hover {
background: none !important;
background-color: var(--bttn-act-bg-active) !important;
background-color: var(--bttn-sec-border-color) !important;
border-color: var(--bttn-act-bg-active) !important;
border-radius: 0px !important;
color: white !important;
border: 1px !important
}
table.dataTable thead>tr>th.dt-orderable-asc span.dt-column-order:before, table.dataTable thead>tr>th.dt-orderable-asc span.dt-column-order:after, table.dataTable thead>tr>th.dt-orderable-desc span.dt-column-order:before, table.dataTable thead>tr>th.dt-orderable-desc span.dt-column-order:after, table.dataTable thead>tr>th.dt-ordering-asc span.dt-column-order:before, table.dataTable thead>tr>th.dt-ordering-asc span.dt-column-order:after, table.dataTable thead>tr>th.dt-ordering-desc span.dt-column-order:before, table.dataTable thead>tr>th.dt-ordering-desc span.dt-column-order:after, table.dataTable thead>tr>td.dt-orderable-asc span.dt-column-order:before, table.dataTable thead>tr>td.dt-orderable-asc span.dt-column-order:after, table.dataTable thead>tr>td.dt-orderable-desc span.dt-column-order:before, table.dataTable thead>tr>td.dt-orderable-desc span.dt-column-order:after, table.dataTable thead>tr>td.dt-ordering-asc span.dt-column-order:before, table.dataTable thead>tr>td.dt-ordering-asc span.dt-column-order:after, table.dataTable thead>tr>td.dt-ordering-desc span.dt-column-order:before, table.dataTable thead>tr>td.dt-ordering-desc span.dt-column-order:after {
Expand Down
5 changes: 2 additions & 3 deletions docs/sphinx_setup/_static/js/openVinoDataTables.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
$(document).ready(function () {
var columnDefs = [];

var tables = $('table.modeldata');
for (let table of tables) {
var hidden = table.getAttribute('data-columns-hidden');
var hidden = table.getAttribute('data-column-hidden');
columnDefs = [{ "visible": false, "targets": JSON.parse(hidden) }]
$(table).DataTable({
responsive: true,
"autoWidth": false,
language: {
buttons: {
colvisRestore: "Restore default"
colvisRestore: "Restore default selection"
}
},
lengthMenu: [
Expand Down
1 change: 1 addition & 0 deletions docs/sphinx_setup/_templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<link rel="stylesheet" href="{{ pathto('_static/css/viewer.min.css', 1) }}" type="text/css" />
<link rel="stylesheet" href="{{ pathto('_static/css/custom.css', 1) }}" type="text/css" />
<link rel="stylesheet" href="{{ pathto('_static/css/banner.css', 1) }}" type="text/css" />
<link rel="stylesheet" href="{{ pathto('_static/css/openVinoDataTables.css', 1) }}" type="text/css" />
<link href="https://cdn.datatables.net/v/dt/jq-3.7.0/dt-2.0.8/b-3.0.2/b-colvis-3.0.2/b-print-3.0.2/datatables.min.css" rel="stylesheet">
<link rel="stylesheet" href="{{ pathto('_static/css/coveo_custom.css', 1) }}" type="text/css" />
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.min.js"></script>
Expand Down
73 changes: 29 additions & 44 deletions src/bindings/python/src/openvino/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Required for Windows OS platforms
# Note: always top-level
try:
from openvino.package_utils import _add_openvino_libs_to_search_path
from openvino.utils import _add_openvino_libs_to_search_path
_add_openvino_libs_to_search_path()
except ImportError:
pass
Expand All @@ -17,47 +17,6 @@
# # This __init__.py forces checking of runtime modules to propagate errors.
# # It is not compared with init files from openvino-dev package.
# #

# Openvino pybind bindings
from openvino._pyopenvino import AxisSet
from openvino._pyopenvino import AxisVector
from openvino._pyopenvino import ConstOutput
from openvino._pyopenvino import Coordinate
from openvino._pyopenvino import CoordinateDiff
from openvino._pyopenvino import DiscreteTypeInfo
from openvino._pyopenvino import Extension
from openvino._pyopenvino import ProfilingInfo
from openvino._pyopenvino import RTMap
from openvino._pyopenvino import Version
from openvino._pyopenvino import Symbol
from openvino._pyopenvino import Dimension
from openvino._pyopenvino import Input
from openvino._pyopenvino import Output
from openvino._pyopenvino import Node
from openvino._pyopenvino import Strides
from openvino._pyopenvino import PartialShape
from openvino._pyopenvino import Shape
from openvino._pyopenvino import Layout
from openvino._pyopenvino import Type
from openvino._pyopenvino import Tensor
from openvino._pyopenvino import OVAny
from openvino._pyopenvino import get_batch
from openvino._pyopenvino import set_batch
from openvino._pyopenvino import serialize
from openvino._pyopenvino import shutdown
from openvino._pyopenvino import save_model
from openvino._pyopenvino import layout_helpers
from openvino._pyopenvino import RemoteContext
from openvino._pyopenvino import RemoteTensor
from openvino._pyopenvino import Op

# Import public classes from _ov_api
from openvino._ov_api import Model
from openvino._ov_api import Core
from openvino._ov_api import CompiledModel
from openvino._ov_api import InferRequest
from openvino._ov_api import AsyncInferQueue

# Import all public modules
from openvino import runtime as runtime
from openvino import frontend as frontend
Expand All @@ -67,10 +26,36 @@
from openvino import utils as utils
from openvino import properties as properties

# Import most important classes and functions from openvino.runtime
from openvino._ov_api import Model
from openvino._ov_api import Core
from openvino._ov_api import CompiledModel
from openvino._ov_api import InferRequest
from openvino._ov_api import AsyncInferQueue

from openvino.runtime import Symbol
from openvino.runtime import Dimension
from openvino.runtime import Strides
from openvino.runtime import PartialShape
from openvino.runtime import Shape
from openvino.runtime import Layout
from openvino.runtime import Type
from openvino.runtime import Tensor
from openvino.runtime import OVAny

# Helper functions for openvino module
from openvino.utils.data_helpers import tensor_from_file
from openvino.runtime.utils.data_helpers import tensor_from_file
from openvino._ov_api import compile_model
from openvino.runtime import get_batch
from openvino.runtime import set_batch
from openvino.runtime import serialize
from openvino.runtime import shutdown
from openvino.runtime import save_model
from openvino.runtime import layout_helpers

from openvino._pyopenvino import RemoteContext
from openvino._pyopenvino import RemoteTensor
from openvino._pyopenvino import Op

# Import opsets
from openvino import opset1
Expand All @@ -95,7 +80,7 @@
from openvino._pyopenvino import VASurfaceTensor

# Set version for openvino package
from openvino._pyopenvino import get_version
from openvino.runtime import get_version
__version__ = get_version()

# Tools
Expand Down
4 changes: 3 additions & 1 deletion src/bindings/python/src/openvino/_ov_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
from types import TracebackType
from typing import Any, Iterable, Union, Optional, Dict, Type
from pathlib import Path
import warnings

import numpy as np

from openvino._pyopenvino import Model as ModelBase
from openvino._pyopenvino import Core as CoreBase
Expand All @@ -14,7 +16,7 @@
from openvino._pyopenvino import Tensor
from openvino._pyopenvino import Node

from openvino.utils.data_helpers import (
from openvino.runtime.utils.data_helpers import (
OVDict,
_InferRequestWrapper,
_data_dispatch,
Expand Down
2 changes: 1 addition & 1 deletion src/bindings/python/src/openvino/frontend/frontend.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from openvino._pyopenvino import FrontEnd as FrontEndBase
from openvino._pyopenvino import FrontEndManager as FrontEndManagerBase
from openvino._pyopenvino import InputModel
from openvino import Model
from openvino.runtime import Model


class FrontEnd(FrontEndBase):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import jax.core
from openvino.frontend.jax.py_jax_frontend import _FrontEndJaxDecoder as Decoder
from openvino import PartialShape, Type as OVType, OVAny
from openvino.runtime import PartialShape, Type as OVType, OVAny
from openvino.frontend.jax.utils import jax_array_to_ov_const, get_ov_type_for_value, \
ivalue_to_constant, param_to_constants

Expand Down
2 changes: 1 addition & 1 deletion src/bindings/python/src/openvino/frontend/jax/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import jax.numpy as jnp
import numpy as np
from openvino.frontend.jax.passes import filter_element, filter_ivalue, filter_param
from openvino import op, Type as OVType, Shape, OVAny
from openvino.runtime import op, Type as OVType, Shape, OVAny

numpy_to_ov_type_map = {
np.float32: OVType.f32,
Expand Down
Loading

0 comments on commit 6af5f9f

Please sign in to comment.