Merge branch 'dev'

banderlog · banderlog · commit 3e7d6685a46d · 2021-07-10T22:01:52.000+03:00
diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ For additional info read `cv2.getBuildInformation()` output.
 
 You will need ~7GB RAM and ~10GB disk space
 
-I am using Ubuntu 18.04 [multipass](https://multipass.run/) instance: `multipass launch -c 6 -d 10G -m 7G 18.04`.
+I am using Ubuntu 18.04 (python 3.6) [multipass](https://multipass.run/) instance: `multipass launch -c 6 -d 10G -m 7G 18.04`.
 
 ### Requirements
 
@@ -104,6 +104,7 @@ sudo ln -s  /usr/bin/python3 /usr/bin/python
 ```bash
 git clone https://github.com/banderlog/opencv-python-inference-engine
 cd opencv-python-inference-engine
+# git checkout dev
 ./download_all_stuff.sh
 ```
 
diff --git a/build/opencv/opencv_setup.sh b/build/opencv/opencv_setup.sh
@@ -44,7 +44,7 @@ cmake -D CMAKE_BUILD_TYPE=RELEASE \
       -D FFMPEG_INCLUDE_DIRS=$FFMPEG_PATH/include \
       -D INF_ENGINE_INCLUDE_DIRS=$ABS_PORTION/dldt/inference-engine/include \
       -D INF_ENGINE_LIB_DIRS=$ABS_PORTION/dldt/bin/intel64/Release/lib \
-      -D INF_ENGINE_RELEASE=2021030000 \
+      -D INF_ENGINE_RELEASE=2021040000 \
       -D INSTALL_CREATE_DISTRIB=ON \
       -D INSTALL_C_EXAMPLES=OFF \
       -D INSTALL_PYTHON_EXAMPLES=OFF \
diff --git a/create_wheel/setup.py b/create_wheel/setup.py
@@ -15,7 +15,7 @@ def __len__(self):
 
 setuptools.setup(
     name='opencv-python-inference-engine',
-    version='2021.04.13',
+    version='2021.07.10',
     url="https://github.com/banderlog/opencv-python-inference-engine",
     maintainer="Kabakov Borys",
     license='MIT, Apache 2.0',
diff --git a/dldt b/dldt
@@ -1 +1 @@
-Subproject commit 18e83a217702c650280c6abfc43f3285a3aadb61
+Subproject commit 5cee8bbf29797f4544b343e803de957e9f041f92
diff --git a/download_all_stuff.sh b/download_all_stuff.sh
@@ -23,7 +23,8 @@ if test $(lsb_release -rs) != 18.04; then
 fi
 
 green "RESET GIT SUBMODULES"
-# use `git fetch --unshallow && git checkout tags/<tag>` for update
+# git checkout dev
+# use `git fetch --tags && git checkout tags/<tag>` for update
 git submodule update --init --recursive --depth=1 --jobs=4
 # restore changes command will differ between GIT versions (e.g., `restore`)
 git submodule foreach --recursive git checkout .
@@ -34,7 +35,6 @@ green "CLEAN BUILD DIRS"
 find build/dldt/ -mindepth 1 -not -name 'dldt_setup.sh' -not -name '*.patch' -delete
 find build/opencv/ -mindepth 1 -not -name 'opencv_setup.sh' -delete
 find build/ffmpeg/ -mindepth 1 -not -name 'ffmpeg_*.sh' -delete
-find build/openblas/ -mindepth 1 -not -name 'openblas_setup.sh' -delete
 
 green "CLEAN WHEEL DIR"
 find create_wheel/cv2/ -type f -not -name '__init__.py' -delete
diff --git a/ffmpeg b/ffmpeg
@@ -1 +1 @@
-Subproject commit f719f869907764e6412a6af6e178c46e5f915d25
+Subproject commit dc91b913b6260e85e1304c74ff7bb3c22a8c9fb1
diff --git a/opencv b/opencv
@@ -1 +1 @@
-Subproject commit 69357b1e88680658a07cffde7678a4d697469f03
+Subproject commit ad6e82942b37be8ee2c71c1d9bc7fe79cd16f7ab
diff --git a/tests/README.md b/tests/README.md
@@ -19,7 +19,6 @@ cd tests
 
 Something like below. The general idea is to test only inference speed, without preprocessing and decoding.
 Also, 1st inference must not count, because it will load all stuff into memory.
-I prefer to do such things in `ipython` or `jupyter` with `%timeit`.
 
 **NB:** be strict about Backend and Target
 
diff --git a/tests/examples.ipynb b/tests/examples.ipynb
diff --git a/tests/helloworld.png b/tests/helloworld.png
diff --git a/tests/prepare_and_run_tests.sh b/tests/prepare_and_run_tests.sh
@@ -68,30 +68,10 @@ for i in "${models[@]}"; do
         wget "${url_start}/${i%.*}/FP32/${i}"
     else
 	# checksum
-        sha256sum -c "${i}.sha256sum"
-    fi
-done
-
-
-# for speed test
-# {filename: file_google_drive_id}
-declare -A se_net=(["se_net.bin"]="1vbonFjVyleGRSd_wR-Khc1htsZybiHCG"
-		   ["se_net.xml"]="1Bz3EQwnes_iZ14iKAV6H__JZ2lynLmQz")
-
-# for each key
-for i in "${!se_net[@]}"; do
-    # if file exist
-    if [ -f $i ]; then
-        # checksum
-        sha256sum -c "${i}.sha256sum"
-    else
-        # get fileid from associative array and download file
-        wget --no-check-certificate "https://docs.google.com/uc?export=download&id=${se_net[$i]}" -O $i
+        sha256sum -c "${i}.sha256sum" || red "PROBLEMS ^^^"
     fi
 done
 
 green "For \"$WHEEL\""
 green "RUN TESTS with ./venv_t/bin/python ./tests.py"
 ./venv_t/bin/python ./tests.py
-green "RUN TESTS with ./venv_t/bin/python ./speed_test.py"
-./venv_t/bin/python ./speed_test.py
diff --git a/tests/se_net.bin.sha256sum b/tests/se_net.bin.sha256sum
diff --git a/tests/se_net.xml.sha256sum b/tests/se_net.xml.sha256sum
diff --git a/tests/speed_test.py b/tests/speed_test.py
diff --git a/tests/text_recognition.py b/tests/text_recognition.py
@@ -37,7 +37,7 @@ def _get_confidences(self, img: np.ndarray, box: tuple) -> np.ndarray:
         return outs
 
     def do_ocr(self, img: np.ndarray, bboxes: List[tuple]) -> List[str]:
-        """ Run OCR pipeline for a single words
+        """ Run OCR pipeline with greedy decoder for each single word (bbox)
 
             :param img: BGR image
             :param bboxes: list of sepaate word bboxes (ymin ,xmin ,ymax, xmax)
@@ -60,7 +60,7 @@ def do_ocr(self, img: np.ndarray, bboxes: List[tuple]) -> List[str]:
         for box in bboxes:
             # confidence distribution across symbols
             confs = self._get_confidences(img, box)
-            # get maximal confidence for the whole beam width
+            # get maximal confidence for the whole beam width aka greedy decoder
             idxs = confs[:, 0, :].argmax(axis=1)
             # drop blank characters '#' with id == 36 in charvec
             # isupposedly we taking only separate words as input
