Merge branch 'master' into remove_example_output

slyalin · Aug 11, 2023 · 198a6f0 · 198a6f0
2 parents b691064 + 396a899
commit 198a6f0
Show file tree

Hide file tree

Showing 261 changed files with 7,380 additions and 3,439 deletions.
diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml
@@ -64,7 +64,7 @@ jobs:
       Static:
         CMAKE_BUILD_SHARED_LIBS: 'OFF'
         PYTHON_STATIC_ARGS: -m "not dynamic_library"
-        CMAKE_CPACK_GENERATOR:
+        CMAKE_CPACK_GENERATOR: "TGZ"
         SAMPLES_INSTALL_DIR: $(INSTALL_DIR)/samples
         PYTHON_SAMPLES_INSTALL_DIR: $(SAMPLES_INSTALL_DIR)/python
         RUN_PREFIX: . $(SETUPVARS) &&
@@ -551,6 +551,15 @@ jobs:
       TEST_DEVICE: CPU
     displayName: 'TensorFlow Lite Layer Tests - TFL FE'
 
+  - script: |
+      set -e
+      python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt
+      $(RUN_PREFIX) python3 -m pytest $(LAYER_TESTS_DIR)/ovc_python_api_tests/  --junitxml=./TEST-test_ovc_convert.xmlTEST
+    env:
+      PYTHONPATH: $(LAYER_TESTS_DIR)
+      TEST_DEVICE: CPU
+    displayName: 'OVC Python API Tests'
+
   - script: |
       set -e
       python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt

diff --git a/.github/ISSUE_TEMPLATE/build.yml b/.github/ISSUE_TEMPLATE/build.yml
@@ -0,0 +1,95 @@
+name: Build Issue Report
+description: This report is for the build/installation issue
+title: "[Build]: "
+labels: ["build", "support_request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please provide all the necessary information to expedite the response.
+  - type: input
+    id: ov_version
+    attributes:
+      label: OpenVINO Version 
+      description: OpenVINO version, branch, or tag in OpenVINO GitHub
+      placeholder: 2021.4.0 LTS / Master Branch / tag 2022.3.0
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating System
+      description: What OS are you using?
+      options:
+        - Ubuntu 18.04 (LTS)
+        - Ubuntu 20.04 (LTS)
+        - Ubuntu 22.04 (LTS)
+        - Windows System
+        - Red Hat Enterprise Linux 8
+        - OpenSUSE
+        - Android System
+        - Raspbian Stretch OS
+        - macOS Systems for Intel CPU
+        - macOS Systems for Apple Silicon
+        - WebAssembly
+        - WSL2 for Windows
+        - Other (Please specify in description)
+    validations:
+      required: true
+  - type: dropdown
+    id: architecture
+    attributes:
+      label: Hardware Architecture 
+      description: What is your hardware architecture used in this test?
+      options:
+        - x86 (64 bits)
+        - x86 (32 bits)
+        - ARM (64 bits)
+        - ARM (32 bits)
+        - RISC-V
+        - Other (please specify in the description)
+    validations:
+      required: true
+  - type: textarea
+    id: target_platform
+    attributes:
+      label: Target Platform
+      description: |
+          You can also provide us full system log with the following command 
+          Windows cmd     - "systeminfo" 
+          Linux terminal  - "lscpu" and "lscpu -e"
+      placeholder: Paste your full platform/system information here 
+    validations:
+      required: false
+  - type: textarea
+    id: build_description
+    attributes:
+      label: Build issue description
+      description: What issue are you facing during the build/installation?
+      placeholder: Please provide a detailed description of what happened
+    validations:
+      required: true
+  - type: textarea
+    id: build_script
+    attributes:
+      label: Build scrip or step-by-step to reproduce
+      description: How can we reproduce your issue?
+      placeholder: Please provide detailed instructions on how to reproduce the issue
+    validations:
+      required: false
+  - type: textarea
+    id: build_logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so there is no need for backticks.
+      render: shell
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Issue submission checklist
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/intel/intel-one-mono/blob/main/CODE_OF_CONDUCT.md)
+      options:
+        - label: I report the issue. It's not a question
+          required: true
+        - label: I checked the problem with the documentation, FAQ, open issues, Stack Overflow, etc., and have not found the solution
+          required: true
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,6 +44,7 @@ message (STATUS "CMAKE_VERSION ......................... " ${CMAKE_VERSION})
 message (STATUS "OpenVINO_SOURCE_DIR ................... " ${OpenVINO_SOURCE_DIR})
 message (STATUS "OpenVINO_BINARY_DIR ................... " ${OpenVINO_BINARY_DIR})
 message (STATUS "CMAKE_GENERATOR ....................... " ${CMAKE_GENERATOR})
