Dev (#10)

* upd new version

* OpenBLAS faster than JIT

* wheel already manylinux and should not be used for win

* upd

* upd

* 4.4.0 ready

Author: banderlog

README.md

@@ -113,22 +113,22 @@ sudo ln -s  /usr/bin/python3 /usr/bin/python
 ```bash
 cd build/openblas
 ./openblas_setup.sh &&
-make -j8 &&
+make -j6 &&
 make install
 
 cd ../ffmpeg
 ./ffmpeg_setup.sh &&
 ./ffmpeg_premake.sh &&
-make -j8 &&
+make -j6 &&
 make install
 
 cd ../dldt
 ./dldt_setup.sh &&
-make -j8
+make -j6
 
 cd ../opencv
 ./opencv_setup.sh &&
-make -j8
+make -j6
 ```
 
 ### Wheel creation

TODO.md

@@ -1 +1,5 @@
 # TODO list
+
++ Auto value for `-D INF_ENGINE_RELEASE`
++ Try to submodule things instead of downloading archives of them
++ check tar.gz integrity otherwise

build/dldt/dldt_setup.sh

@@ -42,4 +42,8 @@ cmake -D CMAKE_BUILD_TYPE=Release \
       -D NGRAPH_JSON_ENABLE=ON \
       -D BLAS_LIBRARIES="$BLAS_LIB" \
       -D BLAS_INCLUDE_DIRS="$BLAS_INC" \
-      -D ENABLE_CLDNN=OFF ../../dldt/
+      -D ENABLE_CLDNN=OFF \
+      -D ENABLE_CLDNN_TESTS=OFF \
+      -D ENABLE_PROFILING_ITT=OFF \
+      -D ENABLE_SAMPLES=OFF \
+      -D ENABLE_SPEECH_DEMO=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=2020020000 \
+      -D INF_ENGINE_RELEASE=2020040000 \
       -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.3.0.2",
+    version="4.4.0.0",
     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.3.0 with Inference Engine 2020.2 python bindings",
+    description="Wrapper package for OpenCV 4.4.0 with Inference Engine 2020.4 python bindings",
     long_description=long_description,
     long_description_content_type="text/markdown",
     ext_modules=EmptyListWithLength(),

download_all_stuff.sh

@@ -9,14 +9,18 @@ green () {
   echo -e "${green}${1}${end}"
 }
 
+
 red () {
   echo -e "${red}${1}${end}"
 }
 
+
+ROOT_DIR=$(pwd)
+
 green "DOWNLOAD ALL ARCHIVES"
-wget -c https://github.com/opencv/opencv/archive/4.3.0.tar.gz -O opencv.tar.gz
-wget -c https://github.com/openvinotoolkit/openvino/archive/2020.3.0.tar.gz -O dldt.tar.gz
-wget -c https://github.com/FFmpeg/FFmpeg/archive/n4.3.tar.gz -O ffmpeg.tar.gz
+wget -c https://github.com/opencv/opencv/archive/4.4.0.tar.gz -O opencv.tar.gz
+wget -c https://github.com/openvinotoolkit/openvino/archive/2020.4.tar.gz -O dldt.tar.gz
+wget -c https://github.com/FFmpeg/FFmpeg/archive/n4.3.1.tar.gz -O ffmpeg.tar.gz
 wget -c https://github.com/xianyi/OpenBLAS/archive/v0.3.10.tar.gz -O openblas.tar.gz
 
 
@@ -49,13 +53,19 @@ cd ./dldt/inference-engine/thirdparty/ade
 git clone https://github.com/opencv/ade/ ./
 git reset --hard cbe2db6
 
-green "GIT RESET FOR ngraph"
-cd ../../../ngraph
-git clone https://github.com/NervanaSystems/ngraph ./
-git reset --hard edc65ca
+green "GIT RESET FOR mkl-dnn"
+cd ../mkl-dnn
+git clone https://github.com/openvinotoolkit/oneDNN/ ./
+git reset --hard 2706f56
+
+green "GIT RESET FOR IE samples gflags"
+cd ../../samples/thirdparty/gflags/
+git clone https://github.com/gflags/gflags ./
+git reset --hard 46f73f8
+
 
 green "CREATE VENV"
-cd ../
+cd $ROOT_DIR
 
 if [[ ! -d ./venv ]]; then
 	virtualenv --clear --always-copy -p /usr/bin/python3 ./venv