Merge branch 'master' into using_one_socket

openvinotoolkit · Dec 5, 2024 · d267a34 · d267a34
2 parents 52f8e47 + 6d9bd0e
commit d267a34
Show file tree

Hide file tree

Showing 227 changed files with 4,246 additions and 2,620 deletions.
diff --git a/.github/actions/openvino_provider/action.yml b/.github/actions/openvino_provider/action.yml
@@ -177,7 +177,7 @@ runs:
         else
           ov_package_url=$(curl -s ${{ inputs.nightly_package_source }} | jq -r '.${{ inputs.platform }}_${{ inputs.arch }}')
         fi
-        cd ${{ inputs.install_dir || env.GITHUB_WORKSPACE }}
+        cd ${{ inputs.install_dir || github.workspace }}
         package_basename=$(basename $ov_package_url)
         wget $ov_package_url --progress=bar:force:noscroll -O $package_basename
         package_folder=${package_basename%.*}
@@ -196,7 +196,7 @@ runs:
       uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
       with:
         name: ${{ steps.openvino_s3_download.outputs.ov_artifact_name }}
-        path: ${{ steps.openvino_s3_download.outputs.ov_package_path }}
+        path: ${{ github.workspace }}/${{ steps.openvino_s3_download.outputs.ov_package_path }}
         if-no-files-found: 'error'
 
     - name: Get wheel

diff --git a/.github/workflows/debian_10_arm.yml b/.github/workflows/debian_10_arm.yml
@@ -49,7 +49,7 @@ jobs:
   Docker:
     needs: Smart_CI
     if: "!needs.smart_ci.outputs.skip_workflow"
-    runs-on: aks-linux-16-cores-arm-docker-build
+    runs-on: aks-linux-4-cores-8gb-arm-docker-build
     container:
       image: openvinogithubactions.azurecr.io/docker_build:0.2
       volumes:
@@ -75,7 +75,7 @@ jobs:
     if: "!needs.smart_ci.outputs.skip_workflow"
     uses: ./.github/workflows/job_build_linux.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-16-cores-32gb-arm'
       container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_build.debian_10_arm }}", "volumes": ["/mount:/mount"], "options": "-e SCCACHE_AZURE_BLOB_CONTAINER -e SCCACHE_AZURE_CONNECTION_STRING"}'
       affected-components: ${{ needs.smart_ci.outputs.affected_components }}
       event-name: ${{ github.event_name }}
@@ -104,7 +104,7 @@ jobs:
     needs: [ Docker, Build, Smart_CI ]
     uses: ./.github/workflows/job_cxx_unit_tests.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-8-cores-16gb-arm'
       image: ${{ fromJSON(needs.docker.outputs.images).ov_test.debian_10_arm }}
       affected-components: ${{ needs.smart_ci.outputs.affected_components }}
       os: 'debian_10'
@@ -116,6 +116,8 @@ jobs:
     needs: [ Docker, Build, Smart_CI ]
     uses: ./.github/workflows/job_cpu_functional_tests.yml
     with:
+      # Additional investigation needed why CPU functional tests are failing on v6 VM size's version,
+      # so leave it as it is for now
       runner: 'aks-linux-16-cores-arm'
       image: ${{ fromJSON(needs.docker.outputs.images).ov_test.debian_10_arm }}
       python-version: '3.7'

diff --git a/.github/workflows/linux_arm64.yml b/.github/workflows/linux_arm64.yml
@@ -53,7 +53,7 @@ jobs:
   Docker:
     needs: Smart_CI
     if: "!needs.smart_ci.outputs.skip_workflow"
-    runs-on: aks-linux-16-cores-arm-docker-build
+    runs-on: aks-linux-4-cores-8gb-arm-docker-build
     container:
       image: openvinogithubactions.azurecr.io/docker_build:0.2
       volumes:
