Merge branch 'master' into sbm

sbalandi · Jul 2, 2024 · 032f62b · 032f62b
2 parents 0b2e5ba + 626966b
commit 032f62b
Show file tree

Hide file tree

Showing 120 changed files with 4,425 additions and 479 deletions.
diff --git a/.github/dockerfiles/docker_tag b/.github/dockerfiles/docker_tag
@@ -1 +1 @@
-pr-25130
+pr-25303
diff --git a/.github/dockerfiles/ov_build/fedora_33/Dockerfile b/.github/dockerfiles/ov_build/fedora_33/Dockerfile
@@ -0,0 +1,23 @@
+FROM openvinogithubactions.azurecr.io/dockerio/library/fedora:33
+
+USER root
+
+RUN yum update -y && yum install -y git
+
+# Install build dependencies
+ADD install_build_dependencies.sh /install_build_dependencies.sh
+RUN chmod +x /install_build_dependencies.sh && \
+    /install_build_dependencies.sh && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install sscache
+ARG SCCACHE_VERSION="v0.7.5"
+ENV SCCACHE_HOME="/opt/sccache" \
+    SCCACHE_PATH="/opt/sccache/sccache"
+
+RUN mkdir ${SCCACHE_HOME} && cd ${SCCACHE_HOME} && \
+    SCCACHE_ARCHIVE="sccache-${SCCACHE_VERSION}-x86_64-unknown-linux-musl.tar.gz" && \
+    curl -SLO https://github.com/mozilla/sccache/releases/download/${SCCACHE_VERSION}/${SCCACHE_ARCHIVE} && \
+    tar -xzf ${SCCACHE_ARCHIVE} --strip-components=1 && rm ${SCCACHE_ARCHIVE}
+
+ENV PATH="$SCCACHE_HOME:$PATH"
diff --git a/.github/dockerfiles/ov_build/webassembly/Dockerfile b/.github/dockerfiles/ov_build/webassembly/Dockerfile
@@ -0,0 +1,33 @@
+FROM openvinogithubactions.azurecr.io/dockerio/emscripten/emsdk:3.1.61
+
+USER root
+
+# APT configuration
+RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf && \
+    echo 'APT::Get::Assume-Yes "true";' >> /etc/apt/apt.conf && \
+    echo 'APT::Get::Fix-Broken "true";' >> /etc/apt/apt.conf && \
+    echo 'APT::Get::no-install-recommends "true";' >> /etc/apt/apt.conf
+
+ENV DEBIAN_FRONTEND="noninteractive" \
+    TZ="Europe/London"
+
+RUN apt-get update && \
+    apt-get install software-properties-common && \
+    add-apt-repository --yes --no-update ppa:git-core/ppa && \
+    apt-get update && \
+    apt-get install \
+        git \
+        ca-certificates && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install sscache
+ARG SCCACHE_VERSION="v0.7.5"
+ENV SCCACHE_HOME="/opt/sccache" \
+    SCCACHE_PATH="/opt/sccache/sccache"
+
+RUN mkdir ${SCCACHE_HOME} && cd ${SCCACHE_HOME} && \
+    SCCACHE_ARCHIVE="sccache-${SCCACHE_VERSION}-x86_64-unknown-linux-musl.tar.gz" && \
+    curl -SLO https://github.com/mozilla/sccache/releases/download/${SCCACHE_VERSION}/${SCCACHE_ARCHIVE} && \
+    tar -xzf ${SCCACHE_ARCHIVE} --strip-components=1 && rm ${SCCACHE_ARCHIVE}
+
+ENV PATH="$SCCACHE_HOME:$PATH"
diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
@@ -20,6 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       affected_components: "${{ steps.smart_ci.outputs.affected_components }}"
+      changed_components: "${{ steps.smart_ci.outputs.changed_components }}"
       skip_workflow: "${{ steps.smart_ci.outputs.skip_workflow }}"
     steps:
       - name: checkout action
@@ -40,15 +41,42 @@ jobs:
           skip_when_only_listed_labels_set: 'docs'
           skip_when_only_listed_files_changed: '*.md,*.rst,*.png,*.jpg,*.svg,*/layer_tests_summary/*,*/conformance/*'
 
-  Build:
+      - name: Show affected components
+        run: |
+          echo "${{ toJSON(steps.smart_ci.outputs.affected_components) }}"
+        shell: bash
+
+  Docker:
     needs: Smart_CI
