Build using conanfile.txt (openvinotoolkit#17580)

* Build using conanfile.txt * Update .ci/azure/linux_arm64.yml * Several improvements * Removed conanfile.py * Try to use activate / deactivate * Fixed clang-format code style * Supported TBB version from Conan * Added more NOMINMAX * Fixed static build * More improvements for static build * Add usage of static snappy in case of static build * More fixes * Small fixes * Final fixes
ilya-lavrenov · May 19, 2023 · 84db7d0 · 84db7d0
1 parent 54bbc9e
commit 84db7d0
Show file tree

Hide file tree

Showing 72 changed files with 1,262 additions and 730 deletions.
diff --git a/.ci/azure/android_arm64.yml b/.ci/azure/android_arm64.yml
@@ -141,7 +141,6 @@ jobs:
         -DANDROID_STL=c++_shared
         -DANDROID_PLATFORM=$(ANDROID_SDK_VERSION)
         -DENABLE_TESTS=ON
-        -DENABLE_INTEL_GPU=ON
         -DCMAKE_CXX_LINKER_LAUNCHER=ccache
         -DCMAKE_C_LINKER_LAUNCHER=ccache
         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache

diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml
@@ -245,6 +245,7 @@ jobs:
         -DCMAKE_CXX_COMPILER=clang++
         -DCMAKE_C_COMPILER=clang
         -DENABLE_SYSTEM_SNAPPY=ON
+        -DENABLE_SYSTEM_TBB=ON
         -DCPACK_GENERATOR=$(CMAKE_CPACK_GENERATOR)
         -DBUILD_nvidia_plugin=OFF
         -S $(REPO_DIR)

diff --git a/.ci/azure/linux_arm64.yml b/.ci/azure/linux_arm64.yml
@@ -108,58 +108,92 @@ jobs:
 
   - checkout: self
     clean: 'true'
-    submodules: 'true'
     path: openvino
 
   - script: |
       set -e
-      sudo -E $(OPENVINO_REPO_DIR)/install_build_dependencies.sh
       python3 -m pip install --upgrade pip
       python3 -m pip install -r $(OPENVINO_REPO_DIR)/src/bindings/python/requirements.txt
       python3 -m pip install -r $(OPENVINO_REPO_DIR)/src/bindings/python/wheel/requirements-dev.txt
       # install dependencies needed to build CPU plugin for ARM
       sudo -E apt --assume-yes install scons crossbuild-essential-arm64
+      # generic dependencies
+      sudo -E apt --assume-yes install cmake ccache
       # Speed up build
       sudo -E apt -y --no-install-recommends install unzip
       wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip
       unzip ninja-linux.zip
       sudo cp -v ninja /usr/local/bin/
     displayName: 'Install dependencies'
 
-  - task: CMake@1
-    inputs:
-      cmakeArgs: >
-        -G "Ninja Multi-Config"
-        -DCMAKE_VERBOSE_MAKEFILE=ON
-        -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
-        -DOpenCV_DIR=$(INSTALL_OPENCV)/cmake
-        -DENABLE_CPPLINT=ON
-        -DENABLE_PYTHON=OFF
-        -DENABLE_TESTS=ON
-        -DENABLE_DATA=OFF
-        -DCMAKE_TOOLCHAIN_FILE=$(OPENVINO_REPO_DIR)/cmake/arm64.toolchain.cmake
-        -DCMAKE_VERBOSE_MAKEFILE=ON
-        -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        -DCMAKE_C_COMPILER_LAUNCHER=ccache
-        -DARM_COMPUTE_SCONS_JOBS=$(NUM_PROC)
-        -DCMAKE_INSTALL_PREFIX=$(INSTALL_OPENVINO)
-        -S $(OPENVINO_REPO_DIR)
+  - script: |
+      git submodule update --init -- $(OPENVINO_REPO_DIR)/src/plugins
+      git submodule update --init -- $(OPENVINO_REPO_DIR)/thirdparty/gtest
+    displayName: 'Init submodules for non Conan dependencies'
+
+  - script: |
+      python3 -m pip install conan
+      # generate build profile
+      conan profile detect
+      # generate host profile for linux_arm64
+      echo "include(default)" > $(BUILD_OPENVINO)/linux_arm64
+      echo "[buildenv]" >> $(BUILD_OPENVINO)/linux_arm64
+      echo "CC=aarch64-linux-gnu-gcc" >> $(BUILD_OPENVINO)/linux_arm64
+      echo "CXX=aarch64-linux-gnu-g++" >> $(BUILD_OPENVINO)/linux_arm64
+      # install OpenVINO dependencies
+      export CMAKE_CXX_COMPILER_LAUNCHER=ccache
+      export CMAKE_C_COMPILER_LAUNCHER=ccache
+      conan install $(OPENVINO_REPO_DIR)/conanfile.txt \
+        -pr:h $(BUILD_OPENVINO)/linux_arm64 \
+        -s:h arch=armv8 \
+        -of $(BUILD_OPENVINO) \
+        -b missing
+    env:
+      CCACHE_DIR: $(OPENVINO_CCACHE_DIR)
+      CCACHE_TEMPDIR: $(TMP_DIR)/ccache
+      CCACHE_BASEDIR: $(Pipeline.Workspace)
+      CCACHE_MAXSIZE: 50G
+    displayName: 'Install conan and dependencies'
+
+  - script: |
+      source $(BUILD_OPENVINO)/conanbuild.sh
+      cmake \
+        -G Ninja \
+        -DCMAKE_VERBOSE_MAKEFILE=ON \
+        -DBUILD_SHARED_LIBS=ON \
+        -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
+        -DENABLE_CPPLINT=OFF \
+        -DENABLE_PYTHON=OFF \
+        -DENABLE_TESTS=ON \
+        -DENABLE_DATA=OFF \
+        -DENABLE_SYSTEM_TBB=ON \
+        -DENABLE_SYSTEM_PROTOBUF=ON \
+        -DENABLE_SYSTEM_SNAPPY=ON \
+        -DENABLE_SYSTEM_PUGIXML=ON \
+        -DCMAKE_TOOLCHAIN_FILE=$(BUILD_OPENVINO)/conan_toolchain.cmake \
+        -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+        -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+        -DARM_COMPUTE_SCONS_JOBS=$(NUM_PROC) \
+        -DCMAKE_INSTALL_PREFIX=$(INSTALL_OPENVINO) \
+        -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \
+        -S $(OPENVINO_REPO_DIR) \
         -B $(BUILD_OPENVINO)
-    displayName: 'CMake OpenVINO ARM plugin'
+      source $(BUILD_OPENVINO)/deactivate_conanbuild.sh
+    displayName: 'CMake configure'
 
   - script: cmake --build $(BUILD_OPENVINO) --parallel --config $(BUILD_TYPE)
     env:
       CCACHE_DIR: $(OPENVINO_CCACHE_DIR)
       CCACHE_TEMPDIR: $(TMP_DIR)/ccache
       CCACHE_BASEDIR: $(Pipeline.Workspace)
       CCACHE_MAXSIZE: 50G
-    displayName: 'Build OpenVINO ARM plugin'
+    displayName: 'Build OpenVINO Runtime'
 
   - script: cmake --build $(BUILD_OPENVINO) --parallel --config $(BUILD_TYPE) --target install
-    displayName: 'Install OpenVINO ARM plugin'
+    displayName: 'Install OpenVINO Runtime'
 
   - task: PublishBuildArtifacts@1
     inputs:
       PathtoPublish: $(Build.ArtifactStagingDirectory)
       ArtifactName: 'openvino_aarch64_linux'
-    displayName: 'Publish OpenVINO AArch64 linux package'
+    displayName: 'Publish OpenVINO Runtime for ARM'
diff --git a/.ci/azure/windows_conditional_compilation.yml b/.ci/azure/windows_conditional_compilation.yml
@@ -117,7 +117,6 @@ jobs:
         -DENABLE_CPPLINT=OFF ^
         -DENABLE_GAPI_PREPROCESSING=OFF ^
         -DENABLE_PLUGINS_XML=ON ^
-        -DENABLE_FASTER_BUILD=ON ^
         -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ^
         -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) ^
         -DENABLE_PROFILING_ITT=ON ^
