Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit b6688d2

Browse files
committed
remove openblas
1 parent f9e6b79 commit b6688d2

4 files changed

Lines changed: 3 additions & 27 deletions

File tree

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
[submodule "opencv"]
55
path = opencv
66
url = https://github.com/opencv/opencv
7-
[submodule "openblas"]
8-
path = openblas
9-
url = https://github.com/xianyi/OpenBLAS
107
[submodule "ffmpeg"]
118
path = ffmpeg
129
url = https://github.com/FFmpeg/FFmpeg

README.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ The official way is to use OpenVINO, but it is big and clumsy (just try to use i
5757
### Main differences from OpenVINO
5858

5959
+ No model-optimizer
60-
+ OpenBLAS instead of MKL ([details](https://github.com/banderlog/opencv-python-inference-engine/issues/5#issuecomment-599563729))
6160
+ No [ITT](https://software.intel.com/en-us/articles/intel-itt-api-open-source)
6261
+ No [IPP](https://software.intel.com/en-us/ipp)
6362
+ No [Intel Media SDK](https://software.intel.com/en-us/media-sdk)
@@ -84,7 +83,7 @@ I am using Ubuntu 18.04 [multipass](https://multipass.run/) instance: `multipass
8483
### Requirements
8584

8685
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),
87-
[ffmpeg](https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu), [openBLAS](https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu) and [ngraph](https://www.ngraph.ai/documentation/buildlb)
86+
[ffmpeg](https://trac.ffmpeg.org/wiki/CompilationGuide/Ubuntu), and [ngraph](https://www.ngraph.ai/documentation/buildlb)
8887

8988
```bash
9089
# We need newer `cmake` for dldt (fastest way I know)
@@ -114,12 +113,7 @@ cd opencv-python-inference-engine
114113
### Compilation
115114

116115
```bash
117-
cd build/openblas
118-
./openblas_setup.sh &&
119-
make -j6 &&
120-
make install
121-
122-
cd ../ffmpeg
116+
cd build/ffmpeg
123117
./ffmpeg_setup.sh &&
124118
./ffmpeg_premake.sh &&
125119
make -j6 &&
@@ -150,8 +144,6 @@ cp dldt/inference-engine/temp/tbb/lib/libtbb.so.2 create_wheel/cv2/
150144

151145
cp build/ffmpeg/binaries/lib/*.so create_wheel/cv2/
152146

153-
cp build/openblas/lib/libopenblas.so.0 create_wheel/cv2/
154-
155147
# change RPATH
156148
cd create_wheel
157149
for i in cv2/*.so; do chrpath -r '$ORIGIN' $i; done

build/dldt/dldt_setup.sh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
#!/bin/bash
22

3-
tmp=$(pwd)
4-
BLAS_LIB="${tmp%dldt}openblas/lib/libopenblas.so.0"
5-
BLAS_INC="${tmp%dldt}openblas/include/openblas"
6-
7-
if [ ! -f $BLAS_LIB ] || [ ! -d $BLAS_INC ]; then
8-
echo "!!! Check paths for openblas lib !!!"
9-
echo "I tried: $BLAS_LIB and $BLAS_INC"
10-
exit
11-
fi
12-
133
# https://github.com/openvinotoolkit/openvino/wiki/CMakeOptionsForCustomCompilation
144
# https://github.com/openvinotoolkit/openvino/issues/4527
155
# -D ENABLE_OPENCV=OFF \
@@ -21,9 +11,7 @@ fi
2111
cmake -D CMAKE_BUILD_TYPE=Release \
2212
-D THREADING=TBB \
2313
-D ENABLE_MKL_DNN=ON \
24-
-D GEMM=OPENBLAS \
25-
-D BLAS_INCLUDE_DIRS="$BLAS_INC" \
26-
-D BLAS_LIBRARIES="$BLAS_LIB" \
14+
-D GEMM=JIT \
2715
-D ENABLE_FASTER_BUILD=ON \
2816
-D ENABLE_LTO=ON \
2917
-D ENABLE_VPU=ON \

openblas

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)