@@ -78,7 +78,7 @@ jobs:
     needs: [ Docker, Smart_CI ]
     uses: ./.github/workflows/job_build_linux.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-16-cores-32gb-arm'
       container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_build.ubuntu_20_04_arm64 }}", "volumes": ["/mount:/mount"], "options": "-e SCCACHE_AZURE_BLOB_CONTAINER -e SCCACHE_AZURE_CONNECTION_STRING"}'
       affected-components: ${{ needs.smart_ci.outputs.affected_components }}
       event-name: ${{ github.event_name }}
@@ -105,15 +105,15 @@ jobs:
     if: ${{ 'false' }}
     uses: ./.github/workflows/job_debian_packages.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-4-cores-8gb-arm'
       image: 'openvinogithubactions.azurecr.io/dockerhub/ubuntu:20.04'
 
   Samples:
     needs: [ Build, Docker, Smart_CI ]
     if: fromJSON(needs.smart_ci.outputs.affected_components).samples
     uses: ./.github/workflows/job_samples_tests.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-8-cores-16gb-arm'
       container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_20_04_arm64 }}", "volumes": ["/mount:/mount"]}'
       affected-components: ${{ needs.smart_ci.outputs.affected_components }}
 
@@ -123,7 +123,7 @@ jobs:
     if: fromJSON(needs.smart_ci.outputs.affected_components).JS_API
     uses: ./.github/workflows/job_openvino_js.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-4-cores-8gb-arm'
       container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_build.ubuntu_20_04_arm64 }}"}'
 
   ONNX_Runtime:
@@ -133,7 +133,7 @@ jobs:
     needs: [ Build, Smart_CI, Docker ]
     uses: ./.github/workflows/job_onnx_runtime.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-16-cores-32gb-arm'
       container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_build.ubuntu_20_04_arm64 }}", "volumes": ["/mount:/mount"], "options": "-e SCCACHE_AZURE_BLOB_CONTAINER -e SCCACHE_AZURE_CONNECTION_STRING"}'
       sccache-azure-key-prefix: 'ubuntu20_aarch64_onnxruntime'
 
@@ -142,7 +142,7 @@ jobs:
     needs: [ Build, Docker, Smart_CI ]
     uses: ./.github/workflows/job_tokenizers.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-8-cores-16gb-arm'
       shell: bash
       container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_build.ubuntu_20_04_arm64 }}", "volumes": ["/mount:/mount"]}'
       affected-components: ${{ needs.smart_ci.outputs.affected_components }}
@@ -154,7 +154,7 @@ jobs:
     needs: [ Build, Docker, Smart_CI ]
     uses: ./.github/workflows/job_cxx_unit_tests.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-8-cores-16gb-arm'
       image: ${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_20_04_arm64 }}
       affected-components: ${{ needs.smart_ci.outputs.affected_components }}
       os: 'ubuntu_20_04'
@@ -164,7 +164,7 @@ jobs:
     needs: [ Build, Docker, Smart_CI ]
     uses: ./.github/workflows/job_python_unit_tests.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-8-cores-16gb-arm'
       container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_20_04_arm64 }}", "volumes": ["/mount:/mount"]}'
       affected-components: ${{ needs.smart_ci.outputs.affected_components }}
       python-version: '3.11'
@@ -174,7 +174,7 @@ jobs:
     needs: [ Build, Docker, Smart_CI, Openvino_tokenizers ]
     uses: ./.github/workflows/job_tensorflow_layer_tests.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-16-cores-32gb-arm'
       container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_20_04_arm64 }}", "volumes": ["/mount:/mount"]}'
       affected-components: ${{ needs.smart_ci.outputs.affected_components }}
       python-version: '3.11'
@@ -184,7 +184,7 @@ jobs:
     needs: [ Build, Docker, Smart_CI ]
     uses: ./.github/workflows/job_pytorch_layer_tests.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-16-cores-32gb-arm'
       container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_20_04_arm64 }}", "volumes": ["/mount:/mount"]}'
       affected-components: ${{ needs.smart_ci.outputs.affected_components }}
       python-version: '3.11'
