Commit Graph

56 Commits

Author SHA1 Message Date
Ilya Lavrenov
98392a043b Fixed issues in setupvars.sh (#15884)
* Fixed issues with setupvar.sh

* Fixes setupvars realpath error

---------

Co-authored-by: Otoka, Tomasz <tomasz.otoka@intel.com>
2023-02-22 19:36:23 +04:00
Ilya Lavrenov
c4eeecfec5 Remove myriad plugin (#15131)
* Removed Intel MYRIAD plugin

* Removed Intel MYIAD from CI files

* Removed Intel MYRIAD from cmake folder

* Removed MYRIAD, HDDL from samples

* Removed MYRIAD, HDDL from scripts folder

* Removed MYRIAD from bindings folder (C and Python API)

* Removed MYRIAD tests

* Removed MYRIAD from tests folder

* Removed MYRIAD from tools folder

* Removed HDDL (VAD), MYRIAD (NSC2) from documentation

* Fixed build for AUTO unit tests

* Fixed clang code style

* Fixed comments and issues

* removed MYRIAD from AUTO tests

* Disabled MULTI tests in CI

* Update docs/OV_Runtime_UG/auto_device_selection.md

Co-authored-by: Yuan Xu <yuan1.xu@intel.com>

* Update docs/get_started/get_started_demos.md

Co-authored-by: Yuan Xu <yuan1.xu@intel.com>

* Update docs/OV_Runtime_UG/deployment/local-distribution.md

Co-authored-by: Yuan Xu <yuan1.xu@intel.com>

Co-authored-by: Yuan Xu <yuan1.xu@intel.com>
2023-01-18 15:19:44 +04:00
Ilya Churaev
0c9abf43a9 Updated copyright headers (#15124)
* Updated copyright headers

* Revert "Fixed linker warnings in docs snippets on Windows (#15119)"

This reverts commit 372699ec49.
2023-01-16 11:02:17 +04:00
Anastasia Kuporosova
822e069a3e One more tbb path in setupvars.bat (#14228) 2022-11-25 04:25:41 +04:00
Anastasia Kuporosova
0f647e6b75 Fix finding onetbb lib on windows (#14018) 2022-11-16 14:13:37 +04:00
Przemyslaw Wysocki
d2871fd52c [PyOV] Enable Python 3.10 on Azure CI (#12578)
* Fix mypy for numpy==1.21.6

* Apply CR changes

* Allow Python 3.6 for open source

* Attempt to silence mypy

* Revert to 3.6 in setup.pys

* Fix merge conflict

* Add newline

* Fix Python version assert

* Test Python 3.10 CI

* Try bumping up pybind to 2.10

* Link default python to python 3.10

* Add sudo to changing default python

* Bump python version in setupvars

* Fix exception in test

* Do the same for compatibility

* Apply same CI changes to other pipelines

* Attempt to fix arm and windows CIs

* Fix win py lib version and links?

* Try to fix CI

* Fix win python path

* Update win path

* Test disable PDPD

* Disable TF for testing CI

* Add sudo to rm

* Test linux

* Update requirements

* RM sudo

* Add debug step to CI on ARM

* build py from source on linux

* Remove debug step from ARM

* Fix err

* Fill num_proc

* Fic py installation

* Bump pdpd to 2.3.1

* Bump np vers

* Try to upgrade onnx to 1.12.0

* Revert onnx upgrade, enable frontends

* Build py shared

* Export library

* activate py env

* Bump scipy for py3.10

* Another scipy bump

* Fix Windows path, add nfs helper for mount

* Attempt to fix win_cc

* Batch of changes

* Try to fix ngraph-onnx-lin

* Install lsb-release for docker on ngraph-onnx-lin

* Link lsb_release

* Try bumping Ubuntu to 22.04

* Revert ubuntu change in dockerfile

* Refactor tests for onnx1.12

* Fix ONNX compatibility and numpy warnings

* Refactor tests for onnx1.12

* Fix ONNX compatibility and numpy warnings

* Upgrade ONNX to 1.12 in cpp

* Skip unsupported ops

* Revert "Fix ONNX compatibility and numpy warnings"

This reverts commit cd8a0e6b8e.

* Small changes

* Remove unnecessary changes

* Bump Python version in github workflows

* Fix flake error

* Another flake error

* Even more flake errors

* Xfail more tests

* Fix mypy errors

* Change onnx version in tests

* Bump ONNX in MO

* Fix onnx utils in comp

* Minor changes

* Import pathlib

* Add xfails to compatibility tests

* Skip segfaulting tests

* Fix onnx nametuple

* Fix flake

* Try to fix py3.6 onnx

* Switch to venv in windows

* Fix model importer and reqs

* Add __test__

* Debug print

* Fix flake

* Update linux.yml

* Update windows.yml

* Update linux.yml

* Update windows.yml

* Install python3.10

* Update windows.yml

* Update windows.yml

* Update windows.yml

* Update windows.yml

* Update windows.yml

* Update windows.yml

* Update windows.yml

* Update windows.yml

* Install py embedded

* Fix dir

* Fix curl

* Add complete file

* CP file

* Bump py ver

* Fix missing venv

* Try to install

* Disable venv

* Bump OMZ commit

* checkout omz

* Revert omz

* Bump omz

* Revert pybind bump

* Update .gitmodules

* Change pybind to fork

* change ssize_t to size_t

* Install bz2 for py build

* Bump omz

* Bump pandas requirement version

* Revert omz

* Install missing clang

* Bump omz

* Bump versions on fork

* Bump numpy in model zoo

* Fix clang

* Skip segfaulting pdpd test

* Skip another pdpd test

* Skip pdpd places.cpp

* Bump py ver in setupvars.bat

* Disable paddle tests

* Use int instead of str

* Fix requirements path

* Enable lin-cc

* Fixes in CI

* lin-cc and ngrpah-onnx changes

* Update num_proc

* Update ngraph-onnx

* Minor change

* Fix env var

* Change ubuntu to 20

* Get compiler on ngraph-onnx

* Add sudo to apt-get

* Add SSL

* Download ssl

* Different way of installing ssl

* Minor changes

* install zlib

* Fix env var

* Fix docker building error

* Revert changes

* Modify dockerfile

* Change pychecks python version

* Cleanup

* Add LayerNorm to expanded ONNX functions

* Revert previous commit

* Add LayerNorm to expanded ONNX functions

* Apply clang

* Move LayerNorm tests to skip_segfault

* Unskip pdpd tests

* Enable pdpd tests on linux

* Refactoring

* Remove 3.6 from reqs

* Refactoring

* Minor changes

* Minor changes

* Relax MO reqs

* Bump torch version

* relax pytest

* Specify pytest version

* Fix pytest pip conflict

* Bump pybind11 to v2.10.1 release tag

* Specify separate pytest version for py3.10

* Bump attrs

* Add py dependency

* Refactor versions

* Add venv activation to tf tests

* Fix fdupes

* Bump OMZ submodule

* Remove find and replace

* Change pybind to upstream fork

* Set pybind to proper commit

* Minor changes

* Try to fix scipy

* Updated exclude patterns for nlohmann json

* [PyOV] Fix wheel requirements for new package versions

* Specify CPU plugin versions

* Bump OMZ version

* Fix linter

* Fix linter 2

* Fix linter 3

* Disable linter

Co-authored-by: Mateusz <mateusz.mikolajczyk@intel.com>
Co-authored-by: jiwaszki <jan.iwaszkiewicz@intel.com>
Co-authored-by: Ilya Lavrenov <ilya.lavrenov@intel.com>
2022-11-08 11:38:39 +04:00
Przemyslaw Wysocki
520b9ff68c [PyOV] Disallow Python 3.6 usage (#13240)
* Remove py3.6 constraints

* Cleanup out of date python versions

* Bump pybind11 to v2.10.1 release tag

* [PyOV] Fix wheel requirements for new package versions

Co-authored-by: jiwaszki <jan.iwaszkiewicz@intel.com>
2022-11-06 10:45:42 +04:00
Anastasia Kuporosova
57e6dd1b7e [Scripts] Warning instead of error in setupvars scripts (#13554)
* Warning instead of error in setupvars script

* apply comments
2022-10-25 09:56:56 +02:00
Piotr Krzemiński
d715ecaa32 [CPP/SAMPLES] Samples location independant on script execution directory (#13251) 2022-10-20 10:01:55 +02:00
Ilya Lavrenov
2e336e4bb8 Fixes for brew support on OSX (#13476)
* Fixes for brew support on OSX

* Added new policy

* added quotes

* Used OpenVINODeveloperPackage

* Extra fixes

* Use standard verbose variable

* Fixed pkg-config generation
2022-10-15 00:15:03 +03:00
Ilya Lavrenov
fb1faf8b2d Generate openvino.pc pkg-config file (#12779)
* Generate openvino.pc pkg-config file

* Added libva-dev as a dependency

* Fixed typo in install_build_dependencies.sh

* samples on CI

* Revert changes in samples; use pkg-config in tests

* Debug print

* Revert changes in fuzz tests

* Fixed TBB usage

* Fixed pkg-config usage for cross-compilation

* Fixed pkg_config_tbb_lib_dir

* Don't use PKG_CONFIG_EXECUTABLE unconditionally

* Fixed copy-patse

* Fixe

* Generate pkg-config file for Apple as well

* Fixes for ubuntu 22.04

* Disable apple
2022-09-05 13:40:21 +04:00
Mateusz Tabaka
37a0bddd76 Fix some of shellcheck errors in setupvars.sh (#12623)
Fixed:
SC2070: -n doesn't work with unquoted arguments. Quote or use [[ ]].
SC2086: Double quote to prevent globbing and word splitting
in TBB related part of the script.
2022-08-19 00:05:50 +04:00
Mateusz Tabaka
de4ffb00c3 handle tbb library path like .../tbb/lib/intel64/gcc4.8 (#12611) 2022-08-18 08:25:56 +03:00
Ilya Lavrenov
2b69057603 Fixed CVS-89248 (#12534)
* Fixed CVS-89248

* Fixes for TBB 2018-2019.4
2022-08-13 00:11:13 +04:00
Sun Xiaoxia
1dd13e2cf6 Xiaoxia/onetbb old version (#12303)
* support oneTBB old version

* fix oneTBB version mismatch issues

* fix clang issue

* add 'tbb' path to setupvars.sh and OpenVINOConfig.cmake.in

* Update scripts/setupvars/setupvars.sh

Co-authored-by: Ilya Lavrenov <ilya.lavrenov@intel.com>
Co-authored-by: Shen, Wanglei <wanglei.shen@intel.com>
2022-07-27 16:49:53 +08:00
Ilya Lavrenov
14e8e3259d Fixed build_samples.sh not to call setupvars.sh for Debian package case (#12309) 2022-07-26 23:17:41 +04:00
Ilya Lavrenov
926a87e7eb Install user provided TBB as well (#12260) 2022-07-22 22:36:58 +04:00
stephenli2000
4125d71ce8 setupvars.sh: Removing extra semicolon, which breaks glibc build (#11849)
This extra semicolon creates an output as example below. The extra
'::' is equivalent to add '.' as part of the LD_LIBRARY_PATH. This
breaks glibc build, and very often creates weird issue when launch
commands from different path.

...inference_engine/external/tbb/lib::/opt/intel/openvino_2021/...

We also noticed that :${parameter:+:$parameter} is widely used in
this file. Please review the code and fix as needed.
2022-06-29 08:11:24 +02:00
Artur Kulikowski
1331eabbed Getting of python version depend on the used shell (#11614) 2022-05-05 23:42:54 +02:00
Nico Galoppo
3318dd6c68 Fix MacOS DYLD_LIBRARY_PATH export (#10750) 2022-03-03 00:36:02 +03:00
Ilya Lavrenov
6b067bc0ed Fixed install on Apple (#8302)
* Fixed Apple install

* Update path to libs in setupvars.sh

* Fix IE_CPACK_RUNTIME_PATH for Apple

* Fix wheels packaging

Co-authored-by: Alexey Suhov <alexey.suhov@intel.com>
2022-03-01 16:56:15 +03:00
Alexey Suhov
a79830cb55 Update year to 2022 in copyright notice (#9755) 2022-01-19 01:07:49 +03:00
Sergey Lyubimtsev
5ebbad9bcf Fixes for scripts (#9640)
* fixes for scripts

* reduce to warning python bitness check
2022-01-17 21:54:05 +03:00
Sergey Lyubimtsev
f1a25b398c Clean up setupvars scripts (#9410)
* Clean up setupvars scripts

* align opencv

* fix opencv location

* fix env windows

* fix env windows

* check upper bound for supported python version

* remove ROOT var

* revert PYTHONPATH

* fix error message

* fix pyver option

* revert OpenCV

* okay -> true
2021-12-29 17:57:56 +03:00
Mikhail Nosov
9cc4504b78 Removed OV_FRONTEND_PATH from 'setupvars' scripts (#9396)
* Removed OV_FRONTEND_PATH from 'setupvars' scripts

* Update linux.yml

* Change mock frontend's install dir for static builds

* revert linux.yml
2021-12-24 13:01:51 +03:00
Pavel Esir
980904c9ec [MO] Align MO namespaces (#7708)
* Moved and merged mo/ and extensions/ into openvino/tools/mo

* edited imports

* edited docs to use mo script from entry_point

* edited MO transformations list loading and setup.py

* changed full path -> 'mo' entry point in docs (leftovers)

* corrected package_BOM

* updated resolving --transformation_config in cli_parser.py

* pkgutil-style __init__.py, added summarize_graph into entry points

* updated DOCs for the new --transformations_config

* fix select

* updated install instructions, fixed setup.py for windows and python_version < 3.8

* fixed typo in requirements.txt

* resolved conflicts

* removed creating custom __init__.py from setup.py

* corrected folder with caffe proto

* corrected loading user defined extensions

* fix openvino.tools.mo import in serialize.py

* corrected layer tests for new namespace

* fix in get_testdata.py

* moved model-optimizer into tools/

* renamed import in POT

* corrected mo.yml

* correct CMakeLists.txt for the newest tools/mo

* corrected find_ie_version.py

* docs and openvino-dev setup.py update for the newest tools/mo

* miscellaneous leftovers and fixes

* corrected CI files, pybind11_add_module in CMakeLists.txt and use of tools/mo path instead of tools/model_optimizer

* add_subdirectory pybind11 for tools/mo

* POT path fix

* updated setupvars.sh setupvars.bat

* Revert "updated setupvars.sh setupvars.bat"

This reverts commit c011142340.

* removed model-optimizer env variables from setupvars

* updated CMakeLists.txt to pack MO properly with tests component

* corrected left imports, corrected loading requirements for layer tests

* mo doc typo correction

* minor corrections in docs; removed summarize_graph from entry_points

* get_started_windows.md, MonoDepth_how_to.md corrections, mo path corrections
2021-12-08 08:53:53 +03:00
Tatyana Raguzova
31ae69ac2d [setupvars] Removed unnecessary double brackets (#8796)
they cause a problem on raspbianOS
2021-11-26 13:42:13 +03:00
Dmitry Pigasin
e3d5d4520f [IE Sample Scripts] Change omz tool calls (#7717)
* Change omz tool calls in sample scripts (linux)

* Change omz tool calls in sample scripts (windows)

* Remove venv creation and /tools/model_optimizer/requirements.txt installation

* Remove `open_model_zoo/tools/downloader` from setupvars

* Remove `accuracy_checker` from setupvars

* Add error if omz tools are not installed

* Update scripts/demo/run_sample_benchmark_app.bat

Co-authored-by: Zlobin Vladimir <vladimir.zlobin@intel.com>

* Add check for all omz tools

Co-authored-by: Zlobin Vladimir <vladimir.zlobin@intel.com>
2021-10-19 11:49:42 +03:00
Ilya Lavrenov
66ea818a72 Fixed path to POT (#7560) 2021-09-21 11:10:00 +03:00
Maksim Shabunin
5e91bf93cb setupvars: updated OpenCV location (#7563) 2021-09-20 19:57:34 +03:00
Ilya Lavrenov
0df7dab345 New IRC package structure (#6255)
* OV new package structure

* Fixes

* More fixes

* Fixed code style in ngraph tests

* Fixes

* Paths to setupvars inside demo scripts

* Fixed demo_security_barrier_camera.sh

* Added setupvars.sh to old location as well

* Fixed path

* Fixed MO install path in .co

* Fixed install of public headers

* Fixed frontends installation

* Updated DM config files

* Keep opencv in the root

* Improvements

* Fixes for demo scripts

* Added path to TBB

* Fix for MO unit-tests

* Fixed tests on Windows

* Reverted arch

* Removed arch

* Reverted arch back: second attemp

* System type

* Fix for Windows

* Resolve merge conflicts

* Fixed path

* Path for Windows

* Added debug for Windows

* Added requirements_dev.txt to install

* Fixed wheel's setup.py

* Fixed lin build

* Fixes after merge

* Fix 2

* Fixes

* Frontends path

* Fixed deployment manager

* Fixed Windows

* Added cldnn unit tests installation

* Install samples

* Fix samples

* Fix path for samples

* Proper path

* Try to fix MO hardcodes

* samples binary location

* MO print

* Added install for libopencv_c_wrapper.so

* Added library destination

* Fixed install rule for samples

* Updated demo scripts readme.md

* Samples

* Keep source permissions for Python samples

* Fixed python

* Updated path to fast run scripts

* Fixed C samples tests

* Removed debug output

* Small fixes

* Try to unify prefix
2021-09-15 16:49:11 +03:00
Ilya Lavrenov
a952540edf Openvino cmake config (#7419)
* Added OpenVINOConfig.cmake

* OpenVINOConfig.cmake part 2

* Trying to fix cmake generation

* Fixes

* Export frontends as well

* Fixed condition

* Added OpenVINO cmake package usage: docs, C samples

* Use more OpenVINO config

* Install OpenVINOConfig.cmake

* Trying to fix private plugins

* Trying to fix .tox

* Trying to fix ARM

* Fixed samples build

* Explicit ngraph duplicated targets

* Fixed fuzzing tests build

* Added IR frontend installation

* Removed install directory for IE reader

* Removed IR frontend from export list

* Reverted ngraph_DIR

* Try to fix .tox

* Fixed ieFuncTests with ONNX extensions

* Attempt #2

* Trying to fix ngraph setup.py

* Fix

* Trying to fix ONNX ngraph .tox CI

* Trying to remove spaces

* Fixed ngraph_DIR -> OpenVINO_DIR

* Removed junk files

* Try to fix ngraph wheel

* Try to fix ie_wheel

* Try to fix ngraph wheel
2021-09-10 15:31:27 +03:00
Mikhail Nosov
aecb2b9693 Static library for ngraph::frontend_manager (#6719)
* Static library for ngraph::frontend_manager

* Static + Shared versions

* Fix CI

* USE_STATIC_FRONTEND_MANAGER macro

* Set USE_STATIC_FRONTEND_MANAGER compile definition as public

* Revert back incorrectly removed line

* Apply more review comments
2021-07-22 02:42:34 +03:00
Ilya Lavrenov
dd2ea02d3a Fixed ngraph unit tests in Debug (#6470)
* Added compile_tool to PATH

* Installed benchmark_app

* Fixed ngraph unit tests in Debug

* Install of VPU_FIRMWARE to <root>/tests folder

* Conditional installation of benchmark_app
2021-06-30 20:57:01 +03:00
Artyom Anokhov
7720bde7ac setupvars: Added OMZ downloader to PATH & PYTHONPATH (#6440) 2021-06-30 18:23:59 +03:00
Alexey Suhov
6a16b70e0e setupvars and demos: Fix getting script dir on macOS 10.15 with with default zsh shell (#5094) 2021-04-02 21:37:21 +03:00
Alexey Suhov
a2bf62f488 Align copyright notice in sh, bat, cl, cc, pyx source files (#4995) 2021-03-27 01:26:27 +03:00
Mikhail Ryzhov
c3fc40052c Python 3.8 support (#4629)
* Python 3.8 support

* Get path from setupvars
2021-03-23 17:32:08 +03:00
Artyom Anokhov
da9d42f63b setupvars.bat: Removed "setlocal enableDelayedExpansion", updated checking python_version (#4162) 2021-02-03 21:16:54 +03:00
Artyom Anokhov
344494a935 [Scripts] setupvars.bat: Added logic for passing '-pyver' option (#4026)
* setupvars.bat: Added logic for passing '-pyver' option as we already have in Linux* setupvars

* setupvars.bat: Fixed python_version name in echo
2021-01-27 12:51:55 +03:00
Sergey Lyubimtsev
b99bacd245 setupvars should export TBB_DIR (44241) (#3434)
* [MO] Add CMake install for Model Optimizer

* [MO] Update test for version.py

* [MO] Add CMake install for Model Optimizer

* [MO] Update test for version.py

* [MO] Add CMake install for Model Optimizer

* [MO] Update test for version.py

* export TBB_DIR  in setupvars
2020-12-02 14:18:59 +03:00
Sergey Lyubimtsev
e12b24a0bc CMake installation rules for 3rd party components (#2944)
* [MO] Add CMake install for Model Optimizer

* [MO] Update test for version.py

* [MO] Add CMake install for Model Optimizer

* [MO] Update test for version.py

* [MO] Add CMake install for Model Optimizer

* [MO] Update test for version.py

* Add CMake install rules for OpenVINO 3rd party dependencies

Remove unwanted targets from final distribution (test, static libs, etc)

* remove duplicated targets from install

align GNA Windows install path with Linux

* Add COMPONENT install name for OMP

remove empty lines

* Add OMP to CPack components

* remove gtest from deliverables

add explicitly clDNN_unit_tests target to build

* set clDNN_unit_tests properties only by condition

* remove install commands for clDNN

Co-authored-by: Alexander Zhogov <alexander.zhogov@intel.com>
2020-11-30 12:29:30 +03:00
Artyom Anokhov
24ed4133dd setupvars.bat: Fixed names for major and minor python version vars (#2986) 2020-11-05 14:48:09 +03:00
Artyom Anokhov
5fa569cbd5 setupvars.bat: Renamed all Python version related variables. (#2854) 2020-10-28 21:02:25 +03:00
Artyom Anokhov
a5ab41ef87 setupvars.sh: Updated setting pyenv error to warning. (#2663) 2020-10-14 18:33:17 +03:00
Ilya Lavrenov
da625b995e Shellcheck update (#2557)
* Fixed SC2236 rules

* Fixed SC2086 rule

* Small fixes in other scripts
2020-10-09 13:25:53 +03:00
Ilya Lavrenov
de1cc8af2e Shellcheck tests for bash scripts (#2532)
* Added bash scripts checks with shellcheck

* Fixed indentations

* Fixed setupvars.sh with shellcheck

* Fixed MO scripts

* Compilation with newer versions of shellcheck
2020-10-05 23:37:50 +03:00
Artemy Skrebkov
31ad2ddc46 Update setupvars to add path to XLink (#2371)
- Do not export KMB_INSTALL_DIR. It is exported by another script
2020-09-24 15:03:16 +03:00
Artyom Anokhov
fecce756a4 setupvars: Updated notifications, fixed calling python in Windows case (#2319) 2020-09-17 21:20:12 +03:00
Artyom Anokhov
ab4fdfc671 install_openvino_dependencies: Updated copyrights (#2306)
setupvars.bat: Updated notification about incorrect Python version. Removed checking ICC2019
setupvars.sh: Removed logic with choosing higher version of installed Python. Added dynamic detecting python3 major and minor version for setting path. Add checking minimum required Python version(now 3.6)
2020-09-17 16:42:04 +03:00