Skip to content

Commit

Permalink
Dev (#8)
Browse files Browse the repository at this point in the history
* upd new version

* OpenBLAS faster than JIT

* wheel already manylinux and should not be used for win
  • Loading branch information
banderlog committed Jun 22, 2020
1 parent 9561b60 commit 25b601a
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 16 deletions.
4 changes: 0 additions & 4 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
# TODO list

1. Prevent ngrph from building tests via [cmake-flags](https://github.com/NervanaSystems/ngraph/blob/master/CMakeLists.txt)
2. Now `-D GEMM=JIT` has compatible to the OpenBLAS inference speed (not x10 difference, but 2-20%). Do comparison speed test in the next release.
3. Change wheel naming so that it will not be visible for Windows
1 change: 1 addition & 0 deletions build/dldt/dldt_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ cmake -D CMAKE_BUILD_TYPE=Release \
-D ENABLE_AVX2=ON \
-D ENABLE_AVX512F=OFF \
-D NGRAPH_UNIT_TEST_ENABLE=OFF \
-D NGRAPH_TEST_UTIL_ENABLE=OFF \
-D NGRAPH_ONNX_IMPORT_ENABLE=ON \
-D NGRAPH_JSON_ENABLE=ON \
-D BLAS_LIBRARIES="$BLAS_LIB" \
Expand Down
2 changes: 1 addition & 1 deletion create_wheel/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def __len__(self):

setuptools.setup(
name="opencv-python-inference-engine",
version="4.3.0.1",
version="4.3.0.2",
url="https://github.com/banderlog/opencv-python-inference-engine",
maintainer="Kabakov Borys",
license='MIT, BSD, Intel Simplified Software License',
Expand Down
15 changes: 6 additions & 9 deletions download_all_stuff.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ red () {

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/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
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/xianyi/OpenBLAS/archive/v0.3.10.tar.gz -O openblas.tar.gz


green "CLEAN LIB DIRS"
rm -drf ./dldt/*
rm -drf ./ffmpeg/*
rm -drf ./opencv/*
find ./openblas/ -mindepth 1 -delete
rm -drf ./openblas/*

green "CLEAN BUILD DIRS"
find build/dldt/ -mindepth 1 -not -name 'dldt_setup.sh' -delete
Expand All @@ -38,9 +39,10 @@ rm -drf create_wheel/dist
rm -drf create_wheel/*egg-info

green "UNZIP ALL STUFF"
tar -xf opencv.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/
tar -xf openblas.tar.gz --strip-components=1 -C ./openblas/

green "GIT RESET FOR ade"
cd ./dldt/inference-engine/thirdparty/ade
Expand All @@ -52,11 +54,6 @@ cd ../../../ngraph
git clone https://github.com/NervanaSystems/ngraph ./
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 9f67d03 # 2020-Mar-23

green "CREATE VENV"
cd ../

Expand Down
4 changes: 2 additions & 2 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tensorflow-cpu
tensorflow-cpu==2.2.0
scipy==1.4.1
scikit-image
scipy
ipython

0 comments on commit 25b601a

Please sign in to comment.