Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/azaytsev/cherry pick pr2448 2469 2457 to master #2515

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 15 additions & 18 deletions build-instruction.md
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ cmake --build . --config Release
inference on Intel CPUs only.

The software was validated on:
- macOS\* 10.14, 64-bit
- macOS\* 10.15, 64-bit

### Software Requirements

Expand All @@ -466,19 +466,11 @@ The software was validated on:
cd openvino
git submodule update --init --recursive
```
2. Install build dependencies using the `install_dependencies.sh` script in the
project root folder:
```sh
chmod +x install_dependencies.sh
```
```sh
./install_dependencies.sh
```
3. Create a build folder:
2. Create a build folder:
```sh
mkdir build
mkdir build && cd build
```
4. Inference Engine uses a CMake-based build system. In the created `build`
3. Inference Engine uses a CMake-based build system. In the created `build`
directory, run `cmake` to fetch project dependencies and create Unix makefiles,
then run `make` to build the project:
```sh
Expand Down Expand Up @@ -514,12 +506,17 @@ You can use the following additional build options:

- To build the Python API wrapper, use the `-DENABLE_PYTHON=ON` option. To
specify an exact Python version, use the following options:
```sh
-DPYTHON_EXECUTABLE=/Library/Frameworks/Python.framework/Versions/3.7/bin/python3.7 \
-DPYTHON_LIBRARY=/Library/Frameworks/Python.framework/Versions/3.7/lib/libpython3.7m.dylib \
-DPYTHON_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.7/include/python3.7m
```

- If you installed Python through Homebrew*, set the following flags:
```sh
-DPYTHON_EXECUTABLE=/usr/local/Cellar/python/3.7.7/Frameworks/Python.framework/Versions/3.7/bin/python3.7m \
-DPYTHON_LIBRARY=/usr/local/Cellar/python/3.7.7/Frameworks/Python.framework/Versions/3.7/lib/libpython3.7m.dylib \
-DPYTHON_INCLUDE_DIR=/usr/local/Cellar/python/3.7.7/Frameworks/Python.framework/Versions/3.7/include/python3.7m
```
- If you installed Python another way, you can use the following commands to find where the `dylib` and `include_dir` are located, respectively:
```sh
find /usr/ -name 'libpython*m.dylib'
find /usr/ -type d -name python3.7m
```
- nGraph-specific compilation options:
`-DNGRAPH_ONNX_IMPORT_ENABLE=ON` enables the building of the nGraph ONNX importer.
`-DNGRAPH_DEBUG_ENABLE=ON` enables additional debug prints.
Expand Down
28 changes: 14 additions & 14 deletions docs/install_guides/installing-openvino-apt.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This guide provides installation steps for Intel® Distribution of OpenVINO™ t
## Set up the Repository
### Install the GPG key for the repository