@@ -154,7 +153,6 @@ jobs:
         -DVERBOSE_BUILD=ON ^
         -DENABLE_CPPLINT=OFF ^
         -DENABLE_GAPI_PREPROCESSING=OFF ^
-        -DENABLE_FASTER_BUILD=ON ^
         -DENABLE_PROFILING_ITT=OFF ^
         -DSELECTIVE_BUILD=ON ^
         -DCMAKE_COMPILE_WARNING_AS_ERROR=ON ^

diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ temp/
 .repo/
 CMakeLists.txt.user
 docs/IE_PLUGIN_DG/html/
+CMakeUserPresets.json
 
 *.project
 *.cproject

diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake
@@ -111,8 +111,8 @@ else()
     set(BIN_FOLDER "bin/${ARCH_FOLDER}")
 endif()
 
-if(CMAKE_GENERATOR MATCHES "^Ninja Multi-Config$")
-    # Ninja-Multi specific, see:
+if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
+    # 'Ninja Multi-Config' specific, see:
     # https://cmake.org/cmake/help/latest/variable/CMAKE_DEFAULT_BUILD_TYPE.html
     set(CMAKE_DEFAULT_BUILD_TYPE "Release" CACHE STRING "CMake default build type")
 elseif(NOT OV_GENERATOR_MULTI_CONFIG)