@@ -195,6 +195,8 @@ jobs:
     needs: [ Build, Docker, Smart_CI ]
     uses: ./.github/workflows/job_cpu_functional_tests.yml
     with:
+      # Additional investigation needed why CPU functional tests are failing on v6 VM size's version,
+      # so leave it as it is for now
       runner: 'aks-linux-16-cores-arm'
       image: ${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_20_04_arm64 }}
       python-version: '3.11'
@@ -207,7 +209,7 @@ jobs:
     needs: [ Build, Docker, Smart_CI, Openvino_tokenizers]
     uses: ./.github/workflows/job_tensorflow_models_tests.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-16-cores-32gb-arm'
       container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_20_04_arm64 }}"}'
       model_scope: 'precommit'
 
@@ -218,7 +220,7 @@ jobs:
     needs: [ Build, Docker, Smart_CI ]
     uses: ./.github/workflows/job_pytorch_models_tests.yml
     with:
-      runner: 'aks-linux-16-cores-arm'
+      runner: 'aks-linux-16-cores-32gb-arm'
       container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_20_04_arm64 }}"}'
       model_scope: 'precommit'
 

diff --git a/.github/workflows/linux_conditional_compilation.yml b/.github/workflows/linux_conditional_compilation.yml
@@ -212,7 +212,6 @@ jobs:
             tar -cvf - \
               tests/ov_cpu_func_tests \
               tests/libopenvino_template_extension.so \