1. Download the public key from [https://apt.repos.intel.com/openvino/2020/GPG-PUB-KEY-INTEL-OPENVINO-2020](https://apt.repos.intel.com/openvino/2020/GPG-PUB-KEY-INTEL-OPENVINO-2020) and save it to a file.
1. Download the public key from [https://apt.repos.intel.com/openvino/2021/GPG-PUB-KEY-INTEL-OPENVINO-2021](https://apt.repos.intel.com/openvino/2021/GPG-PUB-KEY-INTEL-OPENVINO-2021) and save it to a file.
2. Add this key to the system keyring:
```sh
sudo apt-key add <PATH_TO_DOWNLOADED_GPG_KEY>
Expand All @@ -23,7 +23,7 @@ sudo apt-key list

Run the following command:
```sh
echo "deb https://apt.repos.intel.com/openvino/2020 all main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2020.list
echo "deb https://apt.repos.intel.com/openvino/2021 all main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2021.list
```

### Update the list of packages
Expand All @@ -36,11 +36,11 @@ There are full release Runtime and Developer packages, and also some available c

**Runtime Packages**
- Ubuntu 18.04: `intel-openvino-runtime-ubuntu18`
- Ubuntu 16.04: `intel-openvino-runtime-ubuntu16`
- Ubuntu 20.04: `intel-openvino-runtime-ubuntu20`

**Developer Packages**
- Ubuntu 18.04: `intel-openvino-dev-ubuntu18`
- Ubuntu 16.04: `intel-openvino-dev-ubuntu16`
- Ubuntu 20.04: `intel-openvino-dev-ubuntu20`

### Get the list of available packages

Expand All @@ -57,19 +57,19 @@ apt-cache search openvino
```sh
sudo apt-cache search intel-openvino-runtime-ubuntu18
```
On Ubuntu 16.04:
On Ubuntu 20.04:
```sh
sudo apt-cache search intel-openvino-runtime-ubuntu16
sudo apt-cache search intel-openvino-runtime-ubuntu20
```
* **Developer Packages**

On Ubuntu 18.04:
```sh
sudo apt-cache search intel-openvino-dev-ubuntu18
```
On Ubuntu 16.04:
On Ubuntu 20.04:
```sh
sudo apt-cache search intel-openvino-dev-ubuntu16
sudo apt-cache search intel-openvino-dev-ubuntu20
```


Expand Down Expand Up @@ -97,20 +97,20 @@ sudo apt install intel-openvino-<PACKAGE_TYPE>-ubuntu<OS_VERSION>-<VERSION>.<UPD

On Ubuntu 18.04:
```sh
sudo apt install intel-openvino-runtime-ubuntu18-2020.1.023
sudo apt install intel-openvino-runtime-ubuntu18-2021.1.105
```
On Ubuntu 16.04:
On Ubuntu 20.04:
```sh
sudo apt install intel-openvino-runtime-ubuntu16-2020.1.023
sudo apt install intel-openvino-runtime-ubuntu20-2021.1.105
```
* **Developer Package**<br>
On Ubuntu 18.04:
```sh
sudo apt install intel-openvino-dev-ubuntu18-2020.1.023
sudo apt install intel-openvino-dev-ubuntu18-2021.1.105
```
On Ubuntu 16.04:
On Ubuntu 20.04:
```sh
sudo apt install intel-openvino-dev-ubuntu16-2020.1.023
sudo apt install intel-openvino-dev-ubuntu20-2021.1.105
```

---
Expand Down
5 changes: 2 additions & 3 deletions docs/install_guides/installing-openvino-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -341,12 +341,11 @@ You are done updating your device driver and are ready to use your GPU.

To perform inference on Intel® Vision Accelerator Design with Intel® Movidius™ VPUs, the following additional installation steps are required:

1. If your Intel® Vision Accelerator Design with Intel® Movidius™ VPUs card requires SMBUS connection to PCIe slot (Raw video data card with HW version Fab-B and before), install the SMBUS driver:
1. Download and install <a href="https://www.microsoft.com/en-us/download/details.aspx?id=48145">Visual C++ Redistributable for Visual Studio 2017</a>
2. Check with a support engineer if your Intel® Vision Accelerator Design with Intel® Movidius™ VPUs card requires SMBUS connection to PCIe slot (most unlikely). Install the SMBUS driver only if confirmed (by default, it's not required):
1. Go to the `<INSTALL_DIR>\deployment_tools\inference-engine\external\hddl\SMBusDriver` directory, where `<INSTALL_DIR>` is the directory in which the Intel Distribution of OpenVINO toolkit is installed.
2. Right click on the `hddlsmbus.inf` file and choose **Install** from the pop up menu.

2. Download and install <a href="https://www.microsoft.com/en-us/download/details.aspx?id=48145">Visual C++ Redistributable for Visual Studio 2017</a>

You are done installing your device driver and are ready to use your Intel® Vision Accelerator Design with Intel® Movidius™ VPUs.

See also:
Expand Down
20 changes: 10 additions & 10 deletions docs/install_guides/installing-openvino-yum.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ Configure YUM with the OpenVINO repository to install OpenVINO. You have two opt
```
2. Add repository using the `yum-config-manager`:
```sh
sudo yum-config-manager --add-repo https://yum.repos.intel.com/openvino/2020/setup/intel-openvino-2020.repo
sudo yum-config-manager --add-repo https://yum.repos.intel.com/openvino/2021/setup/intel-openvino-2021.repo
```
3. Import the gpg public key for the repository:
```sh
sudo rpm --import https://yum.repos.intel.com/openvino/2020/setup/RPM-GPG-KEY-INTEL-OPENVINO-2020
sudo rpm --import https://yum.repos.intel.com/openvino/2021/setup/RPM-GPG-KEY-INTEL-OPENVINO-2021
```

* **OPTION 2:** Create the repository file manually:
Expand All @@ -33,21 +33,21 @@ Configure YUM with the OpenVINO repository to install OpenVINO. You have two opt
```
2. Edit the repo file:
```sh
vi intel-openvino-2020.repo
vi intel-openvino-2021.repo
```
3. Append the following code:
```sh
[intel-openvino-2020]
name=Intel(R) Distribution of OpenVINO 2020
baseurl=https://yum.repos.intel.com/openvino/2020
[intel-openvino-2021]
name=Intel(R) Distribution of OpenVINO 2021
baseurl=https://yum.repos.intel.com/openvino/2021
enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-INTEL-OPENVINO-2020
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-INTEL-OPENVINO-2021
```
4. Save and close the `intel-openvino-2020.repo` file.
4. Save and close the `intel-openvino-2021.repo` file.
5. Import the gpg public key for the repository:
```sh
sudo rpm --import https://yum.repos.intel.com/openvino/2020/setup/RPM-GPG-KEY-INTEL-OPENVINO-2020
sudo rpm --import https://yum.repos.intel.com/openvino/2021/setup/RPM-GPG-KEY-INTEL-OPENVINO-2021
```

### Verify that the new repo is properly setup
Expand All @@ -58,7 +58,7 @@ yum repolist | grep -i openvino

Results:
```sh
intel-openvino-2020 Intel(R) Distribution of OpenVINO 2020
intel-openvino-2021 Intel(R) Distribution of OpenVINO 2021
```

### To list the available OpenVINO packages
Expand Down