Merge branch 'master' into EISW-121295-indices-as-ids-poc

openvinotoolkit · Jul 30, 2024 · 92e79eb · 92e79eb
2 parents 3b8d69b + d253f4f
commit 92e79eb
Show file tree

Hide file tree

Showing 79 changed files with 1,589 additions and 793 deletions.
diff --git a/.github/workflows/job_pytorch_models_tests.yml b/.github/workflows/job_pytorch_models_tests.yml
@@ -183,7 +183,7 @@ jobs:
         uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         if: ${{ !cancelled() }}
         with:
-          name: test-results-torch-models-${{ inputs.model_scope == 'precommit' }}
+          name: test-results-torch-models-${{ inputs.model_scope }}
           path: |
             ${{ env.INSTALL_TEST_DIR }}/TEST-torch*
           if-no-files-found: 'error'
diff --git a/.github/workflows/linux_cpu_dev.yml b/.github/workflows/linux_cpu_dev.yml
@@ -167,7 +167,7 @@ jobs:
       # Upload build artifacts and logs
       #
       - name: Upload build logs
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         if: always()
         with:
           name: build_logs
@@ -176,15 +176,15 @@ jobs:
 
       - name: Upload openvino package
         if: ${{ always() }}
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         with:
           name: openvino_package
           path: ${{ env.BUILD_DIR }}/openvino_package.tar.gz
           if-no-files-found: 'error'
 
       - name: Upload openvino tests package
         if: ${{ always() }}
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         with:
           name: openvino_tests
           path: ${{ env.BUILD_DIR }}/openvino_tests.tar.gz
@@ -209,13 +209,13 @@ jobs:
       PARALLEL_TEST_SCRIPT: ${{ github.workspace }}/install/tests/functional_test_utils/layer_tests_summary/run_parallel.py
     steps:
       - name: Download OpenVINO package
-        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: openvino_package
           path: ${{ env.INSTALL_DIR }}
 
       - name: Download OpenVINO tests package
-        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: openvino_tests
           path: ${{ env.INSTALL_TEST_DIR }}
@@ -268,7 +268,7 @@ jobs:
         timeout-minutes: 25
 
       - name: Upload Test Results
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         if: always()
         with:
           name: test-results-functional-cpu

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -35,7 +35,20 @@ if(THREADING STREQUAL "OMP")
                 SHA256 "591ea4a7e08bbe0062648916f42bded71d24c27f00af30a8f31a29b5878ea0cc"
                 USE_NEW_LOCATION TRUE)
     else()
-        message(FATAL_ERROR "Intel OMP is not available on current platform")
+        message(WARNING "Pre-built Intel OMP is not available on current platform. System OMP will be used.")
+        find_package(OpenMP)
+        if(OpenMP_CXX_FOUND)
+           foreach(OpenMP_LIB ${OpenMP_CXX_LIBRARIES})
+               string(FIND ${OpenMP_LIB} "omp" OpenMP_LIB_OMP_INDEX)
+               if(NOT OpenMP_LIB_OMP_INDEX EQUAL -1)
+                   cmake_path(GET OpenMP_LIB PARENT_PATH OpenMP_LIB_DIR)
+                   set(OMP_LIB ${OpenMP_LIB} CACHE FILEPATH "Path to OMP library")
+                   set(OMP ${OpenMP_LIB_DIR} CACHE FILEPATH "Path to OMP root folder")
+                   return()
+               endif()
+           endforeach()
+        endif()
+        message(FATAL_ERROR "System OpenMP has not been found")
     endif()
     update_deps_cache(OMP "${OMP}" "Path to OMP root folder")
     debug_message(STATUS "intel_omp=" ${OMP})

diff --git a/cmake/developer_package/compile_flags/sdl.cmake b/cmake/developer_package/compile_flags/sdl.cmake
@@ -29,7 +29,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG OR OV_COMPILER_IS_INTEL_LLVM
             # Remove all symbol table and relocation information from the executable
             set(OV_C_CXX_FLAGS "${OV_C_CXX_FLAGS} -s")
         endif()
-        if(NOT MINGW)
+        if(NOT MINGW AND NOT APPLE)
             set(OV_LINKER_FLAGS "${OV_LINKER_FLAGS} -z noexecstack -z relro -z now")
         endif()
     elseif(OV_COMPILER_IS_CLANG OR OV_COMPILER_IS_INTEL_LLVM)

diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
@@ -93,7 +93,11 @@ function(ov_add_plugin)
         endif()
 
         if(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CROSSCOMPILING)
-            target_link_options(${OV_PLUGIN_NAME} PRIVATE -Wl,--unresolved-symbols=ignore-in-shared-libs)
+            if (APPLE)
+                target_link_options(${OV_PLUGIN_NAME} PRIVATE -Wl,-undefined,dynamic_lookup)
+            else()
+                target_link_options(${OV_PLUGIN_NAME} PRIVATE -Wl,--unresolved-symbols=ignore-in-shared-libs)
+            endif()
         endif()
 
         set(custom_filter "")

diff --git a/cmake/features.cmake b/cmake/features.cmake
@@ -92,10 +92,7 @@ else()
     set(THREADING_DEFAULT "TBB")
 endif()
 
-set(THREADING_OPTIONS "TBB" "TBB_AUTO" "SEQ")
-if(NOT APPLE)
-    list(APPEND THREADING_OPTIONS "OMP")
-endif()
+set(THREADING_OPTIONS "TBB" "TBB_AUTO" "SEQ" "OMP")
 
 set(THREADING "${THREADING_DEFAULT}" CACHE STRING "Threading")
 set_property(CACHE THREADING PROPERTY STRINGS ${THREADING_OPTIONS})

diff --git a/samples/js/node/README.md b/samples/js/node/README.md
@@ -34,6 +34,7 @@ You can run this sample in the browser; no installation is required.
 [Codesandbox](https://codesandbox.io/) is a free online service with limited resources. For optimal performance and more control,  it is recommended to run the sample locally.
 
 - [hello-classification-sample](https://codesandbox.io/p/devbox/openvino-node-hello-classification-sample-djl893)
+- optical-character-recognition-sample
 
 ## See Also
 

diff --git a/samples/js/node/optical_character_recognition/README.md b/samples/js/node/optical_character_recognition/README.md
@@ -0,0 +1,6 @@
+# Optical Character Recognition Node.js Sample
+
+Run:
+```bash
+node hello_reshape_ssd.js *path_to_detection_model_file* *path_to_recognition_model_file* *path_to_img* AUTO
+```