Commit Graph

46 Commits

Author SHA1 Message Date
Ilya Lavrenov 1fa225e7bf
Python in OpenVINO: improvements (#6027)
* enable make clean to remove ie_wheel artifacts

* ./setup.py:132:1: E302 expected 2 blank lines

* fix CI build issue

* Removed not-needed components from ie_wheel

* Use explicit python3 vresion in ngraph pythpn

* Use python3 everywhere

* Reuse python3 more

* Added function to build with Py_LIMITED_API

* Sync 2 cmake python modules

* Fix for tools

* Fixed typo

* Enable python by default

* Enable python build iff python-dev is found

* More migration to Python3_VERSION

* Install wheel requirements

* Fixed ngraph Python separate build

* Fixed cython compilation

* Revert to old packages

* Added suffix

* Specify python version explicitly

* Don't depend on python interp to build python itself

* More improvements

* Revert offline transformations back to ie_wheel

* Refactoring

* Trying to build wheel independently on C++ runtime

* Build wheel only with main OpenVINO

* Fixed typo in test_utils cmake lists

* Adding link stage

* small fix

* git diff

* Try to fix python tests

Co-authored-by: Sergey Lyubimtsev <sergey.lyubimtsev@intel.com>
2021-06-07 10:52:48 +03:00
Ilya Lavrenov 8498560a26
Removed WA in versions.cmake for DLB (#6047) 2021-06-07 10:35:06 +03:00
Ilya Lavrenov 11400135de
Developer package update (#5970)
* Updated developer package generation

* Try to fix

* Reuse find_package(InferenceEngine) inside DeveloperPackage

* Fixes for ARM

* Fixed double InferenceEngineDeveloperPackage include

* WA for OpenCV
2021-06-03 12:45:12 +03:00
Ilya Lavrenov c470024f50
Respect COMPONENTS in InferenceEngineConfig.cmake (#5857)
* Added note abour custom version of find_dependency

* Warning about improper version in find_package()

* Removed ENABLE_ALTERNATIVE_TEMP

* Respect COMPONENTS in InferenceEngine cmake config

* Added Jira ticket #
2021-05-27 16:56:56 +03:00
Ilya Churaev cc810297f4
Align style doc with samples (#5709)
* Added clang-format config

* Fixed style

* Fixed code-style for snippets and fixed build

* Disable clang-format for snippets

* Fixed comments
2021-05-25 10:32:48 +03:00
Ilya Lavrenov de58c8d008
WA for DLBench (#5737) 2021-05-21 12:53:18 +03:00
Ilya Lavrenov 1d5d43e402
Fixed condition for versioning (#5719) 2021-05-20 14:30:49 +03:00
Ilya Lavrenov 2bdd955d6e
Inference engine versioning (#5562)
* Exclude xbyak from install

* Added automatically generated InferenceEngineConfig.cmake

* Reverted a version back

* Fixed issues with target aliases

* Make TBB dependency private

* Made ie_parallel.cmake self-sufficient

* Don't expose ie_paralle.cmake to end users

* Fixed compilation with TBB

* Fixes for TBB

* Fixed vpu_graph_transformer compilation

* Fixed tests compilation

* Added install of ie_parallel.cmake

* Switched ENABLE_ALTERNATIVE_TEMP to OFF. Fixed COMPONENTS for TBB

* Fixed file name in install rules

* Added find_dependency for TBB in ie_parallel.cmake

* WA for cmake bug with PACKAGE_PREFIX_DIR

* Fixed no-deprecation to fix speech-library build

* Reverted version from 2.1.0 to 2.1

* Revert "Reverted version from 2.1.0 to 2.1"

This reverts commit 7cb5d1563c.

* Added versions to cmake

* Added versions to ie_version.hpp

* Returned custom version file back

* Added InferenceEngineConfig-version.cmake to share as well

* Disabled one more GPU test

* Added one more WA for CI

* WA for CI issue for C API

* Added InferenceEngineConfig-version.cmake to share as well

* Added verison parsing from ie_version.hpp

* Revert "[CPU] Add Roll support (#5112)"

This reverts commit 5d8f209df6.

* Revert "[CPU] windows_Interpolate_fused-FQ_nearest-mode_nspc-layout_fix (#5317)"

This reverts commit 0808975a37.

* Revert "[INT8][BF16] INT8 + BF16 feature was enabled (#5059)"

This reverts commit 7d2ec02d65.

* Support for components

* No version for IEDevScripts package

* Removed IE_VS_VER_HAS_VERSION from vs_version.rc.in

* Added compatibility for 2.x old versioning
2021-05-20 10:21:44 +03:00
Ilya Lavrenov 02b31b2cc7
Follow-up for PR 5638 (#5659) 2021-05-17 21:02:56 +03:00
Ilya Lavrenov 1353ed1f85
Support old TBBs in cmake (#5638)
* Support old TBBs

* Don't reset environment

* Removed useless NO_CMAKE_FIND_ROOT_PATH

* Fixed build with old TBB for Windows

* Fixed ngraph code style
2021-05-15 11:42:09 +03:00
Ilya Lavrenov 349e2910fe
Openvino autogenerated cmake (#5484)
* Exclude xbyak from install

* Added automatically generated InferenceEngineConfig.cmake

* Reverted a version back

* Fixed issues with target aliases

* Make TBB dependency private

* Made ie_parallel.cmake self-sufficient

* Don't expose ie_paralle.cmake to end users

* Fixed compilation with TBB

* Fixes for TBB

* Fixed vpu_graph_transformer compilation

* Fixed tests compilation

* Added install of ie_parallel.cmake

* Switched ENABLE_ALTERNATIVE_TEMP to OFF. Fixed COMPONENTS for TBB

* Fixed file name in install rules

* Added find_dependency for TBB in ie_parallel.cmake

* WA for cmake bug with PACKAGE_PREFIX_DIR

* Fixed no-deprecation to fix speech-library build

* Reverted version from 2.1.0 to 2.1

* Revert "Reverted version from 2.1.0 to 2.1"

This reverts commit 7cb5d1563c.

* Returned custom version file back

* Added InferenceEngineConfig-version.cmake to share as well

* Disabled one more GPU test

* Added one more WA for CI

* WA for CI issue for C API

* WIP
2021-05-07 11:57:51 +03:00
Kate Generalova 99df448669
refactor: add clang style check for samples (#5306)
* refactor: add clang style check for samples

* fix: add .clang-format for ie

* fix: style check for missing headers

* refactor: remove cpplint for IE samples

* fix: setw is not a member of std for classification_results.hpp

* feat: add indent after ifdefine

* feat: set up google style for IE samples

* fix indents for w_dirent headers

* fix: include issues for utils.cpp due to clang-format
2021-04-22 14:02:54 +03:00
Dmitrii Khurtin b718de0cee
[GNA] Update GNA library (#5228)
* [GNA] Update GNA library to 1191 version

* append symlink to libgna.so

* append selective unpacking of the archive

* changed the criterion for checking the unpacking process (exit code)

* remove tabs

* add equalToReferenceWithDelta_1191

* removed equalToReferenceWithDelta_1191

* master -> update_gna_library
2021-04-21 10:34:45 +03:00
Roman Donchenko d822bb0a87
cross_compiled_func.cmake: use native CMake functions instead of custom ones (#5200)
Also, use the appropriate property (COMPILE_DEFINITIONS) for definitions
instead of COMPILE_FLAGS.
2021-04-14 11:31:11 +03:00
Ilya Lavrenov cae6a3bdcd
Turn clang-format targets off is no clang (#5202) 2021-04-12 23:40:18 +03:00
Roman Donchenko b92d1c1bdd
Fix building MKLDNNPlugin when the source path contains spaces (#5109)
The key changes are:

* Using VERBATIM to ensure CMake property passes command-line arguments
  to child processes.

* Using the INCLUDE_DIRECTORIES property instead of COMPILE_FLAGS to add
  include directories, because COMPILE_FLAGS are treated as space-separated
  values. (A small side benefit is that this doesn't rely on -I being
  the include directory option.)

In addition, some changes had to be made in order to preserve behavior:

* The _GEN_ARGS_LIST variable has to be inlined, because ARCH_SET is a list,
  and therefore the "-DXARCH_SET=..." argument gets split into multiple arguments
  (this happens to work by coincidence without VERBATIM). IMO, the code looks
  better this way anyway.

* It's no longer necessary to replace spaces in XARCH_SET in
  cross_compiled_disp_gen.cmake, because those spaces were an artifact of how
  the CMake arguments were passed before.
2021-04-12 13:27:49 +03:00
Ilya Churaev 007078de49
Added coverage cmake script for nGraph (#4979)
* Added coverage cmake script for nGraph

* Added common GCDA folder
2021-03-28 20:05:45 +03:00
Egor Duplensky 1ffeb24a41
Prevent unloading libraries at runtime for sanitizer builds (#4986)
Otherwise sanitizer is not able to resolve libraries symbols
at the end of binary execution
2021-03-27 23:11:57 +03:00
Ilya Lavrenov 8a3ff9aeae
Removed not needed suppressions for deprecated API in ngraph (#4992)
* Removed not needed suppressions for deprecated API in ngraph

* Fixed compilation with deprecated API in 3rd party with MSVC
2021-03-27 14:32:17 +03:00
Ilya Lavrenov d0ebfe06d2
cmake improvements: coverage and SELECTIVE_BUILD beautifications (#4937)
* Added snippets to coverage reports

* Added possible values for SELECTIVE_BUILD as properties
2021-03-26 06:40:54 +03:00
Alexey Suhov a748c26fee
Align copyright notice in cpp and cmake source files (CVS-51320) (#4950) 2021-03-25 02:40:09 +03:00
Ilya Lavrenov 3435e7acb7
Proper detection of Apple M1 (#4848) 2021-03-18 11:17:13 +03:00
Ilya Churaev 1334d7d122
Enable OV clang format command for nGraph (#4792)
* Added add_clang_format commands

* Added clang_format targets as dependencies for original targets

* Update CI scripts

* Fixed code-style for nGraph unit tests

* Change job name

* Disable clang-format for Windows

* Fixed nGraph python build

* Fixed comments and enabled code style for ONNX Editor

* Disable code style check on compilation step
2021-03-18 06:38:10 +03:00
Ilya Lavrenov 1f635f9435
Move link of CC library under cmake macro (#4779) 2021-03-16 14:04:48 +03:00
Ilya Lavrenov 24fb09edb3
Improvements in cmake scripts (#4766)
1. Find Threads only once in IEDevScripts package
2. Small refactoring in IE Dev Package
2021-03-15 13:07:38 +03:00
Ilya Lavrenov c88e1f7a59
Added check for shared library to ie_add_vs_version_file (#4738) 2021-03-12 10:06:04 +03:00
Ilya Lavrenov 07f1b2511b
Don't allow to create 2 plugin with the same device name (#4665) 2021-03-09 06:31:15 +03:00
Alexey Suhov 5e43744001
Fix warnings with PDB override for RelWithDebInfo configuration (#4520) 2021-02-26 23:06:24 +03:00
Szymon Irzabek 2051fe2614
Allow enabling cpplint on Windows, fix Windows style after check (#4380) 2021-02-18 14:20:10 +03:00
Ilya Lavrenov dd79dd755c
CC: fixed issue with rebuild when only CC header is changed (#4370)
* CC: fixed issue with rebuild when only CC header is changed

* Updated submodule as well
2021-02-17 15:41:54 +03:00
Ilya Lavrenov 0c39d5b1b6
Added coverage for template plugin (#4234) 2021-02-09 11:03:44 +03:00
Sergey Lyubimtsev ce0537bd1f
[CMake] Fixes for TBB tmp location (#3997)
* fixes for TBB tmp location:

- DL_SDK_TEMP path is not normalized, that leads to paths check mismatch in CMake conditions
- TBB is not downloaded again in a case tmp location is cleaned up and build restarted (TBB_DIR and TBBROOT are cache variables)

* use reset_deps_cache & update_deps_cache for TBB_DIR var.

* single  reset_deps_cache call
2021-01-25 19:06:12 +03:00
Ilya Lavrenov 9cfe909e1e
Unused variables (#3963)
* Added -Wused-variable flag

* Fixes for clang compiler

* Removed wrong -Wno-error from protobuf compilation

* More fixes
2021-01-22 17:41:15 +03:00
Ilya Lavrenov 7e54cdba15
Fixed cmake 'message' for multiple arguments (#3901) 2021-01-19 15:35:31 +03:00
Andrey Somsikov cc9c480554
Fix sanitizer build (#3869) 2021-01-15 09:42:31 +03:00
Vladislav Vinogradov 8ec38cf039
[cmake] Fix single config generators handling (#3794)
* Add `USE_BUILD_TYPE_SUBFOLDER` CMake option to append
  `CMAKE_BUILD_TYPE` to output binary directory.
  Initialize it to `ON` for UNIX to keep current behavior.
* Remove forced `CMAKE_CONFIGURATION_TYPES` initialization,
  use user provided value instead.

This will allow to use single config generators (like Ninja) on Windows
with MSVC compilers and get binaries in per-config sub-folders in the same
way as on UNIX.

Co-authored-by: Ilya Lavrenov <ilya.lavrenov@intel.com>
2021-01-11 18:38:11 +03:00
Ilya Lavrenov 0d22328a25
Partially removed ngraph cmake duplication with IE cmake (#3751)
* Partially removed cmake duplication with IE cmake

* Deprecated API usage: fixed or suppressed

* Fix for TypeRelaxed

* Canonical form for ngraph includes

* Removed extra visibilit settings; removed graphviz find_package

* Removed var_functions module; canonical includes for ngraph::reference

* Fixed deprecated API in ngraph tests

* Re-use standard cmake macro for shared libs

* Trying to fix ONNX importer tests
2021-01-11 14:49:33 +03:00
Ilya Lavrenov 50f9dd8a6b
Enabled CMP0025 as NEW (#3791) 2021-01-11 14:48:27 +03:00
Ilya Lavrenov 7f04723d25
Fixed install location for MODULE library type (#3752) 2021-01-10 18:21:13 +03:00
Vladislav Vinogradov 00d37aaa62
Use find_package instead of include(Find*) in CMake scripts (#3767)
Otherwise CMake produces the following warning:

```
CMake Warning (dev) at /usr/local/share/cmake-3.19/Modules/FindPackageHandleStandardArgs.cmake:426 (message):
  The package name passed to `find_package_handle_standard_args` (Wget) does
  not match the name of the calling package (IEDevScripts).  This can lead to
  problems in calling code that expects `find_package` result variables
  (e.g., `_FOUND`) to follow a certain pattern.
Call Stack (most recent call first):
  /usr/local/share/cmake-3.19/Modules/FindWget.cmake:26 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
  cmake/developer_package/download/download_and_check.cmake:5 (include)
  cmake/developer_package/download/download_and_extract.cmake:6 (include)
  cmake/developer_package/download/download.cmake:25 (include)
  cmake/developer_package/download/dependency_solver.cmake:5 (include)
  cmake/developer_package/IEDevScriptsConfig.cmake:208 (include)
  CMakeLists.txt:12 (find_package)
This warning is for project developers.  Use -Wno-dev to suppress it.
```
2020-12-31 12:48:23 +03:00
Ilya Lavrenov 278b662e56
Removed global CMAKE_MODULE_PATH in IE DevPackage (#3747)
* Cleanup

* Added CMAKE_MODULE_LINKER_FLAGS for onecoreuap toolchain

* Fixed ENABLE_FASTER_BUILD mode on Android

* Cosmetic fix

* Fixed fuzzing

* Enabled fuzzing
2020-12-27 00:02:50 +03:00
Ilya Lavrenov 9d6bd321d8
Fixed message if ENABLE_ERROR_HIGHLIGHT is enabled (#3712) 2020-12-24 08:07:50 +03:00
Ilya Lavrenov 036f574756
module library type for IE plugins, extensions (#3656)
* CMAKE: Added MODULE linker flags

* Fixed plugins.xml s

* Use module instead of shared library

* Fixes

* tab 2 spaces

* Renamed get_shared_library_name to ie_plugin_get_file_name
2020-12-23 18:25:42 +03:00
Vladislav Volkov 96b032504e
Errors and warnings highlighting for UNIX platforms (#3643)
* Errors and warnings highlighting for UNIX platforms

* The option added for errors and warning highlighting enabling
2020-12-23 08:01:07 +03:00
Ilya Lavrenov 856ab82bbf
Added company name to a version file (#3653) 2020-12-22 21:02:52 +03:00
Ilya Lavrenov 9465073f58
Introduce IEDevScripts package (#3661)
* Refactored developer package

* Added fuzzing for CMAKE_MODULE_LINKER_FLAGS as well

* Added options for developer package

* More improvements

* Further improvements

* Removed global CMAKE_MODULE_PATH population

* Fixes

* Final fixes

* Fixed python build

* Fix for TBB

* Fixed Find TBB

* Fixed install

* Fixes for OV features

* Split developer targets per component

* Fixed IE build tree config

* Fixed ITT

* Fixed review comments

* Clean export dependencies

* Fixed export of pugixml

* Added IEDevScripts_DIR for Android

* Fixed Android #2

* Fixed Android #3

* Fixed python cc

* Disabled Core threading tests on GNA
2020-12-22 18:44:59 +03:00