@@ -240,7 +240,7 @@ if(ENABLE_LTO)
                         LANGUAGES C CXX)
 
     if(NOT IPO_SUPPORTED)
-        set(ENABLE_LTO "OFF" CACHE STRING "Enable Link Time Optmization" FORCE)
+        set(ENABLE_LTO "OFF" CACHE STRING "Enable Link Time Optimization" FORCE)
         message(WARNING "IPO / LTO is not supported: ${OUTPUT_MESSAGE}")
     endif()
 endif()
@@ -250,8 +250,8 @@ endif()
 macro(ov_install_static_lib target comp)
     if(NOT BUILD_SHARED_LIBS)
         get_target_property(target_type ${target} TYPE)
-        if(${target_type} STREQUAL "STATIC_LIBRARY")
-            set_target_properties(${target} PROPERTIES EXCLUDE_FROM_ALL FALSE)
+        if(target_type STREQUAL "STATIC_LIBRARY")
+            set_target_properties(${target} PROPERTIES EXCLUDE_FROM_ALL OFF)
         endif()
         install(TARGETS ${target} EXPORT OpenVINOTargets
                 ARCHIVE DESTINATION ${OV_CPACK_ARCHIVEDIR} COMPONENT ${comp} ${ARGN})

diff --git a/cmake/developer_package/cpplint/cpplint.py b/cmake/developer_package/cpplint/cpplint.py
@@ -641,7 +641,7 @@
 # Files to exclude from linting. This is set by the --exclude flag.
 _excludes = None
 
-# Whether to supress PrintInfo messages
+# Whether to suppress PrintInfo messages
 _quiet = False
 
 # The allowed line length of files.
@@ -752,7 +752,7 @@ def ParseNolintSuppressions(filename, raw_line, linenum, error):
                           'Unknown NOLINT error category: %s' % category)
 
 
-def ProcessGlobalSuppresions(lines):
+def ProcessGlobalSuppressions(lines):
     """Updates the list of global error suppressions.
 
   Parses any lint directives in the file that have global effect.
@@ -780,7 +780,7 @@ def IsErrorSuppressedByNolint(category, linenum):
     """Returns true if the specified error category is suppressed on this line.
 
   Consults the global error_suppressions map populated by
