From 92ef155ed1eb62978f0accf08adc3adecb25e970 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 12 Aug 2022 00:07:21 +0400 Subject: [PATCH] Debian packages tests on Azure (#12469) * Squashed commit of the following: commit 036a32290ed795326d51dd41d83b891248b0ac05 Merge: db41a71ea9 ee0b67e605 Author: Ilya Lavrenov Date: Tue Aug 9 04:33:54 2022 +0800 Merge remote-tracking branch 'origin/debian-packages-azure' into debian-on-azure commit ee0b67e60555a52a229e7e4553f248db0ef389b9 Author: Ilya Lavrenov Date: Mon Jul 18 03:31:46 2022 +0800 test commit e357eb1428add322f3e6aa8ac1129425bbb376d0 Author: Ilya Lavrenov Date: Thu Jul 7 02:58:22 2022 +0800 Test commit 4635acc4979f3001143df39df9250987f350c6c9 Author: Ilya Lavrenov Date: Sun Jul 17 22:10:52 2022 +0800 Azure commit b1fff55143f49603e269ecb7988e63b2989efd44 Merge: 806ecaefa5 d67d4ce736 Author: Ilya Lavrenov Date: Sun Jul 17 21:28:49 2022 +0800 Merge branch 'debian-packages' into debian-packages-azure commit d67d4ce736651b76f581e2e847995dc92a2dd0cb Author: Ilya Lavrenov Date: Sun Jul 17 21:28:30 2022 +0800 Removed commented code commit 806ecaefa5cea79686062e447d5ff3653ef17e2e Merge: e328c9fc07 4413f0c4a8 Author: Ilya Lavrenov Date: Sun Jul 17 21:24:40 2022 +0800 Merge branch 'debian-packages' into debian-packages-azure commit 4413f0c4a807754aeac0dbc1b261400d6e779b98 Author: Ilya Lavrenov Date: Sun Jul 17 21:24:22 2022 +0800 Fixed python; need to update component name in product config commit e328c9fc07ed191b18e9ad57b38fecd5139fd131 Author: Ilya Lavrenov Date: Sun Jul 17 21:23:51 2022 +0800 Updated .ci commit cb59bc9563fec7f1691fa75514c2e1d33f8d6ac3 Author: Ilya Lavrenov Date: Sun Jul 17 15:33:21 2022 +0800 Updates commit d733e7aeb5d1a223f8b310b36e2ced26cd543cca Merge: 096bdcc9e4 e31018844d Author: Ilya Lavrenov Date: Sun Jul 17 15:31:26 2022 +0800 Merge branch 'debian-packages' into debian-packages-azure commit e31018844ddfbbdcf6936e574f3ce38927b1f88d Author: Ilya Lavrenov Date: Sun Jul 17 15:31:08 2022 +0800 Some updates commit b079a9e3a55e53c8c5dd90a0733adad16d0c2890 Merge: b0f15a8513 6514c213c3 Author: Ilya Lavrenov Date: Sun Jul 17 15:06:59 2022 +0800 Merge remote-tracking branch 'upstream/master' into debian-packages commit 096bdcc9e4430cb72ac35a5e53a593dc78bff89d Author: Ilya Lavrenov Date: Sun Jul 17 02:59:56 2022 +0800 CI pipeline with debian commit 5b1c29a1a3d86b0167cd47c6f80db2a3c054e47b Author: Ilya Lavrenov Date: Sun Jul 17 02:12:15 2022 +0800 Test comit commit b0f15a85130fc815efe5694387bd0c58840ea459 Author: Ilya Lavrenov Date: Sat Jul 16 18:56:58 2022 +0800 Fixde tests on Windows commit 16dc4d8bc04f12388fca435287aa0de9090232d8 Author: Ilya Lavrenov Date: Sat Jul 16 15:46:15 2022 +0800 Try to fix GNA commit 9801e52322622224a618dbb0f03a86ac9946c1b4 Author: Ilya Lavrenov Date: Sat Jul 16 14:40:21 2022 +0800 Update TBB install rules commit 279f8a8a72a20e92bf877a947b4b4bbe176d0c3d Merge: 9bf178fce0 09f2b5062b Author: Ilya Lavrenov Date: Sat Jul 16 14:30:15 2022 +0800 Merge remote-tracking branch 'upstream/master' into debian-packages commit 9bf178fce069f17dd49ac15a2ce5007202dcd9dd Author: Ilya Lavrenov Date: Fri Jul 15 21:09:00 2022 +0800 Fix for debian commit 7afa431f05d6d19e788ca04944c115e9041a29f8 Author: Ilya Lavrenov Date: Fri Jul 15 20:16:09 2022 +0800 Revert cmake scripts location commit 9ead76efce92eb08d988165dafece7538f603216 Author: Ilya Lavrenov Date: Fri Jul 15 19:31:08 2022 +0800 Try to fix TBB finding commit 6f0da74e2a4649c950f4ca7a773d62bac4879d81 Merge: be9e25c6f7 e8310f7e0b Author: Ilya Lavrenov Date: Fri Jul 15 19:14:50 2022 +0800 Merge remote-tracking branch 'upstream/master' into debian-packages commit be9e25c6f700c6c5a94444a2bb29a27f8a3af690 Merge: c203963548 35a31a329d Author: Ilya Lavrenov Date: Thu Jul 14 22:44:45 2022 +0800 Merge remote-tracking branch 'upstream/master' into debian-packages commit c2039635488e5b80b9c30d8eec9c1af226076588 Author: Ilya Lavrenov Date: Tue Apr 5 22:29:34 2022 +0300 Small fixes after self-revew commit e2f1595c2178f3d12e84c3af0a1675e9f744dea9 Merge: 3bae350d1c c2703c81f6 Author: Ilya Lavrenov Date: Tue Apr 5 22:21:41 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 3bae350d1c46b65fa9ec8531c962365a3cfe3f99 Author: Ilya Lavrenov Date: Tue Apr 5 22:17:17 2022 +0300 Split debian file on common tools and repo specific stuff commit 8a5bb7fe041855ad65813394f58126cf36482bb9 Author: Ilya Lavrenov Date: Tue Apr 5 20:41:45 2022 +0300 Revert TMP WAs commit be78da4a88f7d9868f08f4b04334afe99e8dde6a Merge: d0da7056d0 86495ceb0f Author: Ilya Lavrenov Date: Tue Apr 5 13:44:49 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit d0da7056d010dffed5a19c2686b77ac4dae4f2c2 Author: Ilya Lavrenov Date: Sun Apr 3 12:11:33 2022 +0300 Improvements commit 69bafd35192c1fb943633678e3826ffc6a6d100f Author: Ilya Lavrenov Date: Sun Apr 3 12:02:25 2022 +0300 Enabled nlohmann_json from system commit bdbc7804aff8455a3231c598ff88c7e1839463fb Author: Ilya Lavrenov Date: Sun Apr 3 11:46:19 2022 +0300 Use nlohmann_jsonConfig from system commit 0f2e2bbdcb7e15e45bcdc92d628b175f0c261d4f Author: Ilya Lavrenov Date: Sun Apr 3 11:13:40 2022 +0300 Tried to use dependencies on system commit 88415fc13375e12d95adbdb63ceb819989729ef8 Author: Ilya Lavrenov Date: Sat Apr 2 19:28:48 2022 +0300 Try to improve gflags: part 2 commit b8fafcb67017b52899317ebcac57170d83b192b5 Merge: 56dad4d12a 29fb8c79b1 Author: Ilya Lavrenov Date: Sat Apr 2 19:23:19 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 56dad4d12a77b1a5166c95f2eeed756a74002948 Author: Ilya Lavrenov Date: Sat Apr 2 19:23:15 2022 +0300 Try to improve gflags commit 81aa7ccc38ebdc4fc690c1fad6a7922ccfdb394e Author: Ilya Lavrenov Date: Sat Apr 2 18:08:03 2022 +0300 Skip TBB component commit 944632604055aa39fd1e5657cbbbb71f29a61a04 Merge: 610729c716 4fcc18c00e Author: Ilya Lavrenov Date: Sat Apr 2 11:13:14 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 610729c71646a1756bae8193d93cb4dbc1382718 Author: Ilya Lavrenov Date: Fri Apr 1 19:36:10 2022 +0300 fixed TBB commit 1930daa5807c91c0b4849de6d67c2704e12af7fb Merge: fc37de4382 2388f3b976 Author: Ilya Lavrenov Date: Fri Apr 1 19:04:19 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit fc37de438278105909628460d92f7a2e7239bd38 Merge: c2ea71e45d d3060d4bcc Author: Ilya Lavrenov Date: Thu Mar 31 21:08:44 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit c2ea71e45d2cc8e46b3ee81e61a30dbba39d9868 Merge: aeebfeba92 9fa5150d71 Author: Ilya Lavrenov Date: Wed Mar 30 13:42:44 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit aeebfeba92b4a711392fa1d2f49e9bfeca739e8c Merge: e65d2e8097 30ec7366bb Author: Ilya Lavrenov Date: Mon Mar 28 20:06:38 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit e65d2e80971f70beaa72229d9b3a260b9adb1ef5 Author: Ilya Lavrenov Date: Sat Mar 26 13:55:52 2022 +0300 Reverted OV_CPACK_COMPILER_IS_CLANG commit 8cf4d15d4d93650b82de64757497125c4902e59b Merge: 2639adb686 aded1a2c70 Author: Ilya Lavrenov Date: Sat Mar 26 13:53:40 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 2639adb68639193f1ff78a4706bd5d773a4bdbc8 Merge: cebdf3f92a a2705b1fed Author: Ilya Lavrenov Date: Fri Mar 25 15:18:48 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit cebdf3f92a7fd8ad0be4dd416de2f9c39034966f Merge: 7ded4663d0 e3098ece7e Author: Ilya Lavrenov Date: Fri Mar 18 18:08:10 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 7ded4663d0487abd575a0a9e8fe3fe63a51f384b Merge: ab92bd6c13 6b22d0d109 Author: Ilya Lavrenov Date: Fri Feb 18 19:51:47 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit ab92bd6c1363290617729e11e8a445a2989a3f3a Author: Ilya Lavrenov Date: Fri Feb 18 19:48:07 2022 +0300 added versions via - commit 1f4f71a4986155681546a31d1338b89a1cee3c76 Merge: f3825b8d9d 07f0966e62 Author: Ilya Lavrenov Date: Fri Feb 18 19:29:31 2022 +0300 Merge branch 'tf-brick-3' into debian-packages commit f3825b8d9d0af2bdb6640287c3236484bdd2f099 Author: Ilya Lavrenov Date: Fri Feb 18 19:05:20 2022 +0300 Used standard dir for OV_CPACK_TOOLSDIR commit 466c5c055c8ccaa9944057754c03dbba1aebe160 Merge: 6d57fc75a3 d2177cf177 Author: Ilya Lavrenov Date: Fri Feb 18 18:47:36 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 07f0966e621b14c69af3e203b37917f209779851 Author: Ilya Lavrenov Date: Fri Feb 18 15:02:29 2022 +0300 Revert "repair TF FE tests after build (#10432)" This reverts commit 306b7611d9ec8f9efdf7a143eb40bb8a3e184f06. commit 6d57fc75a3561a6f9b2264f2c160ae3191ddf9a4 Merge: 697b0190e3 61f657795c Author: Ilya Lavrenov Date: Fri Feb 18 14:30:26 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 697b0190e3d71dc18d4d85597fcd2eeb07630c5e Author: Ilya Lavrenov Date: Wed Feb 16 20:00:45 2022 +0300 Fixed package name commit 8bd9368f6ecbc9178576d3ec516f804f16ac44a4 Author: Ilya Lavrenov Date: Wed Feb 16 19:37:55 2022 +0300 Tuned locations commit 61f09a2f3eb453554818e8f758458b32d4a7ac33 Author: Ilya Lavrenov Date: Wed Feb 16 19:24:42 2022 +0300 Fixed cmake stage commit 4519f0fc0653830d2b262c35001fc593de98c9be Author: Ilya Lavrenov Date: Wed Feb 16 19:07:41 2022 +0300 Split packaging into common and debian part commit a6b3259e384da6c30c30b77d5b8f4cf3f7fea3b6 Author: Ilya Lavrenov Date: Wed Feb 16 18:27:22 2022 +0300 Renaming commit 694581c317c4aafd49813049a289dc3d02c5fc6b Author: Ilya Lavrenov Date: Wed Feb 16 18:20:44 2022 +0300 Parametrize installation paths commit d693205c401bd1036415960f6398aa0c185b0d87 Merge: 5047fc8667 abeb910ce2 Author: Ilya Lavrenov Date: Wed Feb 16 17:34:11 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 5047fc86671d5959e6184d4770440b32fe18a8b0 Merge: ee8cdf3b12 317b956d2e Author: Ilya Lavrenov Date: Tue Feb 15 18:49:52 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit ee8cdf3b127e99b060acd545412976566e098e78 Author: Ilya Lavrenov Date: Tue Feb 15 18:49:23 2022 +0300 Removed custom MYRIAD kernels commit 5c1db8f9f8dbf4658f64d15d0bddf2c733755a1f Author: Ilya Lavrenov Date: Tue Feb 15 18:26:58 2022 +0300 Disabled versioning for now commit f305376469c72d61b151ffe7d9f45e001fbb603f Author: Ilya Lavrenov Date: Tue Feb 15 17:12:24 2022 +0300 System TBB commit fcc455e18e94283c947739bfca26c5f336abb6c1 Author: Ilya Lavrenov Date: Tue Feb 15 16:35:40 2022 +0300 Improvements commit a2dc0275a382c375d4bcb02a5189ec8328ca68e6 Merge: de9cb7c102 e168c9b1c3 Author: Ilya Lavrenov Date: Tue Feb 15 14:14:54 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit de9cb7c102d3fa8146f5dad73957fff8d900c071 Author: Ilya Lavrenov Date: Tue Feb 15 14:14:36 2022 +0300 Self-review commit df794a493ad37c6930ab5e02bd816d2eadcb94cf Merge: 85e01e8b4c 68c390f679 Author: Ilya Lavrenov Date: Tue Feb 15 13:35:32 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 85e01e8b4cbf01f03029aa635c27b9b834788a9c Merge: f637f8fbc4 a875f6ed9c Author: Ilya Lavrenov Date: Tue Feb 15 12:55:25 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit f637f8fbc4e6b8ff4e4bba806cceed8086b34dc4 Merge: db2e5d348e 3a5d821219 Author: Ilya Lavrenov Date: Mon Feb 14 19:29:34 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit db2e5d348e7c0d8139d09180fab4e33833c4b4b3 Merge: 78073f53ca ac2e639ff8 Author: Ilya Lavrenov Date: Mon Feb 14 18:25:05 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 78073f53ca47e89e17b7b273ba0bcd739ef9ce97 Author: Ilya Lavrenov Date: Thu Jan 13 16:37:54 2022 +0300 Automatic triplet generation; added SOVERSION commit 2267703a558b390cd859822cf7f3f78941fb5413 Merge: 91b67538ca b7e8ef910d Author: Ilya Lavrenov Date: Thu Jan 13 16:01:38 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 91b67538ca5ccfc75e3d9d4a313b248dd39881b5 Author: Ilya Lavrenov Date: Thu Jan 13 01:09:30 2022 +0300 Added both version and soversion commit c19ecf16a8be9b040b3cdc114e35599eabd5579b Merge: fc449e76dc ab09135195 Author: Ilya Lavrenov Date: Tue Jan 11 18:29:46 2022 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit fc449e76dc037b4684b2910fff27a92b6728062f Author: Ilya Lavrenov Date: Mon Dec 27 20:17:22 2021 +0300 removed if target commit 52638ac629fb88f74ecb07a5752ecc6771a8ef6b Author: Ilya Lavrenov Date: Mon Dec 27 20:13:01 2021 +0300 location for DM commit dd8f0ffaf49c262c0566ae12c888926e321b1f8c Author: Ilya Lavrenov Date: Mon Dec 27 19:55:04 2021 +0300 Fixed complation of private plugins commit 140472f4361f60dae0c7f8d72fb30df4c53d1962 Author: Ilya Lavrenov Date: Mon Dec 27 18:40:44 2021 +0300 Enable FHS even for non-debian packages commit f461859cfea3a844739a04d3068119baf0ccaa03 Merge: e603fcf8af f565e0f854 Author: Ilya Lavrenov Date: Mon Dec 27 18:34:31 2021 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit e603fcf8af347c236af451d6c2e3cdd7742ad0d3 Author: Ilya Lavrenov Date: Mon Dec 27 18:34:20 2021 +0300 Install location for plugins and python commit 1ae71e993d914da94708d08d0c451b6672926cdb Merge: 5c2b9a97d5 ab10057371 Author: Ilya Lavrenov Date: Mon Dec 27 17:53:48 2021 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 5c2b9a97d5743cac5143b6952429d5a1f3f54fab Author: Ilya Lavrenov Date: Mon Dec 27 17:53:30 2021 +0300 Fixed for debian packaging commit ab53b80e562fd48b08d1295d5485ecc59407b3df Merge: 043768808c 4188dbbf9f Author: Ilya Lavrenov Date: Mon Dec 27 16:06:40 2021 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 043768808cefe9067e6cf26eac6bb447da53e71f Merge: cd44300742 2514c0ef38 Author: Ilya Lavrenov Date: Thu Dec 16 16:05:24 2021 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit cd44300742c674ddbae58a03656fd822002f33f5 Author: Ilya Lavrenov Date: Tue Dec 14 01:52:30 2021 +0300 Fixes commit c97ce1ef602fc8c6def3b756c272a433e9a11540 Author: Ilya Lavrenov Date: Tue Dec 14 01:40:50 2021 +0300 Created virtual packages commit 680a11ee2dd745f7075afefa48bebcf49245cb6c Author: Ilya Lavrenov Date: Mon Dec 13 16:19:49 2021 +0300 Added more files to core component for DEBIAN generator commit 9b454a00de5651402c155fe94be71422b052759c Merge: 394e600fed 5124d95df7 Author: Ilya Lavrenov Date: Mon Dec 13 15:30:55 2021 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 394e600fed912fb5dfc43d8e53bc5c7ba510ebeb Merge: 74504d011f 562d388ad9 Author: Ilya Lavrenov Date: Fri Dec 10 17:50:30 2021 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 74504d011f9bfc59992a5dcfb1e64ec3ba7bcaa1 Merge: aabd31a3a5 0c68574aa7 Author: Ilya Lavrenov Date: Fri Dec 10 14:25:47 2021 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit aabd31a3a5e8b462d90eb5ba12d4022057b95462 Merge: 95bbc6f1e8 92760949bf Author: Ilya Lavrenov Date: Wed Dec 8 18:06:01 2021 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 95bbc6f1e8d7cee2b39fe5f659b23e194745b40a Merge: b4b5149e84 f734e7679b Author: Ilya Lavrenov Date: Wed Dec 8 14:53:12 2021 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit b4b5149e84b97cf530c7aa1d4ef582c9d2df829e Author: Ilya Lavrenov Date: Tue Dec 7 19:19:58 2021 +0300 Last fixes commit 311529ce502157c008a770d03e22e548d8ad6ff4 Author: Ilya Lavrenov Date: Mon Dec 6 19:47:35 2021 +0300 Works commit 746f91c8e829f5ec2c3823b6253974f70f8bbba5 Author: Ilya Lavrenov Date: Mon Dec 6 18:42:54 2021 +0300 Ntext iteration commit c6d9b58b2aaaf84ad6200c10c8f4b680573070cd Author: Ilya Lavrenov Date: Mon Dec 6 14:29:53 2021 +0300 Fixes after merge with master commit 64c633d8fe86eb9c1168dec0d285e838e300a358 Merge: 29252a7d96 d27720777c Author: Ilya Lavrenov Date: Mon Dec 6 14:20:40 2021 +0300 Merge remote-tracking branch 'upstream/master' into debian-packages commit 29252a7d96f23b73fef1a1ee9896f40d5ea04837 Author: Ilya Lavrenov Date: Sun Dec 5 20:50:19 2021 +0300 Improvements commit c13d7795eff202eb41e97644dead9bd9355d97f6 Author: Ilya Lavrenov Date: Sun Dec 5 19:45:01 2021 +0300 Debian packages are generated commit 61f36feb97c5ca6f080ee44273dd66ac477e46b2 Author: Ilya Lavrenov Date: Sat Dec 4 22:00:11 2021 +0300 Removed samples_deps, demo_scripts component commit e67a46cc3ef3347bf7259e30da275bbd8811d807 Author: Ilya Lavrenov Date: Fri Dec 3 18:48:43 2021 +0300 Start point for debian packages commit 0ab57298f8530e2ad656c93e2afb767f41597cb6 Author: Ilya Lavrenov Date: Fri Dec 3 13:10:17 2021 +0300 Export frontend_common as dev target * Improvements * Fixed aizre scripts * Revert "Fixed MINOR version" This reverts commit aa391a94bd6e488e27dbb830403e6531dcdc7a19. * Try to parametrize linux.yml * Tests * Fixes * Fixed commands * Disabled test * Fixes * Fixed typo * Try to enable debian packages on CI * One more iteration * Fixes * Fixed tensorflow tests * Explicit debian pipeline * Fixes * Skipped ov_core_read_model_from_memory --- .ci/azure/linux.yml | 185 +++++--- .ci/azure/linux_debian.yml | 416 ++++++++++++++++++ .ci/azure/windows.yml | 28 +- .../IEDevScriptsConfig.cmake | 5 + .../developer_package/packaging/debian.cmake | 7 +- cmake/packaging/debian.cmake | 18 +- licensing/CMakeLists.txt | 2 - .../test_utils/test_utils.py | 2 +- src/frontends/tensorflow/CMakeLists.txt | 11 +- .../ir_serialization/custom_ops.cpp | 2 +- 10 files changed, 590 insertions(+), 86 deletions(-) create mode 100644 .ci/azure/linux_debian.yml diff --git a/.ci/azure/linux.yml b/.ci/azure/linux.yml index c3a2965ea9c..97c8968091b 100644 --- a/.ci/azure/linux.yml +++ b/.ci/azure/linux.yml @@ -28,9 +28,21 @@ jobs: # Dynamic: # CMAKE_BUILD_SHARED_LIBS: 'ON' # PYTHON_STATIC_ARGS: + # CMAKE_CPACK_GENERATOR: + # SAMPLES_INSTALL_DIR: $(INSTALL_DIR)/samples + # RUN_PREFIX: . $(SETUPVARS) -pyver 3.8 && + # Debian: + # CMAKE_BUILD_SHARED_LIBS: 'ON' + # PYTHON_STATIC_ARGS: + # CMAKE_CPACK_GENERATOR: 'DEB' + # SAMPLES_INSTALL_DIR: /usr/share/openvino-2022.3.0/samples + # RUN_PREFIX: LD_LIBRARY_PATH=$(INSTALL_TEST_DIR):$(INSTALL_DIR)/opencv/lib:$LD_LIBRARY_PATH Static: CMAKE_BUILD_SHARED_LIBS: 'OFF' PYTHON_STATIC_ARGS: -m "not dynamic_library and not template_plugin" + CMAKE_CPACK_GENERATOR: + SAMPLES_INSTALL_DIR: $(INSTALL_DIR)/samples + RUN_PREFIX: . $(SETUPVARS) -pyver 3.8 && maxParallel: 2 # About 150% of total time @@ -161,6 +173,7 @@ jobs: -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache + -DCPACK_GENERATOR=$(CMAKE_CPACK_GENERATOR) -S $(REPO_DIR) -B $(BUILD_DIR) @@ -175,8 +188,7 @@ jobs: export CCACHE_TEMPDIR=$(TMP_DIR)/ccache export CCACHE_BASEDIR=$(Pipeline.Workspace) export CCACHE_MAXSIZE=50G - ninja - workingDirectory: $(BUILD_DIR) + ninja -C $(BUILD_DIR) displayName: 'Build Lin' - script: ccache --show-stats @@ -185,9 +197,6 @@ jobs: - script: ls -alR $(REPO_DIR)/bin/ displayName: 'List bin files' - - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_DIR)/cmake_install.cmake - displayName: 'Install' - - task: CMake@1 inputs: cmakeArgs: > @@ -195,18 +204,22 @@ jobs: -S $(REPO_DIR)/tests/layer_tests -B $(BUILD_LAYER_TESTS_DIR) - - script: ninja - workingDirectory: $(BUILD_LAYER_TESTS_DIR) + - script: ninja -C $(BUILD_LAYER_TESTS_DIR) displayName: 'Build Layer Tests' + - script: sudo apt-get remove libtbb2 -y + displayName: 'Remove debian dependencies' + condition: eq(variables['CMAKE_CPACK_GENERATOR'], 'DEB') + continueOnError: false + + - script: cmake -DCOMPONENT=python_wheels -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_DIR)/cmake_install.cmake + displayName: 'Install wheel packages' + - script: cmake -DCOMPONENT=tests -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_LAYER_TESTS_DIR)/cmake_install.cmake displayName: 'Install Layer Tests' - - script: ls -alR $(INSTALL_DIR) - displayName: 'List install files' - - script: python3 -m pip install openvino-dev --find-links=$(INSTALL_DIR)/tools - displayName: 'Install wheels' + displayName: 'Install python wheels' - script: | set -e @@ -216,32 +229,18 @@ jobs: displayName: 'Install tests' - script: ls -alR $(INSTALL_DIR) - displayName: 'List install files' - - - script: $(INSTALL_DIR)/samples/cpp/build_samples.sh -i $(INSTALL_DIR) - displayName: 'Build cpp samples' - continueOnError: false - - - script: | - export CC=clang - export CXX=clang++ - $(INSTALL_DIR)/samples/cpp/build_samples.sh -i $(INSTALL_DIR) - displayName: 'Build cpp samples - clang' - continueOnError: false - - - script: $(INSTALL_DIR)/samples/c/build_samples.sh -i $(INSTALL_DIR) - displayName: 'Build c samples' - continueOnError: false - - - script: rm -fr $(BUILD_DIR) - displayName: 'Clean build dir' - continueOnError: false + displayName: 'List install test files' # Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time - script: | export DATA_PATH=$(MODELS_PATH) export MODELS_PATH=$(MODELS_PATH) - . $(SETUPVARS) -pyver 3.8 && python3 -m pytest -s $(INSTALL_TEST_DIR)/pyngraph $(PYTHON_STATIC_ARGS) --junitxml=$(INSTALL_TEST_DIR)/TEST-Pyngraph.xml --ignore=$(INSTALL_TEST_DIR)/pyngraph/tests/test_onnx/test_zoo_models.py --ignore=$(INSTALL_TEST_DIR)/pyngraph/tests/test_onnx/test_backend.py + # because of static build libgna is needed for python binary + export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.00.00.1455.2/linux/x64:$LD_LIBRARY_PATH + python3 -m pytest -s $(INSTALL_TEST_DIR)/pyngraph $(PYTHON_STATIC_ARGS) \ + --junitxml=$(INSTALL_TEST_DIR)/TEST-Pyngraph.xml \ + --ignore=$(INSTALL_TEST_DIR)/pyngraph/tests/test_onnx/test_zoo_models.py \ + --ignore=$(INSTALL_TEST_DIR)/pyngraph/tests/test_onnx/test_backend.py displayName: 'nGraph and IE Python Bindings Tests' continueOnError: false @@ -249,81 +248,146 @@ jobs: - script: | export DATA_PATH=$(MODELS_PATH) export MODELS_PATH=$(MODELS_PATH) - export LD_LIBRARY_PATH=$(INSTALL_TEST_DIR) - . $(SETUPVARS) -pyver 3.8 && python3 -m pytest -s $(INSTALL_TEST_DIR)/pyopenvino $(PYTHON_STATIC_ARGS) --junitxml=$(INSTALL_TEST_DIR)/TEST-Pyngraph.xml --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_utils/test_utils.py --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_onnx/test_zoo_models.py --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_onnx/test_backend.py -v + # because of static build libgna is needed for python binary + export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.00.00.1455.2/linux/x64:$(INSTALL_TEST_DIR):$LD_LIBRARY_PATH + python3 -m pytest -s $(INSTALL_TEST_DIR)/pyopenvino $(PYTHON_STATIC_ARGS) \ + --junitxml=$(INSTALL_TEST_DIR)/TEST-Pyngraph.xml \ + --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_utils/test_utils.py \ + --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_onnx/test_zoo_models.py \ + --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_onnx/test_backend.py -v displayName: 'Python API 2.0 Tests' continueOnError: false - script: | - export MO_ROOT=$(INSTALL_DIR)/tools/mo - . $(SETUPVARS) -pyver 3.8 && python3 -m pytest -s $(INSTALL_DIR)/tests/mo/unit_tests --junitxml=$(INSTALL_TEST_DIR)/TEST-ModelOptimizer.xml + # because of static build libgna is needed for python binary + export LD_LIBRARY_PATH=$(REPO_DIR)/temp/gna_03.00.00.1455.2/linux/x64:$LD_LIBRARY_PATH + python3 -m pytest -s $(INSTALL_TEST_DIR)/mo/unit_tests --junitxml=$(INSTALL_TEST_DIR)/TEST-ModelOptimizer.xml displayName: 'Model Optimizer UT' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ov_core_unit_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-NGraphUT.xml + - script: | + sudo apt-get install libtbb-dev libpugixml-dev -y + cmake --build $(BUILD_DIR) --target package -j8 + condition: eq(variables['CMAKE_CPACK_GENERATOR'], 'DEB') + displayName: 'Build Debian packages' + continueOnError: false + + - script: | + # install debian packages from previous release + wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB + sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB + sudo apt-get install --no-install-recommends gnupg -y + echo "deb https://apt.repos.intel.com/openvino/2022 focal main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2022.list + sudo apt-get update -o Dir::Etc::sourcelist=/etc/apt/sources.list.d/intel-openvino-2022.list + # sudo apt-get install openvino -y + # install our local one and make sure the conflicts are resolved + sudo apt-get install --no-install-recommends dpkg-dev -y + rm -r _CPack_Packages + dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz + echo "deb [trusted=yes] file:$(BUILD_DIR) ./" | sudo tee /etc/apt/sources.list.d/openvino-local.list + sudo apt-get update -o Dir::Etc::sourcelist=/etc/apt/sources.list.d/openvino-local.list + sudo apt-get install openvino -y + workingDirectory: $(BUILD_DIR) + condition: eq(variables['CMAKE_CPACK_GENERATOR'], 'DEB') + displayName: 'Install Debian packages' + continueOnError: false + + - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_DIR)/cmake_install.cmake + condition: ne(variables['CMAKE_CPACK_GENERATOR'], 'DEB') + displayName: 'Install openvino' + continueOnError: false + + - script: ls -alR $(INSTALL_DIR) + condition: ne(variables['CMAKE_CPACK_GENERATOR'], 'DEB') + displayName: 'List install files' + + - script: rm -fr $(BUILD_DIR) + displayName: 'Clean build dir' + continueOnError: false + + - script: $(SAMPLES_INSTALL_DIR)/cpp/build_samples.sh -i $(INSTALL_DIR) + displayName: 'Build cpp samples' + continueOnError: false + + - script: | + export CC=clang + export CXX=clang++ + $(SAMPLES_INSTALL_DIR)/cpp/build_samples.sh -i $(INSTALL_DIR) + displayName: 'Build cpp samples - clang' + continueOnError: false + + - script: $(SAMPLES_INSTALL_DIR)/c/build_samples.sh -i $(INSTALL_DIR) + displayName: 'Build c samples' + continueOnError: false + + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_core_unit_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-NGraphUT.xml displayName: 'OV Core UT' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/onnx_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ONNXImportUT.xml + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/onnx_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ONNXImportUT.xml displayName: 'ONNX Frontend UT' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml displayName: 'Paddle Frontend UT' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/onnx_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/onnx_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml displayName: 'ONNX Frontend UT' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/tensorflow_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Tensorflow.xml + - script: | + # tensorflow frontend is not distributed to end users, we have to find it manually + export OV_FRONTEND_PATH=$(INSTALL_TEST_DIR) + $(RUN_PREFIX) $(INSTALL_TEST_DIR)/tensorflow_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Tensorflow.xml displayName: 'Tensorflow Frontend UT' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/InferenceEngineUnitTests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-InferenceEngineUnitTests.xml + # python3 $(WORK_DIR)/gtest-parallel/gtest_parallel.py $(INSTALL_TEST_DIR)/InferenceEngineUnitTests --workers=16 --dump_json_test_results=InferenceEngineUnitTests.json --gtest_filter=*smoke* -- --gtest_print_time=1 + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/InferenceEngineUnitTests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-InferenceEngineUnitTests.xml displayName: 'IE UT old' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ieUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ieUnitTests.xml + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ieUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ieUnitTests.xml displayName: 'IE UT' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/cpuUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-cpuUnitTests.xml + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/cpuUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-cpuUnitTests.xml displayName: 'CPU UT' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/gnaUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-gnaUnitTests.xml + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/gnaUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-gnaUnitTests.xml displayName: 'GNA UT' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/vpuUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-vpuUnitTests.xml + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/vpuUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-vpuUnitTests.xml displayName: 'VPU UT' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/XLinkTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-XLinkTests.xml + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/XLinkTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-XLinkTests.xml displayName: 'XLink Tests' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ieMultiPluginUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ieMultiPluginUnitTests.xml + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ieMultiPluginUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ieMultiPluginUnitTests.xml displayName: 'MULTI UT' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/onnxImporterUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-onnxImporterUnitTests.xml + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/onnxImporterUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-onnxImporterUnitTests.xml displayName: 'ONNX Importer UT' continueOnError: false - script: | # because of IR reader v7 export LD_LIBRARY_PATH=$(INSTALL_TEST_DIR) - . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ieFuncTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ieFuncTests.xml + $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ieFuncTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ieFuncTests.xml displayName: 'IE FuncTests' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/ov_template_func_tests --gtest_filter=*smoke* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-templateFuncTests.xml + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_template_func_tests --gtest_filter=*smoke* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-templateFuncTests.xml displayName: 'TEMPLATE FuncTests' continueOnError: false - - script: . $(SETUPVARS) && $(INSTALL_TEST_DIR)/cpuFuncTests --gtest_filter=*smoke* --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-cpuFuncTests.xml + - script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/cpuFuncTests --gtest_filter=*smoke* --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-cpuFuncTests.xml displayName: 'CPU FuncTests' continueOnError: false condition: eq(variables['CMAKE_BUILD_SHARED_LIBS'], 'OFF') @@ -331,14 +395,14 @@ jobs: - script: | export DATA_PATH=$(MODELS_PATH) export MODELS_PATH=$(MODELS_PATH) - . $(SETUPVARS) && $(INSTALL_TEST_DIR)/InferenceEngineCAPITests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-InferenceEngineCAPITests.xml + $(RUN_PREFIX) $(INSTALL_TEST_DIR)/InferenceEngineCAPITests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-InferenceEngineCAPITests.xml displayName: 'IE CAPITests' continueOnError: false - script: | export DATA_PATH=$(MODELS_PATH) export MODELS_PATH=$(MODELS_PATH) - . $(SETUPVARS) && $(INSTALL_TEST_DIR)/OpenVinoCAPITests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-OpenVinoCAPITests.xml + $(RUN_PREFIX) $(INSTALL_TEST_DIR)/OpenVinoCAPITests --gtest_filter=-*ov_core_read_model_from_memory* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-OpenVinoCAPITests.xml displayName: 'OV CAPITests' continueOnError: false @@ -352,8 +416,7 @@ jobs: - script: cmake -DCOMPONENT=tests -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_SAMPLES_TESTS_DIR)/cmake_install.cmake displayName: 'Install Samples Tests' - - script: | - python3 -m pip install -r $(INSTALL_DIR)/tests/smoke_tests/requirements.txt + - script: python3 -m pip install -r $(INSTALL_TEST_DIR)/smoke_tests/requirements.txt displayName: 'Install dependencies for samples smoke tests' continueOnError: false @@ -361,19 +424,17 @@ jobs: export PATH=$HOME/.local/bin:$PATH export IE_APP_PATH=$(INSTALL_DIR)/samples_bin export LD_LIBRARY_PATH=$IE_APP_PATH:$LD_LIBRARY_PATH - export IE_APP_PYTHON_PATH=$(INSTALL_DIR)/samples/python/ - export SHARE=$(INSTALL_DIR)/tests/smoke_tests/samples_smoke_tests_data/ + export IE_APP_PYTHON_PATH=$(SAMPLES_INSTALL_DIR)/python/ + export SHARE=$(INSTALL_TEST_DIR)/smoke_tests/samples_smoke_tests_data/ export WORKSPACE=$(INSTALL_DIR) - . $(SETUPVARS) && python3 -m pytest $(INSTALL_DIR)/tests/smoke_tests/ --env_conf $(INSTALL_DIR)/tests/smoke_tests/env_config.yml -s --junitxml=$(INSTALL_TEST_DIR)/TEST-SamplesSmokeTests.xml + $(RUN_PREFIX) python3 -m pytest $(INSTALL_TEST_DIR)/smoke_tests/ --env_conf $(INSTALL_TEST_DIR)/smoke_tests/env_config.yml -s --junitxml=$(INSTALL_TEST_DIR)/TEST-SamplesSmokeTests.xml displayName: 'Samples Smoke Tests' continueOnError: false - script: | - . $(SETUPVARS) python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt - export MO_ROOT=$(INSTALL_DIR)/tools/mo export PYTHONPATH=$(LAYER_TESTS_DIR):$PYTHONPATH - python3 -m pytest $(LAYER_TESTS_DIR)/tensorflow_tests/test_tf_Roll.py --ir_version=10 --junitxml=$(INSTALL_TEST_DIR)/TEST-tf_Roll.xmlTEST + $(RUN_PREFIX) python3 -m pytest $(LAYER_TESTS_DIR)/tensorflow_tests/test_tf_Roll.py --ir_version=10 --junitxml=$(INSTALL_TEST_DIR)/TEST-tf_Roll.xmlTEST displayName: 'Layer Tests' continueOnError: false diff --git a/.ci/azure/linux_debian.yml b/.ci/azure/linux_debian.yml new file mode 100644 index 00000000000..613fdc91c27 --- /dev/null +++ b/.ci/azure/linux_debian.yml @@ -0,0 +1,416 @@ +trigger: + branches: + include: + - master + - releases/* + paths: + exclude: + - docs/* + +resources: + repositories: + - repository: openvino_contrib + type: github + endpoint: openvinotoolkit + name: openvinotoolkit/openvino_contrib + ref: master + + - repository: testdata + type: github + endpoint: openvinotoolkit + name: openvinotoolkit/testdata + ref: master + +jobs: +- job: Lin-Debian + # About 150% of total time + timeoutInMinutes: 120 + + pool: + name: LIN_VMSS_VENV_F16S_U20_WU2 + + variables: + system.debug: true + VSTS_HTTP_RETRY: 5 + VSTS_HTTP_TIMEOUT: 200 + BUILD_TYPE: Release + REPO_DIR: $(Build.Repository.LocalPath) + OPENVINO_CONTRIB_REPO_DIR: $(REPO_DIR)/../openvino_contrib + MODELS_PATH: $(REPO_DIR)/../testdata + WORK_DIR: $(Pipeline.Workspace)/_w + BUILD_DIR: $(WORK_DIR)/build + BUILD_SAMPLES_DIR: $(WORK_DIR)/build_samples + BUILD_LAYER_TESTS_DIR: $(WORK_DIR)/build_layer_tests + BUILD_SAMPLES_TESTS_DIR: $(WORK_DIR)/build_samples_tests + INSTALL_DIR: $(WORK_DIR)/install_pkg + INSTALL_TEST_DIR: $(INSTALL_DIR)/tests + LAYER_TESTS_DIR: $(INSTALL_TEST_DIR)/layer_tests + SAMPLES_INSTALL_DIR: /usr/share/openvino-2022.3.0/samples + TMP_DIR: /mnt/tmp + SHARE_DIR: /mount/cinfsshare/onnxtestdata + CCACHE_DIR: $(SHARE_DIR)/ccache/master/linux + + steps: + - script: | + curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2019-06-01" + whoami + uname -a + echo Python3 info ; which python3 ; python3 --version + echo Python info ; which python ; python --version + echo Java info ; which java ; java -version + echo gcc info ; which gcc ; gcc --version + echo cmake info ; which cmake ; cmake --version + lsb_release + env + cat /proc/cpuinfo + cat /proc/meminfo + cat /etc/fstab + vmstat -s + df + lsblk -o NAME,HCTL,SIZE,MOUNTPOINT | grep -i "sd" + free -h + echo TargetBranch: $(System.PullRequest.TargetBranch) + echo SourceBranch: $(Build.SourceBranch) + displayName: 'System info' + + - script: | + set -e + rm -rf $(WORK_DIR) ; mkdir $(WORK_DIR) + rm -rf $(BUILD_DIR) ; mkdir $(BUILD_DIR) + rm -rf $(BUILD_SAMPLES_DIR) ; mkdir $(BUILD_SAMPLES_DIR) + sudo rm -rf $(TMP_DIR) ; sudo mkdir $(TMP_DIR) ; sudo chmod 777 -R $(TMP_DIR) + sudo mkdir -p $(SHARE_DIR) + sudo apt --assume-yes update && sudo apt --assume-yes install nfs-common + sudo mount -vvv -t nfs cinfsshare.file.core.windows.net:/cinfsshare/onnxtestdata $(SHARE_DIR) -o vers=4,minorversion=1,sec=sys + mkdir -p $(CCACHE_DIR) + displayName: 'Make dir' + + - checkout: self + clean: true + lfs: false + submodules: recursive + path: openvino + + - checkout: openvino_contrib + clean: true + lfs: false + submodules: recursive + path: openvino_contrib + + - script: | + set -e + $(REPO_DIR)/install_build_dependencies.sh + # Move jdk into contrib + # 'clang' compiler is to check that samples can be built using it + sudo apt --assume-yes install openjdk-11-jdk clang + sudo apt --assume-yes install --no-install-recommends libopencv-imgproc-dev libopencv-imgcodecs-dev + # For opencv-python: python3-setuptools and pip upgrade + python3 -m pip install --upgrade pip + python3 -m pip install -r $(REPO_DIR)/src/bindings/python/src/compatibility/openvino/requirements.txt + python3 -m pip install -r $(REPO_DIR)/src/bindings/python/wheel/requirements-dev.txt + # For running Python API tests + python3 -m pip install -r $(REPO_DIR)/src/bindings/python/src/compatibility/openvino/requirements-dev.txt + # For running Paddle frontend unit tests + python3 -m pip install -r $(REPO_DIR)/src/core/tests/frontend/paddle/requirements_dev.txt + # For running ONNX frontend unit tests + python3 -m pip install -r $(REPO_DIR)/src/core/tests/requirements_test_onnx.txt + # For MO unit tests + python3 -m pip install -r $(REPO_DIR)/tools/mo/requirements.txt + python3 -m pip install -r $(REPO_DIR)/tools/mo/requirements_dev.txt + # Speed up build + 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/ + # Speed up tests + git clone https://github.com/google/gtest-parallel.git + workingDirectory: $(WORK_DIR) + displayName: 'Install dependencies' + + # Should be after 'Install dependencies' because Git lfs is not installed + - checkout: testdata + clean: true + lfs: true + path: testdata + + - task: CMake@1 + inputs: + # CMake must get Python 3.x version by default + cmakeArgs: > + -GNinja + -DVERBOSE_BUILD=ON + -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) + -DENABLE_PYTHON=ON + -DPYTHON_EXECUTABLE=/usr/bin/python3.8 + -DENABLE_WHEEL=ON + -DENABLE_TESTS=ON + -DENABLE_FASTER_BUILD=ON + -DENABLE_STRICT_DEPENDENCIES=OFF + -DENABLE_REQUIREMENTS_INSTALL=OFF + -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)/modules + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + -DCMAKE_C_COMPILER_LAUNCHER=ccache + -DCPACK_GENERATOR=DEB + -S $(REPO_DIR) + -B $(BUILD_DIR) + + - script: ls -alR $(REPO_DIR)/temp/ + displayName: 'List temp SDKs' + + - script: ccache --zero-stats --max-size=50G --show-config + displayName: 'Clean ccache stats' + + - script: | + export CCACHE_DIR=$(CCACHE_DIR) + export CCACHE_TEMPDIR=$(TMP_DIR)/ccache + export CCACHE_BASEDIR=$(Pipeline.Workspace) + export CCACHE_MAXSIZE=50G + ninja -C $(BUILD_DIR) + displayName: 'Build Lin' + + - script: ccache --show-stats + displayName: 'Show ccache stats' + + - script: ls -alR $(REPO_DIR)/bin/ + displayName: 'List bin files' + + - task: CMake@1 + inputs: + cmakeArgs: > + -GNinja + -S $(REPO_DIR)/tests/layer_tests + -B $(BUILD_LAYER_TESTS_DIR) + + - script: ninja -C $(BUILD_LAYER_TESTS_DIR) + displayName: 'Build Layer Tests' + + - script: sudo apt-get remove libtbb2 -y + displayName: 'Remove debian dependencies' + continueOnError: false + + - script: cmake -DCOMPONENT=python_wheels -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_DIR)/cmake_install.cmake + displayName: 'Install wheel packages' + + - script: cmake -DCOMPONENT=tests -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_LAYER_TESTS_DIR)/cmake_install.cmake + displayName: 'Install Layer Tests' + + - script: python3 -m pip install openvino-dev --find-links=$(INSTALL_DIR)/tools + displayName: 'Install python wheels' + + - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -DCOMPONENT=tests -P $(BUILD_DIR)/cmake_install.cmake + displayName: 'Install tests' + + - script: ls -alR $(INSTALL_DIR) + displayName: 'List install test files' + + # Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time + - script: | + export DATA_PATH=$(MODELS_PATH) + export MODELS_PATH=$(MODELS_PATH) + python3 -m pytest -s $(INSTALL_TEST_DIR)/pyngraph \ + --junitxml=$(INSTALL_TEST_DIR)/TEST-Pyngraph.xml \ + --ignore=$(INSTALL_TEST_DIR)/pyngraph/tests/test_onnx/test_zoo_models.py \ + --ignore=$(INSTALL_TEST_DIR)/pyngraph/tests/test_onnx/test_backend.py + displayName: 'nGraph and IE Python Bindings Tests' + continueOnError: true + + # Skip test_onnx/test_zoo_models and test_onnx/test_backend due to long execution time + - script: | + export DATA_PATH=$(MODELS_PATH) + export MODELS_PATH=$(MODELS_PATH) + python3 -m pytest -s $(INSTALL_TEST_DIR)/pyopenvino \ + --junitxml=$(INSTALL_TEST_DIR)/TEST-Pyngraph.xml \ + --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_utils/test_utils.py \ + --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_onnx/test_zoo_models.py \ + --ignore=$(INSTALL_TEST_DIR)/pyopenvino/tests/test_onnx/test_backend.py -v + displayName: 'Python API 2.0 Tests' + continueOnError: true + + - script: python3 -m pytest -s $(INSTALL_TEST_DIR)/mo/unit_tests --junitxml=$(INSTALL_TEST_DIR)/TEST-ModelOptimizer.xml + displayName: 'Model Optimizer UT' + continueOnError: true + + - script: | + sudo apt-get install libtbb-dev libpugixml-dev -y + cmake --build $(BUILD_DIR) --target package -j8 + condition: eq(variables['CMAKE_CPACK_GENERATOR'], 'DEB') + displayName: 'Build Debian packages' + continueOnError: true + + - script: | + # install debian packages from previous release + wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB + sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB + sudo apt-get install --no-install-recommends gnupg -y + echo "deb https://apt.repos.intel.com/openvino/2022 focal main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2022.list + sudo apt-get update -o Dir::Etc::sourcelist=/etc/apt/sources.list.d/intel-openvino-2022.list + # sudo apt-get install openvino -y + # install our local one and make sure the conflicts are resolved + sudo apt-get install --no-install-recommends dpkg-dev -y + rm -r _CPack_Packages + dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz + echo "deb [trusted=yes] file:$(BUILD_DIR) ./" | sudo tee /etc/apt/sources.list.d/openvino-local.list + sudo apt-get update -o Dir::Etc::sourcelist=/etc/apt/sources.list.d/openvino-local.list + sudo apt-get install openvino -y + workingDirectory: $(BUILD_DIR) + displayName: 'Install Debian packages' + continueOnError: true + + - script: cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_DIR)/cmake_install.cmake + displayName: 'Install openvino' + continueOnError: true + + - script: ls -alR $(INSTALL_DIR) + displayName: 'List install files' + + - script: rm -fr $(BUILD_DIR) + displayName: 'Clean build dir' + continueOnError: true + + - script: $(SAMPLES_INSTALL_DIR)/cpp/build_samples.sh -i $(INSTALL_DIR) + displayName: 'Build cpp samples' + continueOnError: true + + - script: | + export CC=clang + export CXX=clang++ + $(SAMPLES_INSTALL_DIR)/cpp/build_samples.sh -i $(INSTALL_DIR) + displayName: 'Build cpp samples - clang' + continueOnError: true + + - script: $(SAMPLES_INSTALL_DIR)/c/build_samples.sh -i $(INSTALL_DIR) + displayName: 'Build c samples' + continueOnError: true + + - script: | + export LD_LIBRARY_PATH=$(INSTALL_TEST_DIR):$LD_LIBRARY_PATH + $(INSTALL_TEST_DIR)/ov_core_unit_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-NGraphUT.xml + displayName: 'OV Core UT' + continueOnError: true + + - script: $(INSTALL_TEST_DIR)/onnx_tests --gtest_print_time=1 --gtest_filter=-*IE_GPU* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ONNXImportUT.xml + displayName: 'ONNX Frontend UT' + continueOnError: true + + - script: $(INSTALL_TEST_DIR)/paddle_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml + displayName: 'Paddle Frontend UT' + continueOnError: true + + - script: $(INSTALL_TEST_DIR)/onnx_frontend_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Paddle.xml + displayName: 'ONNX Frontend UT' + continueOnError: true + + - script: | + export OV_FRONTEND_PATH=$(INSTALL_TEST_DIR) + $(INSTALL_TEST_DIR)/tensorflow_tests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-Tensorflow.xml + displayName: 'Tensorflow Frontend UT' + continueOnError: true + + # python3 $(WORK_DIR)/gtest-parallel/gtest_parallel.py $(INSTALL_TEST_DIR)/InferenceEngineUnitTests --workers=16 --dump_json_test_results=InferenceEngineUnitTests.json --gtest_filter=*smoke* -- --gtest_print_time=1 + - script: $(INSTALL_TEST_DIR)/InferenceEngineUnitTests --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-InferenceEngineUnitTests.xml + displayName: 'IE UT old' + continueOnError: true + + - script: $(INSTALL_TEST_DIR)/ieUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ieUnitTests.xml + displayName: 'IE UT' + continueOnError: true + + - script: $(INSTALL_TEST_DIR)/cpuUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-cpuUnitTests.xml + displayName: 'CPU UT' + continueOnError: true + + - script: $(INSTALL_TEST_DIR)/gnaUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-gnaUnitTests.xml + displayName: 'GNA UT' + continueOnError: true + + - script: $(INSTALL_TEST_DIR)/vpuUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-vpuUnitTests.xml + displayName: 'VPU UT' + continueOnError: true + + - script: $(INSTALL_TEST_DIR)/XLinkTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-XLinkTests.xml + displayName: 'XLink Tests' + continueOnError: true + + - script: $(INSTALL_TEST_DIR)/ieMultiPluginUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ieMultiPluginUnitTests.xml + displayName: 'MULTI UT' + continueOnError: true + + - script: $(INSTALL_TEST_DIR)/onnxImporterUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-onnxImporterUnitTests.xml + displayName: 'ONNX Importer UT' + continueOnError: true + + - script: | + # because of IR reader v7 + export LD_LIBRARY_PATH=$(INSTALL_TEST_DIR) + $(INSTALL_TEST_DIR)/ieFuncTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ieFuncTests.xml + displayName: 'IE FuncTests' + continueOnError: true + + - script: | + export LD_LIBRARY_PATH=$(INSTALL_TEST_DIR):$LD_LIBRARY_PATH + $(INSTALL_TEST_DIR)/ov_template_func_tests --gtest_filter=*smoke* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-templateFuncTests.xml + displayName: 'TEMPLATE FuncTests' + continueOnError: true + + # run not all smoke filter to save time in post-commit + - script: $(INSTALL_TEST_DIR)/cpuFuncTests --gtest_filter=*OVCLass*:*CoreThreadingTests* --gtest_print_time=1 --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-cpuFuncTests.xml + displayName: 'CPU FuncTests' + continueOnError: true + + - script: | + export DATA_PATH=$(MODELS_PATH) + export MODELS_PATH=$(MODELS_PATH) + $(INSTALL_TEST_DIR)/InferenceEngineCAPITests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-InferenceEngineCAPITests.xml + displayName: 'IE CAPITests' + continueOnError: true + + - script: | + export DATA_PATH=$(MODELS_PATH) + export MODELS_PATH=$(MODELS_PATH) + $(INSTALL_TEST_DIR)/OpenVinoCAPITests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-OpenVinoCAPITests.xml + displayName: 'OV CAPITests' + continueOnError: true + + - task: CMake@1 + inputs: + cmakeArgs: > + -GNinja + -S $(REPO_DIR)/tests/samples_tests + -B $(BUILD_SAMPLES_TESTS_DIR) + + - script: cmake -DCOMPONENT=tests -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_SAMPLES_TESTS_DIR)/cmake_install.cmake + displayName: 'Install Samples Tests' + + - script: python3 -m pip install -r $(INSTALL_TEST_DIR)/smoke_tests/requirements.txt + displayName: 'Install dependencies for samples smoke tests' + continueOnError: true + + - script: | + export PATH=$HOME/.local/bin:$PATH + export IE_APP_PATH=$(INSTALL_DIR)/samples_bin + export LD_LIBRARY_PATH=$IE_APP_PATH:$LD_LIBRARY_PATH + export IE_APP_PYTHON_PATH=$(SAMPLES_INSTALL_DIR)/python/ + export SHARE=$(INSTALL_TEST_DIR)/smoke_tests/samples_smoke_tests_data/ + export WORKSPACE=$(INSTALL_DIR) + python3 -m pytest $(INSTALL_TEST_DIR)/smoke_tests/ --env_conf $(INSTALL_TEST_DIR)/smoke_tests/env_config.yml -s --junitxml=$(INSTALL_TEST_DIR)/TEST-SamplesSmokeTests.xml + displayName: 'Samples Smoke Tests' + continueOnError: true + + - script: | + python3 -m pip install -r $(LAYER_TESTS_DIR)/requirements.txt + export PYTHONPATH=$(LAYER_TESTS_DIR):$PYTHONPATH + python3 -m pytest $(LAYER_TESTS_DIR)/tensorflow_tests/test_tf_Roll.py --ir_version=10 --junitxml=$(INSTALL_TEST_DIR)/TEST-tf_Roll.xmlTEST + displayName: 'Layer Tests' + continueOnError: true + + - task: PublishTestResults@2 + condition: always() + inputs: + testResultsFormat: 'JUnit' # Options: JUnit, NUnit, VSTest, xUnit, cTest + testResultsFiles: '**/TEST-*.xml' + #searchFolder: '$(BUILD_DIR)' + mergeTestResults: false # Optional + #failTaskOnFailedTests: false # Optional + #testRunTitle: 'Pre/Post-Commit' # Optional + buildPlatform: 'x64' # Optional + buildConfiguration: 'Linux' # Optional + #publishRunAttachments: true # Optional diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml index 8d49a179725..c211de19ee8 100644 --- a/.ci/azure/windows.yml +++ b/.ci/azure/windows.yml @@ -135,8 +135,24 @@ jobs: - script: | set PATH=$(WORK_DIR)\ninja-win;%PATH% - call "$(MSVS_VARS_PATH)" && $(CMAKE_CMD) -G "Ninja Multi-Config" -DENABLE_WHEEL=ON -DENABLE_ONEDNN_FOR_GPU=$(CMAKE_BUILD_SHARED_LIBS) -DBUILD_SHARED_LIBS=$(CMAKE_BUILD_SHARED_LIBS) -DENABLE_REQUIREMENTS_INSTALL=OFF -DENABLE_FASTER_BUILD=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_TESTS=ON -DENABLE_STRICT_DEPENDENCIES=OFF -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE="C:\hostedtoolcache\windows\Python\3.7.6\x64\python.exe" -DPYTHON_INCLUDE_DIR="C:\hostedtoolcache\windows\Python\3.7.6\x64\include" -DPYTHON_LIBRARY="C:\hostedtoolcache\windows\Python\3.7.6\x64\libs\python37.lib" -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)\modules -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(REPO_DIR) - workingDirectory: $(BUILD_DIR) + call "$(MSVS_VARS_PATH)" && $(CMAKE_CMD) -G "Ninja Multi-Config" \ + -DENABLE_WHEEL=ON \ + -DENABLE_ONEDNN_FOR_GPU=$(CMAKE_BUILD_SHARED_LIBS) \ + -DBUILD_SHARED_LIBS=$(CMAKE_BUILD_SHARED_LIBS) \ + -DENABLE_REQUIREMENTS_INSTALL=OFF \ + -DENABLE_FASTER_BUILD=ON \ + -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \ + -DENABLE_TESTS=ON + -DENABLE_STRICT_DEPENDENCIES=OFF \ + -DENABLE_PYTHON=ON \ + -DPYTHON_EXECUTABLE="C:\hostedtoolcache\windows\Python\3.7.6\x64\python.exe" \ + -DPYTHON_INCLUDE_DIR="C:\hostedtoolcache\windows\Python\3.7.6\x64\include" \ + -DPYTHON_LIBRARY="C:\hostedtoolcache\windows\Python\3.7.6\x64\libs\python37.lib" \ + -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)\modules \ + -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" \ + -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" \ + -S $(REPO_DIR) \ + -B $(BUILD_DIR) displayName: 'CMake' - script: dir $(REPO_DIR)\temp\ /s @@ -159,8 +175,12 @@ jobs: - script: python -m pip install openvino-dev --find-links=$(INSTALL_DIR)\tools displayName: 'Install Wheels' - - script: call "$(MSVS_VARS_PATH)" && $(CMAKE_CMD) -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(REPO_DIR)\tests\samples_tests - workingDirectory: $(BUILD_SAMPLES_TESTS_DIR) + - script: | + call "$(MSVS_VARS_PATH)" && $(CMAKE_CMD) \ + -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" \ + -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" \ + -S $(REPO_DIR)\tests\samples_tests \ + -B $(BUILD_SAMPLES_TESTS_DIR) displayName: 'CMake' - script: $(CMAKE_CMD) -DCOMPONENT=tests -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -P $(BUILD_SAMPLES_TESTS_DIR)\cmake_install.cmake diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake index da5278c2b37..24e20c03a01 100644 --- a/cmake/developer_package/IEDevScriptsConfig.cmake +++ b/cmake/developer_package/IEDevScriptsConfig.cmake @@ -169,6 +169,11 @@ ov_set_if_not_defined(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FO ov_set_if_not_defined(CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}) ov_set_if_not_defined(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND CPACK_GENERATOR STREQUAL "DEB") + # to make sure that lib/ is created on Debian + set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Cmake install prefix" FORCE) +endif() + if(APPLE) set(CMAKE_MACOSX_RPATH ON) # WA for Xcode generator + object libraries issue: diff --git a/cmake/developer_package/packaging/debian.cmake b/cmake/developer_package/packaging/debian.cmake index 40a3dbeeb0e..c04a65b1ed8 100644 --- a/cmake/developer_package/packaging/debian.cmake +++ b/cmake/developer_package/packaging/debian.cmake @@ -29,7 +29,8 @@ macro(ov_debian_cpack_set_dirs) set(OV_CPACK_DEVREQDIR ${OV_CPACK_SHAREDIR}) unset(OV_CPACK_SHAREDIR) - set(OV_CPACK_WHEELSDIR .) # TODO + # skipped during debian packaging + set(OV_CPACK_WHEELSDIR "tools") # for BW compatibility set(IE_CPACK_LIBRARY_PATH ${OV_CPACK_LIBRARYDIR}) @@ -50,7 +51,7 @@ macro(ov_override_component_names) set(OV_CPACK_COMP_CORE_C "${OV_CPACK_COMP_CORE}") set(OV_CPACK_COMP_CORE_C_DEV "${OV_CPACK_COMP_CORE_DEV}") # merge all pythons into a single component - set(OV_CPACK_COMP_PYTHON_OPENVINO "python") + set(OV_CPACK_COMP_PYTHON_OPENVINO "pyopenvino") set(OV_CPACK_COMP_PYTHON_IE_API "${OV_CPACK_COMP_PYTHON_OPENVINO}") set(OV_CPACK_COMP_PYTHON_NGRAPH "${OV_CPACK_COMP_PYTHON_OPENVINO}") # merge all C / C++ samples as a single samples component @@ -61,8 +62,6 @@ macro(ov_override_component_names) set(OV_CPACK_COMP_DEV_REQ_FILES "${OV_CPACK_COMP_CORE_DEV}") # move core_tools to core-dev set(OV_CPACK_COMP_CORE_TOOLS "${OV_CPACK_COMP_CORE_DEV}") - # move licensing to core - set(OV_CPACK_COMP_LICENSING "${OV_CPACK_COMP_CORE}") endmacro() ov_override_component_names() diff --git a/cmake/packaging/debian.cmake b/cmake/packaging/debian.cmake index 16c10985a70..45ff715534b 100644 --- a/cmake/packaging/debian.cmake +++ b/cmake/packaging/debian.cmake @@ -147,8 +147,12 @@ macro(ov_cpack_settings) endif() # intel-cpu - if(ENABLE_INTEL_CPU) - set(CPACK_COMPONENT_CPU_DESCRIPTION "Intel® CPU") + if(ENABLE_INTEL_CPU OR DEFINED openvino_arm_cpu_plugin_SOURCE_DIR) + if(ENABLE_INTEL_CPU) + set(CPACK_COMPONENT_CPU_DESCRIPTION "Intel® CPU") + else() + set(CPACK_COMPONENT_CPU_DESCRIPTION "ARM CPU") + endif() set(CPACK_COMPONENT_CPU_DEPENDS "core") set(CPACK_DEBIAN_CPU_PACKAGE_NAME "libopenvino-intel-cpu-${cpack_name_ver}") set(CPACK_DEBIAN_CPU_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}") @@ -203,14 +207,14 @@ macro(ov_cpack_settings) # if(ENABLE_PYTHON) - set(CPACK_COMPONENT_PYTHON_PYTHON3.8_DESCRIPTION "OpenVINO Python bindings") + set(CPACK_COMPONENT_PYOPENVINO_PYTHON3.8_DESCRIPTION "OpenVINO Python bindings") if(installed_plugins) - set(CPACK_COMPONENT_PYTHON_PYTHON3.8_DEPENDS "${installed_plugins}") + set(CPACK_COMPONENT_PYOPENVINO_PYTHON3.8_DEPENDS "${installed_plugins}") else() - set(CPACK_COMPONENT_PYTHON_PYTHON3.8_DEPENDS "core") + set(CPACK_COMPONENT_PYOPENVINO_PYTHON3.8_DEPENDS "core") endif() - set(CPACK_DEBIAN_PYTHON_PYTHON3.8_PACKAGE_NAME "libopenvino-python-${cpack_name_ver}") - set(CPACK_DEBIAN_PYTHON_PYTHON3.8_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}") + set(CPACK_DEBIAN_PYOPENVINO_PYTHON3.8_PACKAGE_NAME "libopenvino-python-${cpack_name_ver}") + set(CPACK_DEBIAN_PYOPENVINO_PYTHON3.8_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}") endif() # diff --git a/licensing/CMakeLists.txt b/licensing/CMakeLists.txt index f1c0129a4b5..48df2726802 100644 --- a/licensing/CMakeLists.txt +++ b/licensing/CMakeLists.txt @@ -8,8 +8,6 @@ ie_cpack_add_component(${OV_CPACK_COMP_LICENSING} HIDDEN) -# TODO: exclude from debian and use cmake/developer_package/packaging/copyright - install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${OV_CPACK_DOCDIR}/licensing COMPONENT ${OV_CPACK_COMP_LICENSING} diff --git a/src/bindings/python/tests_compatibility/test_utils/test_utils.py b/src/bindings/python/tests_compatibility/test_utils/test_utils.py index 32c6eddbeda..83194f59803 100644 --- a/src/bindings/python/tests_compatibility/test_utils/test_utils.py +++ b/src/bindings/python/tests_compatibility/test_utils/test_utils.py @@ -24,7 +24,7 @@ def test_compare_functions(): func = get_test_function() status, _ = compare_functions(func, func) assert status - except RuntimeError: + except ModuleNotFoundError: print("openvino.test_utils.compare_functions is not available") diff --git a/src/frontends/tensorflow/CMakeLists.txt b/src/frontends/tensorflow/CMakeLists.txt index 6026feb2c2a..8bd3ba49d00 100644 --- a/src/frontends/tensorflow/CMakeLists.txt +++ b/src/frontends/tensorflow/CMakeLists.txt @@ -9,20 +9,21 @@ ov_add_frontend(NAME tensorflow LINK_LIBRARIES openvino::util openvino::runtime::dev) # give a different name during installation to OpenVINO package -set_target_properties(openvino_tensorflow_frontend PROPERTIES OUTPUT_NAME openvino_tensorflow_fe) +set(target_name "${FRONTEND_NAME_PREFIX}tensorflow${FRONTEND_NAME_SUFFIX}") +set_target_properties(${target_name} PROPERTIES OUTPUT_NAME openvino_tensorflow_fe) function(ov_frontend_get_file_name target_name library_name) set(LIB_PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}") - set(LIB_SUFFIX "${IE_BUILD_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}") + set(LIB_SUFFIX "${IE_BUILD_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}${OpenVINO_VERSION_SUFFIX}") set("${library_name}" "${LIB_PREFIX}${target_name}${LIB_SUFFIX}" PARENT_SCOPE) endfunction() -ov_frontend_get_file_name(openvino_tensorflow_frontend output_name) +ov_frontend_get_file_name(${target_name} output_name) # install with original name for tests component -install(FILES $ - DESTINATION ${OV_CPACK_RUNTIMEDIR} +install(FILES $ + DESTINATION tests COMPONENT tests RENAME ${output_name} EXCLUDE_FROM_ALL) diff --git a/src/tests/functional/inference_engine/ir_serialization/custom_ops.cpp b/src/tests/functional/inference_engine/ir_serialization/custom_ops.cpp index 94e2aae3b99..861c9e18376 100644 --- a/src/tests/functional/inference_engine/ir_serialization/custom_ops.cpp +++ b/src/tests/functional/inference_engine/ir_serialization/custom_ops.cpp @@ -70,7 +70,7 @@ TEST_F(CustomOpsSerializationTest, CustomOpUser_MO) { // a shared library for ONNX don't make sence in static OpenVINO build #ifndef OPENVINO_STATIC_LIBRARY -TEST_F(CustomOpsSerializationTest, CustomOpUser_ONNXImporter) { +TEST_F(CustomOpsSerializationTest, DISABLED_CustomOpUser_ONNXImporter) { const std::string model = CommonTestUtils::getModelFromTestModelZoo(IR_SERIALIZATION_MODELS_PATH "custom_op.onnx"); InferenceEngine::Core ie;