OpenVINO 2022.1 (#37)

Author: dkurt

.github/workflows/main.yml

@@ -11,43 +11,58 @@ on:
     branches: [ master ]
 
 env:
-  OPENVINO_VERSION: 2021.4.2
-  VERSION: 2021.4.2.5
-  DIST_VERSION: 2021.4.752
-  DIST_WIN: https://registrationcenter-download.intel.com/akdlm/irc_nas/18320/w_openvino_toolkit_p_2021.4.752.exe
-  DIST_MAC: https://registrationcenter-download.intel.com/akdlm/irc_nas/18317/m_openvino_toolkit_p_2021.4.752.dmg
+  OPENVINO_VERSION: 2022.1.0
+  OPENCV_VERSION: 4.5.5
+  VERSION: 2022.1.0.dev3
+  DIST_WIN: https://registrationcenter-download.intel.com/akdlm/irc_nas/18618/w_openvino_toolkit_p_2022.1.0.643_offline.exe
+  DIST_MAC: https://registrationcenter-download.intel.com/akdlm/irc_nas/18616/m_openvino_toolkit_p_2022.1.0.643_offline.dmg
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   build_lnx:
     runs-on: ubuntu-18.04
     container:
-      centos:centos7.6.1810
+      centos:centos8.4.2105
 
     steps:
     - uses: actions/checkout@v2
 
     - name: Install dependencies
       run: |
-        yum install -y python3 wget
-        yum group install -y "Development Tools"
+        dnf -y --disablerepo '*' --enablerepo=extras swap centos-linux-repos centos-stream-repos
+        dnf -y distro-sync
+        yum group install -y "Development Tools" --nobest
+        yum install -y python3 wget cmake
         python3 -m pip install --upgrade pip
-        wget -q https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-linux-x86_64.tar.gz
-        tar -xf cmake-3.20.2-linux-x86_64.tar.gz
 
     - name: Install OpenVINO
       run: |
-        yum install -y yum-utils
-        yum-config-manager --add-repo https://yum.repos.intel.com/openvino/2021/setup/intel-openvino-2021.repo
-        rpm --import https://yum.repos.intel.com/openvino/2021/setup/RPM-GPG-KEY-INTEL-OPENVINO-2021
-        yum install -y intel-openvino-runtime-centos7-${{env.DIST_VERSION}}.x86_64
+        tee > /tmp/openvino-2022.repo << EOF
+        [OpenVINO]
+        name=Intel(R) Distribution of OpenVINO 2022
+        baseurl=https://yum.repos.intel.com/openvino/2022
+        enabled=1
+        gpgcheck=1
+        repo_gpgcheck=1
+        gpgkey=https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
+        EOF
+        mv /tmp/openvino-2022.repo /etc/yum.repos.d
+        yum repolist | grep -i openvino
+        yum install -y yum-utils openvino-2022.1.0
+
+    - name: Build OpenCV
+      run: |
+        git clone https://github.com/opencv/opencv/ -b ${{env.OPENCV_VERSION}} --depth 1
+        mkdir opencv_build && cd opencv_build
+        cmake ../opencv -DCMAKE_BUILD_TYPE=Release -DBUILD_LIST=core
+        make -j$(nproc --all) install
 
     - name: Build CPU extensions
       run: |
-        source /opt/intel/openvino_2021/bin/setupvars.sh
+        source /opt/intel/openvino_2022/setupvars.sh
         cd user_ie_extensions
         mkdir build && cd build
-        ../../cmake-3.20.2-linux-x86_64/bin/cmake .. -DCMAKE_BUILD_TYPE=Release
+        cmake .. -DCMAKE_BUILD_TYPE=Release
         make -j$(nproc --all)
 
     - name: Build wheel
@@ -69,16 +84,25 @@ jobs:
 
     - name: Install OpenVINO
       run: |
-        curl ${{env.DIST_WIN}} -o openvino.exe
-        start /WAIT openvino.exe --s --a install --eula=accept --output=log.txt
+        Invoke-WebRequest ${{env.DIST_WIN}} -OutFile openvino.exe
+        Start-Process -Wait -FilePath "openvino.exe" -ArgumentList "-s -a --silent --eula accept"
+      shell: pwsh
+
+    - name: Build OpenCV
+      run: |
+        git clone https://github.com/opencv/opencv/ -b ${{env.OPENCV_VERSION}} --depth 1
+        mkdir opencv_build && cd opencv_build
+        cmake ..\\opencv -DCMAKE_BUILD_TYPE=Release -DBUILD_LIST=core
+        cmake --build . --config Release -j 2
+        cmake --install . --prefix "C:\opencv_install"
       shell: cmd
 
     - name: Build CPU extensions
       run: |
-        call "C:\Program Files (x86)\Intel\openvino_2021\bin\setupvars.bat"
+        call "C:\Program Files (x86)\Intel\openvino_2022\setupvars.bat"
         cd user_ie_extensions
         mkdir build && cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Release
+        cmake .. -DOpenCV_DIR="C:\opencv_install"
         cmake --build . --config Release -j 2
       shell: cmd
 
@@ -107,12 +131,19 @@ jobs:
       run: |
         curl ${{env.DIST_MAC}} -o openvino.dmg
         hdiutil attach openvino.dmg
-        cd /Volumes/m_openvino_toolkit_p_${{env.DIST_VERSION}}/m_openvino_toolkit_p_${{env.DIST_VERSION}}.app/Contents/MacOS/
-        sudo ./install.sh -s silent.cfg --accept_eula
+        cd /Volumes/m_openvino_toolkit_p_2022.1.0.643_offline/bootstrapper.app/Contents/MacOS/
+        sudo ./install.sh -s --eula=accept
+
+    - name: Build OpenCV
+      run: |
+        git clone https://github.com/opencv/opencv/ -b ${{env.OPENCV_VERSION}} --depth 1
+        mkdir opencv_build && cd opencv_build
+        cmake ../opencv -DCMAKE_BUILD_TYPE=Release -DBUILD_LIST=core
+        make -j$(nproc --all) install
 
     - name: Build CPU extensions
       run: |
-        source /opt/intel/openvino_2021/bin/setupvars.sh
+        source /opt/intel/openvino_2022/setupvars.sh
         cd user_ie_extensions
         mkdir build && cd build
         cmake .. -DCMAKE_BUILD_TYPE=Release

README.md

@@ -14,17 +14,14 @@ Repository with guides to enable some layers from PyTorch in Intel OpenVINO:
 To create OpenVINO IR, use extra `--extension` flag to specify a path to Model Optimizer extensions that perform graph transformations and register custom layers.
 
 ```bash
-python3 /opt/intel/openvino/deployment_tools/model_optimizer/mo_onnx.py \
-    --input_model model.onnx \
-    --extension openvino_pytorch_layers/mo_extensions
+mo --input_model model.onnx --extension openvino_pytorch_layers/mo_extensions
 ```
 
 ## Custom CPU extensions
 
 You also need to build CPU extensions library which actually has C++ layers implementations:
 ```bash
-source /opt/intel/openvino/bin/setupvars.sh
-export TBB_DIR=/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/cmake/
+source /opt/intel/openvino_2022/setupvars.sh
 
 cd user_ie_extensions
 mkdir build && cd build
@@ -34,11 +31,11 @@ cmake .. -DCMAKE_BUILD_TYPE=Release && make -j$(nproc --all)
 Add compiled extensions library to your project:
 
 ```python
-from openvino.inference_engine import IECore
+from openvino.runtime import Core
 
-ie = IECore()
-ie.add_extension('user_ie_extensions/build/libuser_cpu_extension.so', 'CPU')
+core = Core()
+core.add_extension('user_ie_extensions/build/libuser_cpu_extension.so')
 
-net = ie.read_network('model.xml', 'model.bin')
-exec_net = ie.load_network(net, 'CPU')
+model = ie.read_model('model.xml')
+compiled_model = ie.compile_model(model, 'CPU')
 ```

examples/calculate_grid/calculate_grid.py

@@ -5,7 +5,7 @@
 class CalculateGrid(torch.autograd.Function):
     @staticmethod
     def symbolic(g, in_positions):
-        return g.op("org.open3d::calculate_grid", in_positions)
+        return g.op("CalculateGrid", in_positions)
 
     @staticmethod
     def forward(self, in_positions):

examples/fft/fft.py

@@ -48,8 +48,7 @@ def symbolic(g, x, inverse, centered, dims):
         dims = torch.tensor(dims)
         dims = g.op("Constant", value_t=dims)
 
-        return g.op('IFFT' if inverse else 'FFT', x, dims,
-                    inverse_i=inverse, centered_i=centered)
+        return g.op('FFT', x, dims, inverse_i=inverse, centered_i=centered)
 
     @staticmethod
     def forward(self, x, inverse, centered, dims):

examples/sparse_conv/sparse_conv.py

@@ -10,7 +10,7 @@ def symbolic(g, cls, feat, in_pos, out_pos, voxel_size):
         offset = cls.state_dict()["offset"]
         kernel = g.op("Constant", value_t=kernel)
         offset = g.op("Constant", value_t=offset)
-        return g.op("org.open3d::SparseConv", feat, in_pos, out_pos, kernel, offset)
+        return g.op("SparseConv", feat, in_pos, out_pos, kernel, offset)
 
     @staticmethod
     def forward(self, cls, feat, in_pos, out_pos, voxel_size):
@@ -36,7 +36,7 @@ def symbolic(g, cls, feat, in_pos, out_pos, voxel_size):
         offset = cls.state_dict()["offset"]
         kernel = g.op("Constant", value_t=kernel)
         offset = g.op("Constant", value_t=offset)
-        return g.op("org.open3d::SparseConvTranspose", feat, in_pos, out_pos, kernel, offset)
+        return g.op("SparseConvTranspose", feat, in_pos, out_pos, kernel, offset)
 
     @staticmethod
     def forward(self, cls, feat, in_pos, out_pos, voxel_size):

mo_extensions/front/onnx/complex_mul_ext.py

@@ -1,10 +1,10 @@
 # mo_extensions/front/onnx/max_unpool.py
 import numpy as np
 
-from mo.front.common.replacement import FrontReplacementSubgraph
-from mo.graph.graph import Graph
+from openvino.tools.mo.front.common.replacement import FrontReplacementSubgraph
+from openvino.tools.mo.graph.graph import Graph
 from mo_extensions.ops.MaxPoolGrad import MaxPoolGrad
-from mo.front.onnx.extractors.utils import onnx_attr
+from openvino.tools.mo.front.onnx.extractors.utils import onnx_attr
 
 class MaxUnpool(FrontReplacementSubgraph):
     enabled = True

mo_extensions/front/onnx/fft_ext.py

@@ -1,7 +1,7 @@
 # mo_extensions/ops/MaxPoolGrad.py
 import numpy as np
-from mo.graph.graph import Node, Graph
-from mo.ops.op import Op
+from openvino.tools.mo.graph.graph import Node, Graph
+from openvino.tools.mo.ops.op import Op
 
 def shape_infer(node):
     # Inputs: [max_pool_input, max_pool_output, unpool_input, shape]