+    runs-on: aks-linux-4-cores-16gb-docker-build
+    container:
+      image: openvinogithubactions.azurecr.io/docker_build:0.2
+      volumes:
+        - /mount:/mount
+    outputs:
+      images: "${{ steps.handle_docker.outputs.images }}"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - uses: ./.github/actions/handle_docker
+        id: handle_docker
+        with:
+          images: |
+            ov_build/fedora_33
+          registry: 'openvinogithubactions.azurecr.io'
+          dockerfiles_root_dir: '.github/dockerfiles'
+          changed_components: ${{ needs.smart_ci.outputs.changed_components }}
+
+  Build:
+    needs: [Docker, Smart_CI]
     timeout-minutes: 150
     defaults:
       run:
         shell: bash
     runs-on: aks-linux-16-cores-32gb
     container:
-      image: fedora:33
+      image: ${{ fromJSON(needs.docker.outputs.images).ov_build.fedora_33 }}
       volumes:
         - /mount:/mount
       options: -e SCCACHE_AZURE_BLOB_CONTAINER -e SCCACHE_AZURE_CONNECTION_STRING
@@ -69,9 +97,6 @@ jobs:
       SCCACHE_AZURE_KEY_PREFIX: fedora33_x86_64_Release
     if: "!needs.smart_ci.outputs.skip_workflow"
     steps:
-      - name: Install git
-        run: yum update -y && yum install -y git
-
       - name: Clone OpenVINO
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
@@ -89,14 +114,6 @@ jobs:
       # Dependencies
       #
 
-      - name: Install build dependencies
-        run: bash ${OPENVINO_REPO}/install_build_dependencies.sh
-
-      - name: Install sccache
-        uses: mozilla-actions/sccache-action@89e9040de88b577a072e3760aaf59f585da083af # v0.0.5
-        with:
-          version: "v0.7.5"
-
       - name: Install python dependencies
         run: |
           python3 -m pip install -U pip
@@ -204,14 +221,14 @@ jobs:
           if-no-files-found: 'error'
 
   RPM_Packages:
-    needs: Build
+    needs: [Docker, Build]
     timeout-minutes: 10
     defaults:
       run:
         shell: bash
-    runs-on: ubuntu-20.04
+    runs-on: aks-linux-4-cores-16gb
     container:
-      image: fedora:33
+      image: ${{ fromJSON(needs.docker.outputs.images).ov_build.fedora_33 }}
     env:
       RPM_PACKAGES_DIR: /__w/openvino/packages/
 

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -687,7 +687,7 @@ jobs:
   Overall_Status:
     name: ci/gha_overall_status
     needs: [Smart_CI, Build, Debian_Packages, Samples, Conformance, ONNX_Runtime, CXX_Unit_Tests, Python_Unit_Tests, TensorFlow_Layer_Tests,
-            CPU_Functional_Tests, TensorFlow_Models_Tests_Precommit, PyTorch_Models_Tests, NVIDIA_Plugin, Openvino_tokenizers, iGPU]
+            CPU_Functional_Tests, TensorFlow_Models_Tests_Precommit, PyTorch_Models_Tests, NVIDIA_Plugin, Openvino_tokenizers]
     if: ${{ always() }}
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml
@@ -20,6 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       affected_components: "${{ steps.smart_ci.outputs.affected_components }}"
+      changed_components: "${{ steps.smart_ci.outputs.changed_components }}"
       skip_workflow: "${{ steps.smart_ci.outputs.skip_workflow }}"
     steps:
       - name: checkout action
@@ -40,14 +41,41 @@ jobs:
           skip_when_only_listed_labels_set: 'docs'
           skip_when_only_listed_files_changed: '*.md,*.rst,*.png,*.jpg,*.svg,*/layer_tests_summary/*,*/conformance/*'
 
-  Build:
+      - name: Show affected components
+        run: |
+          echo "${{ toJSON(steps.smart_ci.outputs.affected_components) }}"
+        shell: bash
+
+  Docker:
     needs: Smart_CI
