Fix tests

Author: aseyboldt

pymc3/parallel_sampling.py

@@ -30,7 +30,7 @@ class _Process(multiprocessing.Process):
     """
     def __init__(self, name, msg_pipe, step_method, shared_point,
                  draws, tune, seed):
-        super(_Process, self).__init__(daemon=True)
+        super(_Process, self).__init__(daemon=True, name=name)
         self._msg_pipe = msg_pipe
         self._step_method = step_method
         self._shared_point = shared_point

pymc3/sampling.py

@@ -965,19 +965,9 @@ def _choose_backend(trace, chain, shortcuts=None, **kwds):
         raise ValueError('Argument `trace` is invalid.')
 
 
-def _mp_sample(**kwargs):
-    cores = kwargs.pop('cores')
-    chain = kwargs.pop('chain')
-    rseed = kwargs.pop('random_seed')
-    start = kwargs.pop('start')
-    chains = kwargs.pop('chains')
-    draws = kwargs.pop('draws')
-    tune = kwargs.pop('tune')
-    step = kwargs.pop('step')
-    progressbar = kwargs.pop('progressbar')
-    use_mmap = kwargs.pop('use_mmap')
-    model = kwargs.pop('model', None)
-    trace = kwargs.pop('trace', None)
+def _mp_sample(draws, tune, step, chains, cores, chain, random_seed,
+               start, progressbar, trace=None, model=None, use_mmap=False,
+               **kwargs):
 
     if sys.version_info.major >= 3:
         import pymc3.parallel_sampling as ps
@@ -1000,7 +990,8 @@ def _mp_sample(**kwargs):
             traces.append(strace)
 
         sampler = ps.ParallelSampler(
-            draws, tune, chains, cores, rseed, start, step, chain, progressbar)
+            draws, tune, chains, cores, random_seed, start, step,
+            chain, progressbar)
         try:
             with sampler:
                 for draw in sampler:
@@ -1022,8 +1013,12 @@ def _mp_sample(**kwargs):
     else:
         chain_nums = list(range(chain, chain + chains))
         pbars = [progressbar] + [False] * (chains - 1)
-        jobs = (delayed(_sample)(*args, **kwargs)
-                for args in zip(chain_nums, pbars, rseed, start))
+        jobs = (delayed(_sample)(
+                    chain=args[0], progressbar=args[1], random_seed=args[2],
+                    start=args[3], draws=draws, step=step, trace=trace,
+                    tune=tune, model=model, **kwargs
+                )
+                for args in zip(chain_nums, pbars, random_seed, start))
         if use_mmap:
             traces = Parallel(n_jobs=cores)(jobs)
         else:

pymc3/tests/test_parallel_sampling.py

@@ -1,9 +1,13 @@
 import time
+import sys
+import pytest
 
 import pymc3.parallel_sampling as ps
 import pymc3 as pm
 
 
+@pytest.mark.skipif(sys.version_info < (3,3),
+                    reason="requires python3.3")
 def test_abort():
     with pm.Model() as model:
         a = pm.Normal('a', shape=1)
@@ -21,6 +25,8 @@ def test_abort():
     proc.join()
 
 
+@pytest.mark.skipif(sys.version_info < (3,3),
+                    reason="requires python3.3")
 def test_explicit_sample():
     with pm.Model() as model:
         a = pm.Normal('a', shape=1)
@@ -46,6 +52,8 @@ def test_explicit_sample():
     print(time.time() - start)
 
 
+@pytest.mark.skipif(sys.version_info < (3,3),
+                    reason="requires python3.3")
 def test_iterator():
     with pm.Model() as model:
         a = pm.Normal('a', shape=1)