Merge branch 'release/1.2.1' into develop

Author: exhuma

CHANGELOG

@@ -1,3 +1,6 @@
+1.2.1
+   - Fixed an issue in multiprocessing code.
+
 1.2.0
    - Multiprocessing (by loisaidasam)
    - Python 3 support

INSTALL

@@ -18,7 +18,7 @@ Untar the archive::
    tar xf <filename.tar.gz>
 
 Next, go to the folder just created. It will have the same name as the package
-(for example "cluster-1.2.0") and run::
+(for example "cluster-1.2.1") and run::
 
     python setup.py install
 

cluster/matrix.py

@@ -58,10 +58,8 @@ def worker(self):
         for task in iter(self.task_queue.get, 'STOP'):
             col_index, item, item2 = task
             result = (col_index, self.combinfunc(item, item2))
-            self.task_queue.task_done()
             self.done_queue.put(result)
             tasks_completed += 1
-        self.task_queue.task_done()
         logger.info("Worker %s performed %s tasks",
                     current_process().name,
                     tasks_completed)
@@ -117,7 +115,6 @@ def genmatrix(self, num_processes=1):
                     # blocking operation)
                     if num_tasks_queued > num_processes:
                         col_index, result = self.done_queue.get()
-                        self.done_queue.task_done()
                         row[col_index] = result
                         num_tasks_completed += 1
                 else:
@@ -136,7 +133,6 @@ def genmatrix(self, num_processes=1):
                 # Grab the remaining worker task results
                 while num_tasks_completed < num_tasks_queued:
                     col_index, result = self.done_queue.get()
-                    self.done_queue.task_done()
                     row[col_index] = result
                     num_tasks_completed += 1
 

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name='cluster',
-    version='1.2.0',
+    version='1.2.1',
     author='Michel Albert',
     author_email='[email protected]',
     url='https://github.com/exhuma/python-cluster',

test.py

@@ -164,6 +164,13 @@ def testUnmodifiedData(self):
         [new_data.extend(_) for _ in cl.getlevel(40)]
         self.assertEqual(sorted(new_data), sorted(self.__data))
 
+    def testMultiprocessing(self):
+        cl = HierarchicalClustering(self.__data, lambda x, y: abs(x - y),
+                                    num_processes=4)
+        new_data = []
+        [new_data.extend(_) for _ in cl.getlevel(40)]
+        self.assertEqual(sorted(new_data), sorted(self.__data))
+
 
 class HClusterStringTestCase(unittest.TestCase):