-              tests/libze_loader.so* \
               tests/libhwloc* \
               tests/libtbb* \
               tests/functional_test_utils/layer_tests_summary/* \

diff --git a/.github/workflows/windows_conditional_compilation.yml b/.github/workflows/windows_conditional_compilation.yml
@@ -237,7 +237,7 @@ jobs:
           Compress-Archive @compress
 
           $compress = @{
-            Path = "${{ env.OPENVINO_REPO }}/bin/intel64/${{ env.CMAKE_BUILD_TYPE }}/ov_cpu_func_tests.exe", "${{ env.BUILD_DIR }}/bin/${{ env.CMAKE_BUILD_TYPE }}/ze_loader.dll", "${{ env.OPENVINO_REPO }}/bin/intel64/${{ env.CMAKE_BUILD_TYPE }}/openvino_template_extension.dll", "${{ env.OPENVINO_REPO }}/src/tests/test_utils/functional_test_utils/layer_tests_summary", "${{ env.INSTALL_DIR }}/runtime/3rdparty/tbb"
+            Path = "${{ env.OPENVINO_REPO }}/bin/intel64/${{ env.CMAKE_BUILD_TYPE }}/ov_cpu_func_tests.exe", "${{ env.OPENVINO_REPO }}/bin/intel64/${{ env.CMAKE_BUILD_TYPE }}/openvino_template_extension.dll", "${{ env.OPENVINO_REPO }}/src/tests/test_utils/functional_test_utils/layer_tests_summary", "${{ env.INSTALL_DIR }}/runtime/3rdparty/tbb"
             CompressionLevel = "Optimal"
             DestinationPath = "${{ env.BUILD_DIR }}/openvino_tests.zip"
           }

diff --git a/.github/workflows/workflows_scans.yml b/.github/workflows/workflows_scans.yml
@@ -0,0 +1,38 @@
+name: GitHub Actions Workflows Scans
+on:
+  workflow_dispatch: {}
+  push:
+    paths:
+      - '.github/workflows/**'
+    branches:
+      - 'master'
+      - 'releases/**'
+  pull_request:
+    paths:
+      - '.github/workflows/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions: read-all
+
+jobs:
+  semgrep:
+    name: github_actions_workflows_scan/semgrep
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'openvinotoolkit' }}
+
+    container:
+      image: semgrep/semgrep
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          submodules: 'false'
+          sparse-checkout: .github/workflows
+
+      - name: Semgrep scan
+        run: |
+          semgrep scan --error -j 8 --config "p/github-actions" .github/workflows/*
diff --git a/docs/articles_en/assets/images/genai_main_diagram.svg b/docs/articles_en/assets/images/genai_main_diagram.svg
diff --git a/docs/articles_en/documentation/openvino-security.rst b/docs/articles_en/documentation/openvino-security.rst
@@ -55,7 +55,8 @@ Hardware-based protection such as Intel Software Guard Extensions (Intel SGX) ca
 decryption operation secrets and bind them to a device. For more information, see
 the `Intel Software Guard Extensions <https://software.intel.com/en-us/sgx>`__.
 
-Use the ``ov::Core::read_model`` to set model representations and weights respectively.
+Use the `ov::Core::read_model <../api/c_cpp_api/group__ov__dev__exec__model.html#classov_1_1_core_1ae0576a95f841c3a6f5e46e4802716981>`__
+to set model representations and weights respectively.
 
 Currently there is no way to read external weights from memory for ONNX models.
 The ``ov::Core::read_model(const std::string& model, const Tensor& weights)`` method
@@ -65,6 +66,20 @@ should be called with ``weights`` passed as an empty ``ov::Tensor``.
     :language: cpp
     :fragment: part1
 
+
+Encrypted models that have already been compiled, in the form of blob files,
+can be loaded using the
+`ov::Core::import_model <../api/c_cpp_api/group__ov__runtime__cpp__api.html#_CPPv4N2ov4Core12import_modelERNSt7istreamERKNSt6stringERK6AnyMap>`__
+method, as shown in the code sample below:
+
+.. code-block:: cpp
+
+   ov::Core core;
+   // Import a model from a blob.
+   std::ifstream compiled_blob(blob, std::ios_base::in | std::ios_base::binary);
+   auto compiled_model = core.import_model(compiled_blob, "CPU");
+
+
 Additional Resources
 ####################
 

diff --git a/docs/articles_en/learn-openvino/llm_inference_guide.rst b/docs/articles_en/learn-openvino/llm_inference_guide.rst
@@ -9,6 +9,7 @@ Generative AI workflow
    :maxdepth: 1
    :hidden:
 
+   Generative Model Preparation <llm_inference_guide/genai-model-preparation>
    Inference with OpenVINO GenAI <llm_inference_guide/genai-guide>
    Inference with Optimum Intel <llm_inference_guide/llm-inference-hf>
    Generative AI with Base OpenVINO (not recommended) <llm_inference_guide/llm-inference-native-ov>

diff --git a/docs/articles_en/learn-openvino/llm_inference_guide/genai-guide.rst b/docs/articles_en/learn-openvino/llm_inference_guide/genai-guide.rst
@@ -11,9 +11,15 @@ Inference with OpenVINO GenAI
    NPU inference of LLMs <genai-guide-npu>
 
 
-This article provides reference code and guidance on running generative AI models,
-using OpenVINO GenAI. Note that the base OpenVINO version will not work with these instructions,
-make sure to :doc:`install OpenVINO GenAI <../../get-started/install-openvino/install-openvino-genai>`.
+OpenVINO™ GenAI is a library of pipelines and methods, extending the OpenVINO runtime to work
+with generative AI models more efficiently. This article provides reference code and guidance
+on its usage. Note that the base OpenVINO version will not work with these instructions,
+make sure to :doc:`install OpenVINO with GenAI <../../get-started/install-openvino/install-openvino-genai>`.
+
+.. image:: ../../assets/images/genai_main_diagram.svg
+   :align: center
+   :alt: OpenVINO workflow diagram for convenience
+
 
 | Here is sample code for several Generative AI use case scenarios. Note that these are very basic
   examples and may need adjustments for your specific needs, like changing the inference device.