From 2a96f28bc190268fc3dd7deb90f19bf2579ed4b2 Mon Sep 17 00:00:00 2001 From: Alexander Mordvintsev Date: Mon, 17 Sep 2012 19:30:20 +0400 Subject: [PATCH] get rid of Lock in gabor_threads.py --- samples/python2/gabor_threads.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/samples/python2/gabor_threads.py b/samples/python2/gabor_threads.py index 3e102d4ff9..c5dc6fa778 100644 --- a/samples/python2/gabor_threads.py +++ b/samples/python2/gabor_threads.py @@ -14,7 +14,6 @@ gabor_threads.py [image filename] import numpy as np import cv2 -from threading import Lock from multiprocessing.pool import ThreadPool @@ -36,13 +35,11 @@ def process(img, filters): def process_threaded(img, filters, threadn = 8): accum = np.zeros_like(img) - accum_lock = Lock() def f(kern): - fimg = cv2.filter2D(img, cv2.CV_8UC3, kern) - with accum_lock: - np.maximum(accum, fimg, accum) + return cv2.filter2D(img, cv2.CV_8UC3, kern) pool = ThreadPool(processes=threadn) - pool.map(f, filters) + for fimg in pool.imap_unordered(f, filters): + np.maximum(accum, fimg, accum) return accum if __name__ == '__main__':