+message (STATUS "CPACK_GENERATOR ....................... " ${CPACK_GENERATOR})
 message (STATUS "CMAKE_C_COMPILER_ID ................... " ${CMAKE_C_COMPILER_ID})
 message (STATUS "CMAKE_CXX_COMPILER_ID ................. " ${CMAKE_CXX_COMPILER_ID})
 if(OV_GENERATOR_MULTI_CONFIG)

diff --git a/cmake/developer_package/packaging/archive.cmake b/cmake/developer_package/packaging/archive.cmake
@@ -0,0 +1,90 @@
+# Copyright (C) 2018-2023 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include(GNUInstallDirs)
+
+#
+# ov_archive_cpack_set_dirs()
+#
+# Set directories for ARCHIVE cpack
+#
+macro(ov_archive_cpack_set_dirs)
+    # common "archive" package locations
+    # TODO: move current variables to OpenVINO specific locations
+    set(OV_CPACK_INCLUDEDIR runtime/include)
+    set(OV_CPACK_IE_CMAKEDIR runtime/cmake)
+    set(OV_CPACK_NGRAPH_CMAKEDIR runtime/cmake)
+    set(OV_CPACK_OPENVINO_CMAKEDIR runtime/cmake)
+    set(OV_CPACK_DOCDIR docs)
+    set(OV_CPACK_LICENSESDIR licenses)
+    set(OV_CPACK_SAMPLESDIR samples)
+    set(OV_CPACK_WHEELSDIR tools)
+    set(OV_CPACK_TOOLSDIR tools)
+    set(OV_CPACK_DEVREQDIR tools)
+    set(OV_CPACK_PYTHONDIR python)
+
+    if(WIN32)
+        set(OV_CPACK_LIBRARYDIR runtime/lib/${ARCH_FOLDER}/$<CONFIG>)
+        set(OV_CPACK_RUNTIMEDIR runtime/bin/${ARCH_FOLDER}/$<CONFIG>)
+        set(OV_CPACK_ARCHIVEDIR runtime/lib/${ARCH_FOLDER}/$<CONFIG>)
+        set(OV_WHEEL_RUNTIMEDIR runtime/bin/${ARCH_FOLDER}/Release)
+    elseif(APPLE)
+        set(OV_CPACK_LIBRARYDIR runtime/lib/${ARCH_FOLDER}/$<CONFIG>)
+        set(OV_CPACK_RUNTIMEDIR runtime/lib/${ARCH_FOLDER}/$<CONFIG>)
+        set(OV_CPACK_ARCHIVEDIR runtime/lib/${ARCH_FOLDER}/$<CONFIG>)
+        set(OV_WHEEL_RUNTIMEDIR runtime/lib/${ARCH_FOLDER}/Release)
+    else()
+        set(OV_CPACK_LIBRARYDIR runtime/lib/${ARCH_FOLDER})
+        set(OV_CPACK_RUNTIMEDIR runtime/lib/${ARCH_FOLDER})
+        set(OV_CPACK_ARCHIVEDIR runtime/lib/${ARCH_FOLDER})
+        set(OV_WHEEL_RUNTIMEDIR ${OV_CPACK_RUNTIMEDIR})
+    endif()
+    set(OV_CPACK_PLUGINSDIR ${OV_CPACK_RUNTIMEDIR})
+
+    # for BW compatibility
+    set(IE_CPACK_LIBRARY_PATH ${OV_CPACK_LIBRARYDIR})
+    set(IE_CPACK_RUNTIME_PATH ${OV_CPACK_RUNTIMEDIR})
+    set(IE_CPACK_ARCHIVE_PATH ${OV_CPACK_ARCHIVEDIR})
+endmacro()
+
+ov_archive_cpack_set_dirs()
+
+#
+# Override include / exclude rules for components
+# This is required to exclude some files from installation
+# (e.g. archive packages don't require python_package component)
+#
+
+macro(ov_define_component_include_rules)
+    # core components
+    unset(OV_CPACK_COMP_CORE_EXCLUDE_ALL)
+    unset(OV_CPACK_COMP_CORE_C_EXCLUDE_ALL)
+    unset(OV_CPACK_COMP_CORE_DEV_EXCLUDE_ALL)
+    unset(OV_CPACK_COMP_CORE_C_DEV_EXCLUDE_ALL)
+    # licensing
+    unset(OV_CPACK_COMP_LICENSING_EXCLUDE_ALL)
+    # samples
+    unset(OV_CPACK_COMP_CPP_SAMPLES_EXCLUDE_ALL)
+    unset(OV_CPACK_COMP_C_SAMPLES_EXCLUDE_ALL)
+    unset(OV_CPACK_COMP_PYTHON_SAMPLES_EXCLUDE_ALL)
+    # python
+    unset(OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL)
+    unset(OV_CPACK_COMP_BENCHMARK_APP_EXCLUDE_ALL)
+    unset(OV_CPACK_COMP_OVC_EXCLUDE_ALL)
+    set(OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE_EXCLUDE_ALL EXCLUDE_FROM_ALL)
+    unset(OV_CPACK_COMP_PYTHON_WHEELS_EXCLUDE_ALL)
+    # tools
+    set(OV_CPACK_COMP_OPENVINO_DEV_REQ_FILES_EXCLUDE_ALL EXCLUDE_FROM_ALL)
+    unset(OV_CPACK_COMP_DEPLOYMENT_MANAGER_EXCLUDE_ALL)
+    # scripts
+    unset(OV_CPACK_COMP_INSTALL_DEPENDENCIES_EXCLUDE_ALL)
+    unset(OV_CPACK_COMP_SETUPVARS_EXCLUDE_ALL)
+endmacro()
+
+ov_define_component_include_rules()
+
+# New in version 3.18
+set(CPACK_ARCHIVE_THREADS 8)
+# multiple packages are generated
+set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
diff --git a/cmake/developer_package/packaging/nsis.cmake b/cmake/developer_package/packaging/nsis.cmake
@@ -43,6 +43,52 @@ endmacro()
 
 ov_nsis_specific_settings()
 
