Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-01-22 16:58:30 +03:00
parent 8b3042da63 3019927a61
commit 3d14dd4e39
32 changed files with 1151 additions and 94 deletions
@@ -117,6 +117,10 @@ class dnn_test(NewOpenCVTests):
            return False
        return True

+    def test_getAvailableTargets(self):
+        targets = cv.dnn.getAvailableTargets(cv.dnn.DNN_BACKEND_OPENCV)
+        self.assertTrue(cv.dnn.DNN_TARGET_CPU in targets)
+
    def test_blobFromImage(self):
        np.random.seed(324)