From f76f3549eaf5808b49dd6eccdae5c26d11f6abba Mon Sep 17 00:00:00 2001
From: Moritz Huebner <moritz.huebner@ligo.org>
Date: Wed, 27 Feb 2019 23:09:11 -0600
Subject: [PATCH] Switches on checkpointing by default in cpnest
---
CHANGELOG.md | 1 +
bilby/core/sampler/cpnest.py | 4 ++--
test/sampler_test.py | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15849cfb..6fe3934b 100644
--- a/CHANGELOG.md
+++ b/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
-
diff --git a/bilby/core/sampler/cpnest.py b/bilby/core/sampler/cpnest.py
index 0936900f..0f1cd878 100644
--- a/bilby/core/sampler/cpnest.py
+++ b/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):
diff --git a/test/sampler_test.py b/test/sampler_test.py
index 3054ad4a..2500fab1 100644
--- a/test/sampler_test.py
+++ b/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()
--
GitLab