+#
+# ov_nsis_cpack_set_dirs()
+#
+# Set directories for ARCHIVE cpack
+#
+macro(ov_archive_cpack_set_dirs)
+    # common "archive" package locations
+    # TODO: move current variables to OpenVINO specific locations
+    set(OV_CPACK_INCLUDEDIR runtime/include)
+    set(OV_CPACK_IE_CMAKEDIR runtime/cmake)
+    set(OV_CPACK_NGRAPH_CMAKEDIR runtime/cmake)
+    set(OV_CPACK_OPENVINO_CMAKEDIR runtime/cmake)
+    set(OV_CPACK_DOCDIR docs)
+    set(OV_CPACK_LICENSESDIR licenses)
+    set(OV_CPACK_SAMPLESDIR samples)
+    set(OV_CPACK_WHEELSDIR tools)
+    set(OV_CPACK_TOOLSDIR tools)
+    set(OV_CPACK_DEVREQDIR tools)
+    set(OV_CPACK_PYTHONDIR python)
+
+    if(WIN32)
+        set(OV_CPACK_LIBRARYDIR runtime/lib/${ARCH_FOLDER}/$<CONFIG>)
+        set(OV_CPACK_RUNTIMEDIR runtime/bin/${ARCH_FOLDER}/$<CONFIG>)
+        set(OV_CPACK_ARCHIVEDIR runtime/lib/${ARCH_FOLDER}/$<CONFIG>)
+        set(OV_WHEEL_RUNTIMEDIR runtime/bin/${ARCH_FOLDER}/Release)
+    elseif(APPLE)
+        set(OV_CPACK_LIBRARYDIR runtime/lib/${ARCH_FOLDER}/$<CONFIG>)
+        set(OV_CPACK_RUNTIMEDIR runtime/lib/${ARCH_FOLDER}/$<CONFIG>)
+        set(OV_CPACK_ARCHIVEDIR runtime/lib/${ARCH_FOLDER}/$<CONFIG>)
+        set(OV_WHEEL_RUNTIMEDIR runtime/lib/${ARCH_FOLDER}/Release)
+    else()
+        set(OV_CPACK_LIBRARYDIR runtime/lib/${ARCH_FOLDER})
+        set(OV_CPACK_RUNTIMEDIR runtime/lib/${ARCH_FOLDER})
+        set(OV_CPACK_ARCHIVEDIR runtime/lib/${ARCH_FOLDER})
+        set(OV_WHEEL_RUNTIMEDIR ${OV_CPACK_RUNTIMEDIR})
+    endif()
+    set(OV_CPACK_PLUGINSDIR ${OV_CPACK_RUNTIMEDIR})
+
+    # for BW compatibility
+    set(IE_CPACK_LIBRARY_PATH ${OV_CPACK_LIBRARYDIR})
+    set(IE_CPACK_RUNTIME_PATH ${OV_CPACK_RUNTIMEDIR})
+    set(IE_CPACK_ARCHIVE_PATH ${OV_CPACK_ARCHIVEDIR})
+endmacro()
+
+ov_nsis_cpack_set_dirs()
+
 #
 # Override include / exclude rules for components
 # This is required to exclude some files from installation