+    runs-on: aks-linux-4-cores-16gb-docker-build
+    container:
+      image: openvinogithubactions.azurecr.io/docker_build:0.2
+      volumes:
+        - /mount:/mount
+    outputs:
+      images: "${{ steps.handle_docker.outputs.images }}"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - uses: ./.github/actions/handle_docker
+        id: handle_docker
+        with:
+          images: |
+            ov_build/webassembly
+          registry: 'openvinogithubactions.azurecr.io'
+          dockerfiles_root_dir: '.github/dockerfiles'
+          changed_components: ${{ needs.smart_ci.outputs.changed_components }}
+
+  Build:
+    needs: [Docker, Smart_CI]
     defaults:
       run:
         shell: bash
     runs-on: aks-linux-16-cores-32gb
     container:
-      image: emscripten/emsdk
+      image: ${{ fromJSON(needs.docker.outputs.images).ov_build.webassembly }}
       volumes:
         - /mount:/mount
       options: -e SCCACHE_AZURE_BLOB_CONTAINER -e SCCACHE_AZURE_CONNECTION_STRING
@@ -62,20 +90,12 @@ jobs:
       SCCACHE_AZURE_KEY_PREFIX: webassembly_Release
     if: "!needs.smart_ci.outputs.skip_workflow"
     steps:
-      - name: Install git
-        run: apt-get update && apt-get install --assume-yes --no-install-recommends git ca-certificates
-
       - name: Clone OpenVINO
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           path: 'openvino'
           submodules: 'true'
 
-      - name: Install sccache
-        uses: mozilla-actions/sccache-action@89e9040de88b577a072e3760aaf59f585da083af # v0.0.5
-        with:
-          version: "v0.7.5"
-
       - name: emcmake cmake - configure
         run: |
           emcmake cmake \

diff --git a/docs/articles_en/about-openvino/additional-resources.rst b/docs/articles_en/about-openvino/additional-resources.rst
diff --git a/...articles_en/about-openvino/performance-benchmarks/generative-ai-performance.rst b/...articles_en/about-openvino/performance-benchmarks/generative-ai-performance.rst
@@ -1,8 +1,15 @@
 Most Efficient Large Language Models for AI PC
 ==============================================
 
-The table below lists key performance indicators for a selection of Large Language Models
-running on an Intel® Core™ Ultra 7-165H based system.
+This page is regularly updated to help you identify the best-performing LLMs on the
+Intel® Core™ Ultra processor family and AI PCs.
+
+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, on built-in GPUs.
+
+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>`__
+
 
 .. raw:: html
 
@@ -54,7 +61,7 @@ running on an Intel® Core™ Ultra 7-165H based system.
    :class: modeldata stripe
    :name: supportedModelsTable
    :header-rows: 1
-   :file:  ../../_static/llm_models.csv
+   :file:  ../../_static/download/llm_models.csv
 
 
 This page is regularly updated to help you identify the best-performing LLMs on the

diff --git a/docs/openvino_sphinx_theme/openvino_sphinx_theme/templates/navbar-nav.html b/docs/openvino_sphinx_theme/openvino_sphinx_theme/templates/navbar-nav.html
@@ -31,6 +31,13 @@
             </a>
           </li>
 
+          <li class="toctree-l1 nav-item">
+            <a class="reference external nav-link"
+              href="https://docs.openvino.ai/2024/about-openvino/performance-benchmarks.html">
+              Performance Benchmarks
+            </a>
+          </li>
+
           <li class="toctree-l1 nav-item">
             <a class="reference external nav-link" href="https://github.com/openvinotoolkit">
               GitHub

diff --git a/docs/sphinx_setup/_static/llm_models.csv → ...inx_setup/_static/download/llm_models.csv b/docs/sphinx_setup/_static/llm_models.csv → ...inx_setup/_static/download/llm_models.csv
@@ -19,5 +19,4 @@ Mistral-7b-v0.1,10.5,4462,7242,1007,128,INT4,1,1,PT,
 Zephyr-7b-beta,10.5,4500,7039,1024,128,INT4,1,1,PT,
 Qwen1.5-7b-chat,9.9,4318,7034,1024,128,INT4,1,1,PT,
 Baichuan2-7b-chat,9.8,4668,6724,1024,128,INT4,1,1,PT,
-Qwen-7b-chat,9.0,5141,6996,1024,128,INT4,1,1,PT,
-Vicuna-7b-v1.5,0.0,3982,7022,1024,128,INT4,1,1,PT,
+Qwen-7b-chat,9.0,5141,6996,1024,128,INT4,1,1,PT,