Merge branch 'default_resume_cpnest' into 'master'

Switches on checkpointing by default in cpnest

See merge request lscsoft/bilby!388

CHANGELOG.md

@@ -14,6 +14,7 @@
 - Use pickling to store the dynesty resume file and add a write-to-resume on SIGINT/SIGKILL
 - Bug fix in ROQ likelihood
 - Distance and phase marginalisation work with ROQ likelihood
+- Cpnest now creates checkpoints (resume files) by default
 
 ### Removed
 -

bilby/core/sampler/cpnest.py

@@ -28,7 +28,7 @@ class Cpnest(NestedSampler):
         The maximum number of MCMC steps to take
     verbose: Bool (True)
         If true, print information information about the convergence during
-    resume: Bool (False)
+    resume: Bool (True)
         Whether or not to resume from a previous run
     output: str
         Where to write the CPNest, by default this is
@@ -36,7 +36,7 @@ class Cpnest(NestedSampler):
 
     """
     default_kwargs = dict(verbose=1, nthreads=1, nlive=500, maxmcmc=1000,
-                          seed=None, poolsize=100, nhamiltonian=0, resume=False,
+                          seed=None, poolsize=100, nhamiltonian=0, resume=True,
                           output=None)
 
     def _translate_kwargs(self, kwargs):

test/sampler_test.py

@@ -112,13 +112,13 @@ class TestCPNest(unittest.TestCase):
 
     def test_default_kwargs(self):
         expected = dict(verbose=1, nthreads=1, nlive=500, maxmcmc=1000,
-                        seed=None, poolsize=100, nhamiltonian=0, resume=False,
+                        seed=None, poolsize=100, nhamiltonian=0, resume=True,
                         output='outdir/cpnest_label/')
         self.assertDictEqual(expected, self.sampler.kwargs)
 
     def test_translate_kwargs(self):
         expected = dict(verbose=1, nthreads=1, nlive=250, maxmcmc=1000,
-                        seed=None, poolsize=100, nhamiltonian=0, resume=False,
+                        seed=None, poolsize=100, nhamiltonian=0, resume=True,
                         output='outdir/cpnest_label/')
         for equiv in bilby.core.sampler.base_sampler.NestedSampler.npoints_equiv_kwargs:
             new_kwargs = self.sampler.kwargs.copy()