Updated python installation test

Author: --replace-all

.gitignore

@@ -1,3 +1,4 @@
 CMakeLists.txt.user
 .clang-format
 build/
+.idea/

tests/cpp_opencv_test/main.cpp

@@ -38,7 +38,7 @@ check_build_info( )
 
     std::cout << "Cpu NEON support: " << cv::checkHardwareSupport( CV_CPU_NEON ) << std::endl;
     if ( cv::checkHardwareSupport( CV_CPU_NEON ) == 0 ) {
-        std::cout << "ERROR: TBB is not enabled." << std::endl;
+        std::cout << "ERROR: NEON is not enabled." << std::endl;
         error_found = true;
     }
 
@@ -48,18 +48,17 @@ check_build_info( )
 int
 main( )
 {
-    bool build_version_ok = check_build_info( );
-    if ( build_version_ok ) {
+    if ( !check_build_info( ) ) {
         std::cout << "SUCCESS: You are using latest OpenCV version, with NEON/TBB support enabled." << std::endl;
     } else {
         std::cout << "FAIL: You are using OpenCV without NEON/TBB support enabled." << std::endl;
-        return -1;
+        return 1;
     }
 
     auto image = cv::imread( IMAGE );
     if ( !image.data ) {
         std::cout << "ERROR: Could not open or find the image" << std::endl;
-        return -1;
+        return 1;
     }
 
     cv::Mat gray_image, thresholded_image;

tests/python_opencv_test/test.py

@@ -4,15 +4,55 @@
 
 from __future__ import print_function
 import cv2
+import sys
 
-print("OpenCV Version: {}".format(cv2.__version__))
-image = cv2.imread("tetris_blocks.png")
-gray = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
-thresh = cv2.threshold(gray, 225, 255, cv2.THRESH_BINARY_INV)[1]
+CURRENT_OPENCV_BUILD_VERSION = [4, 1, 0]
 
-(cnts, _) = cv2.findContours(thresh.copy(), cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
 
-# draw the contours on the image
-cv2.drawContours(image, cnts, -1, (240, 0, 159), 3)
-cv2.imshow("Image", image)
-cv2.waitKey(0)
+def check_build_info():
+    success = True
+
+    print("OpenCV Version:")
+    if (cv2.getVersionMajor() != CURRENT_OPENCV_BUILD_VERSION[0]) and (
+            cv2.getVersionMinor() != CURRENT_OPENCV_BUILD_VERSION[1]) and (
+            cv2.getVersionRevision() != CURRENT_OPENCV_BUILD_VERSION[2]):
+        print("ERROR: OpenCV version is different than the expected.")
+        success = False
+
+    print("Available CPUs: ", cv2.getNumberOfCPUs())
+    print("Available threads: ", cv2.getNumThreads())
+    if cv2.getNumThreads() < cv2.getNumberOfCPUs():
+        print("ERROR: TBB is not enabled.")
+        success = False
+
+    cv2.CPU_NEON = 100  # Value taken from OpenCV doc. CPU labels don't work correctly in Python
+    print("Cpu NEON support: ", cv2.checkHardwareSupport(cv2.CPU_NEON))
+    if not cv2.checkHardwareSupport(cv2.CPU_NEON):
+        print("ERROR: NEON is not enabled.")
+        success = False
+
+    return success
+
+
+def main():
+    if not check_build_info():
+        print("FAIL: You are using OpenCV without NEON/TBB support enabled.")
+        sys.exit(1)
+    print("SUCCESS: You are using latest OpenCV version, with NEON/TBB support enabled.")
+
+    image = cv2.imread("tetris_blocks.png")
+    if not image.data:
+        print("ERROR: Could not open or find the image")
+        sys.exit(1)
+    gray_image = cv2.cvtColor(image, cv2.COLOR_BGR2GRAY)
+    threshold = cv2.threshold(gray_image, 225, 255, cv2.THRESH_BINARY_INV)[1]
+    (contours, _) = cv2.findContours(threshold.copy(), cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
+
+    # draw the contours on the image
+    cv2.drawContours(image, contours, -1, (240, 0, 159), 3)
+    cv2.imshow("Image", image)
+    cv2.waitKey(0)
+
+
+if __name__ == '__main__':
+    main()