-  ParseNolintSuppressions/ProcessGlobalSuppresions/ResetNolintSuppressions.
+  ParseNolintSuppressions/ProcessGlobalSuppressions/ResetNolintSuppressions.
 
   Args:
     category: str, the category of the error.
@@ -6203,7 +6203,7 @@ def ProcessFileData(filename, file_extension, lines, error,
     ResetNolintSuppressions()
 
     CheckForCopyright(filename, lines, error)
-    ProcessGlobalSuppresions(lines)
+    ProcessGlobalSuppressions(lines)
     RemoveMultiLineComments(filename, lines, error)
     clean_lines = CleansedLines(lines)
 

diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake
@@ -215,23 +215,34 @@ macro(ov_add_frontend)
 
     if(proto_files)
         if(OV_FRONTEND_PROTOBUF_LITE)
-            if(NOT protobuf_lite_installed)
-                ov_install_static_lib(${Protobuf_LITE_LIBRARIES} ${OV_CPACK_COMP_CORE})
-                set(protobuf_lite_installed ON CACHE INTERNAL "" FORCE)
-            endif()
-            link_system_libraries(${TARGET_NAME} PRIVATE ${Protobuf_LITE_LIBRARIES})
+            set(protobuf_target_name libprotobuf-lite)
+            set(protobuf_install_name "protobuf_lite_installed")
         else()
-            if(NOT protobuf_installed)
-                ov_install_static_lib(${Protobuf_LIBRARIES} ${OV_CPACK_COMP_CORE})
-                set(protobuf_installed ON CACHE INTERNAL "" FORCE)
-            endif()
-            link_system_libraries(${TARGET_NAME} PRIVATE ${Protobuf_LIBRARIES})
+            set(protobuf_target_name libprotobuf)
+            set(protobuf_install_name "protobuf_installed")
         endif()
+        if(ENABLE_SYSTEM_PROTOBUF)
+            # use imported target name with namespace
+            set(protobuf_target_name "protobuf::${protobuf_target_name}")
+        endif()
+
+        link_system_libraries(${TARGET_NAME} PRIVATE ${protobuf_target_name})
 
         # protobuf generated code emits -Wsuggest-override error
         if(SUGGEST_OVERRIDE_SUPPORTED)
             target_compile_options(${TARGET_NAME} PRIVATE -Wno-suggest-override)
         endif()
+
+        # install protobuf if it is not installed yet
+        if(NOT ${protobuf_install_name})
+            if(ENABLE_SYSTEM_PROTOBUF)
+                # we have to add find_package(Protobuf) to the OpenVINOConfig.cmake for static build
+                # no needs to install protobuf
+            else()
+                ov_install_static_lib(${protobuf_target_name} ${OV_CPACK_COMP_CORE})
+                set("${protobuf_install_name}" ON CACHE INTERNAL "" FORCE)
+            endif()
+        endif()
     endif()
 
     if(flatbuffers_schema_files)

diff --git a/cmake/developer_package/packaging/common-libraries.cmake b/cmake/developer_package/packaging/common-libraries.cmake
@@ -25,7 +25,7 @@ macro(ov_common_libraries_cpack_set_dirs)
     set(OV_CPACK_IE_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/inferenceengine${OpenVINO_VERSION})
     set(OV_CPACK_NGRAPH_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph${OpenVINO_VERSION})
     set(OV_CPACK_OPENVINO_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/openvino${OpenVINO_VERSION})
-    set(OV_CPACK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/openvino-${OpenVINO_VERSION})
+    set(OV_CPACK_LICENSESDIR licenses)
 
     ov_get_pyversion(pyversion)
     if(pyversion)

diff --git a/cmake/developer_package/packaging/debian/debian.cmake b/cmake/developer_package/packaging/debian/debian.cmake
@@ -31,6 +31,7 @@ macro(ov_debian_cpack_set_dirs)
     set(OV_CPACK_NGRAPH_CMAKEDIR ${OV_CPACK_RUNTIMEDIR}/cmake/ngraph${OpenVINO_VERSION})
     set(OV_CPACK_OPENVINO_CMAKEDIR ${OV_CPACK_RUNTIMEDIR}/cmake/openvino${OpenVINO_VERSION})
     set(OV_CPACK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/openvino-${OpenVINO_VERSION})
+    set(OV_CPACK_LICENSESDIR ${OV_CPACK_DOCDIR}/licenses)
     set(OV_CPACK_PYTHONDIR lib/python3/dist-packages)
 
     # non-native stuff

diff --git a/cmake/developer_package/packaging/packaging.cmake b/cmake/developer_package/packaging/packaging.cmake
@@ -29,6 +29,7 @@ macro(ov_cpack_set_dirs)
     set(OV_CPACK_NGRAPH_CMAKEDIR runtime/cmake)
     set(OV_CPACK_OPENVINO_CMAKEDIR runtime/cmake)
     set(OV_CPACK_DOCDIR docs)
+    set(OV_CPACK_LICENSESDIR ${OV_CPACK_DOCDIR}/licenses)
     set(OV_CPACK_SAMPLESDIR samples)
     set(OV_CPACK_WHEELSDIR tools)
     set(OV_CPACK_TOOLSDIR tools)
@@ -99,10 +100,10 @@ endif()
 # if <FILE> is a symlink, we resolve it, but install file with a name of symlink
 #
 function(ov_install_with_name file component)
-    if((APPLE AND file MATCHES "^[^\.]+\.[0-9]+${CMAKE_SHARED_LIBRARY_SUFFIX}$") OR
-                (file MATCHES "^.*\.${CMAKE_SHARED_LIBRARY_SUFFIX}\.[0-9]+$"))
+    get_filename_component(actual_name "${file}" NAME)
+    if((APPLE AND actual_name MATCHES "^[^\.]+\.[0-9]+${CMAKE_SHARED_LIBRARY_SUFFIX}$") OR
+                (actual_name MATCHES "^.*\.${CMAKE_SHARED_LIBRARY_SUFFIX}\.[0-9]+$"))
         if(IS_SYMLINK "${file}")
-            get_filename_component(actual_name "${file}" NAME)
             get_filename_component(file "${file}" REALPATH)
             set(install_rename RENAME "${actual_name}")
         endif()
@@ -162,7 +163,7 @@ elseif(CPACK_GENERATOR STREQUAL "RPM")
     include(packaging/rpm/rpm)
 elseif(CPACK_GENERATOR STREQUAL "NSIS")
     include(packaging/nsis)
-elseif(CPACK_GENERATOR MATCHES "^(CONDA-FORGE|BREW)$")
+elseif(CPACK_GENERATOR MATCHES "^(CONDA-FORGE|BREW|CONAN)$")
     include(packaging/common-libraries)
 endif()
 

diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake
@@ -22,6 +22,11 @@ macro(ov_rpm_cpack_set_dirs)
     set(OV_CPACK_NGRAPH_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph${OpenVINO_VERSION})
     set(OV_CPACK_OPENVINO_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/openvino${OpenVINO_VERSION})
     set(OV_CPACK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/openvino-${OpenVINO_VERSION})
+    set(OV_CPACK_LICENSESDIR ${OV_CPACK_DOCDIR}/licenses)
+
+    # TODO:
+    # 1. define python installation directories for RPM packages
+    # 2. make sure only a single version of python API can be installed at the same time (define conflicts section)
     # set(OV_CPACK_PYTHONDIR lib/python3/dist-packages)
 
     ov_get_pyversion(pyversion)

diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake
@@ -43,9 +43,9 @@ macro(_ov_detect_arch_by_processor_type)
     endif()
   elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
     set(X86_64 ON)
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
+  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*|wasm")
     set(X86 ON)
-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*|ARM64.*)")
+  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*|ARM64.*|armv8)")
     set(AARCH64 ON)
   elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
     set(ARM ON)