4.3.0 upd

Author: banderlog

README.md

@@ -43,7 +43,7 @@ The official way is to use OpenVINO, but it is big and clumsy (just try to use i
 ### Main differences from OpenVINO
 
 + No model-optimizer
-+ OpenBLAS instead of MKL ([details](https://github.com/banderlog/opencv-python-inference-engine/issues))
++ OpenBLAS instead of MKL ([details](https://github.com/banderlog/opencv-python-inference-engine/issues/5#issuecomment-599563729))
 + No [ITT](https://software.intel.com/en-us/articles/intel-itt-api-open-source)
 + No [IPP](https://software.intel.com/en-us/ipp)
 + No [Intel Media SDK](https://software.intel.com/en-us/media-sdk)
@@ -74,8 +74,13 @@ I am using Ubuntu 18.04 [multipass](https://multipass.run/) instance: `multipass
 
 ### Requirements
 
+From [opencv](https://docs.opencv.org/master/d7/d9f/tutorial_linux_install.html), [dldt](https://docs.opencv.org/master/d7/d9f/tutorial_linux_install.html),
+ [ffmpeg](https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu), [openBLAS](https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu) and [ngraph](https://www.ngraph.ai/documentation/buildlb)
+
 + `build-essential`
-+ `cmake`
++ `>=cmake-3.11`
++ `autoconf` (for ngraph)
++ `libtool-bin` (for ngraph)
 + `git`
 + `pkg-config`
 + `python3-dev`
@@ -84,9 +89,17 @@ I am using Ubuntu 18.04 [multipass](https://multipass.run/) instance: `multipass
 + `libusb-1.0-0-dev` (for MYRIAD plugin)
 + `nasm` (for ffmpeg)
 
-```
+```bash
+# We need newer `cmake` for dldt (commands from  <https://apt.kitware.com/>)
+wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add -
+sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
+
 sudo apt-get update
-sudo apt install build-essential cmake git pkg-config python3-dev nasm python3 virtualenv libusb-1.0-0-dev chrpath
+sudo apt install build-essential cmake git pkg-config python3-dev nasm python3 virtualenv libusb-1.0-0-dev chrpath autoconf libtool-bin
+
+# for ngraph
+# the `dldt/_deps/ext_onnx-src/onnx/gen_proto.py` has `#!/usr/bin/env python` string and will throw an error otherwise
+sudo ln -s  /usr/bin/python3 /usr/bin/python
 ```
 
 ### Preparing

build/dldt/dldt_setup.sh

@@ -14,6 +14,8 @@ if [ ! -f $BLAS_LIB ] || [ ! -d $BLAS_INC ]; then
     exit
 fi
 
+# Manually-specified variables were not used by the project:
+# -D ENABLE_NGRAPH=ON \
 cmake -D CMAKE_BUILD_TYPE=Release \
       -D GEMM=OPENBLAS \
       -D THREADING=TBB \
@@ -34,8 +36,9 @@ cmake -D CMAKE_BUILD_TYPE=Release \
       -D ENABLE_SSE42=ON \
       -D ENABLE_AVX2=ON \
       -D ENABLE_AVX512F=OFF \
-      -D ENABLE_NGRAPH=ON \
       -D NGRAPH_UNIT_TEST_ENABLE=OFF \
+      -D NGRAPH_ONNX_IMPORT_ENABLE=ON \
+      -D NGRAPH_JSON_ENABLE=ON \
       -D BLAS_LIBRARIES="$BLAS_LIB" \
       -D BLAS_INCLUDE_DIRS="$BLAS_INC" \
       -D ENABLE_CLDNN=OFF ../../dldt/

build/opencv/opencv_setup.sh

@@ -73,7 +73,7 @@ cmake -D CMAKE_BUILD_TYPE=RELEASE \
       -D WITH_NGRAPH=ON \
       -D ngraph_DIR=$ABS_PORTION/build/dldt/ngraph \
       -D WITH_INF_ENGINE=ON \
-      -D INF_ENGINE_RELEASE=2020010000 \
+      -D INF_ENGINE_RELEASE=2020020000 \
       -D INF_ENGINE_INCLUDE_DIRS=$ABS_PORTION/dldt/inference-engine/include \
       -D INF_ENGINE_LIB_DIRS=$ABS_PORTION/dldt/bin/intel64/Release/lib \
       -D CPU_BASELINE=SSE4_2 \

create_wheel/setup.py

@@ -15,11 +15,11 @@ def __len__(self):
 
 setuptools.setup(
     name="opencv-python-inference-engine",
-    version="4.2.0.4",
+    version="4.3.0.1",
     url="https://github.com/banderlog/opencv-python-inference-engine",
     maintainer="Kabakov Borys",
     license='MIT, BSD, Intel Simplified Software License',
-    description="Wrapper package for OpenCV 4.2.0 with Inference Engine 2020.1 python bindings",
+    description="Wrapper package for OpenCV 4.3.0 with Inference Engine 2020.2 python bindings",
     long_description=long_description,
     long_description_content_type="text/markdown",
     ext_modules=EmptyListWithLength(),

download_all_stuff.sh

@@ -14,9 +14,10 @@ red () {
 }
 
 green "DOWNLOAD ALL ARCHIVES"
-wget -c https://github.com/opencv/opencv/archive/4.2.0.tar.gz
-wget -c https://github.com/FFmpeg/FFmpeg/archive/n4.2.2.tar.gz
-wget -c https://github.com/opencv/dldt/archive/2020.1.tar.gz
+wget -c https://github.com/opencv/opencv/archive/4.3.0.tar.gz -O opencv.tar.gz
+wget -c https://github.com/FFmpeg/FFmpeg/archive/n4.2.2.tar.gz -O ffmpeg.tar.gz
+wget -c https://github.com/openvinotoolkit/openvino/archive/2020.2.tar.gz -O dldt.tar.gz
+
 
 green "CLEAN LIB DIRS"
 rm -drf ./dldt/*
@@ -37,9 +38,9 @@ rm -drf create_wheel/dist
 rm -drf create_wheel/*egg-info
 
 green "UNZIP ALL STUFF"
-tar -xf 2020.1.tar.gz --strip-components=1 -C ./dldt/
-tar -xf n4.2.2.tar.gz --strip-components=1 -C ./ffmpeg/
-tar -xf 4.2.0.tar.gz --strip-components=1 -C ./opencv/
+tar -xf dldt.tar.gz --strip-components=1 -C ./dldt/
+tar -xf ffmpeg.tar.gz --strip-components=1 -C ./ffmpeg/
+tar -xf opencv.tar.gz --strip-components=1 -C ./opencv/
 
 green "GIT RESET FOR ade"
 cd ./dldt/inference-engine/thirdparty/ade
@@ -49,12 +50,12 @@ git reset --hard cbe2db6
 green "GIT RESET FOR ngraph"
 cd ../../../ngraph
 git clone https://github.com/NervanaSystems/ngraph ./
-git reset --hard b0bb801
+git reset --hard edc65ca
 
 green "GET RESET FOR OpenBLAS"
 cd ../../openblas/
 git clone --single-branch -b develop https://github.com/xianyi/OpenBLAS ./
-git reset --hard 9f67d0
+git reset --hard 9f67d03  # 2020-Mar-23
 
 green "CREATE VENV"
 cd ../

tests/prepare_and_run_tests.sh

@@ -67,6 +67,10 @@ for i in "${models[@]}"; do
     fi
 done
 
+# for speed test
+wget --no-check-certificate 'https://docs.google.com/uc?export=download&id=1vbonFjVyleGRSd_wR-Khc1htsZybiHCG' -O se_net.bin
+wget --no-check-certificate 'https://docs.google.com/uc?export=download&id=1Bz3EQwnes_iZ14iKAV6H__JZ2lynLmQz' -O se_net.xml
 
 green "RUN TESTS with ./venv_t/bin/python ./tests.py"
 ./venv_t/bin/python ./tests.py
+./venv_t/bin/ipython ./speed_test.py

tests/speed_test.py

@@ -0,0 +1,16 @@
+import cv2
+import numpy as np
+from IPython import get_ipython
+
+# prepare al stuff and do first inference
+xml_model_path = "se_net.xml"
+net = cv2.dnn.readNet(xml_model_path, xml_model_path[:-3] + 'bin')
+blob = (np.random.standard_normal((1, 3, 224, 224)) * 255).astype(np.uint8)
+net.setInput(blob)
+net.setPreferableTarget(cv2.dnn.DNN_TARGET_CPU)
+net.setPreferableBackend(cv2.dnn.DNN_BACKEND_INFERENCE_ENGINE)
+_ = net.forward()
+
+# measure the inference speed
+get_ipython().magic("timeit _ = net.forward()")
+