Skip to content
Snippets Groups Projects
Commit 3741310b authored by Paul Lasky's avatar Paul Lasky
Browse files

Merge branch 'revert-cba643d4' into 'master'

Revert "Switched on checkpointing by default in cpnest"

See merge request lscsoft/bilby!387
parents cba643d4 b32466eb
No related branches found
No related tags found
1 merge request!387Revert "Switched on checkpointing by default in cpnest"
Pipeline #50775 passed
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
- Use pickling to store the dynesty resume file and add a write-to-resume on SIGINT/SIGKILL - Use pickling to store the dynesty resume file and add a write-to-resume on SIGINT/SIGKILL
- Bug fix in ROQ likelihood - Bug fix in ROQ likelihood
- Distance and phase marginalisation work with ROQ likelihood - Distance and phase marginalisation work with ROQ likelihood
- Cpnest now creates checkpoints (resume files) by default
### Removed ### Removed
- -
......
...@@ -28,7 +28,7 @@ class Cpnest(NestedSampler): ...@@ -28,7 +28,7 @@ class Cpnest(NestedSampler):
The maximum number of MCMC steps to take The maximum number of MCMC steps to take
verbose: Bool (True) verbose: Bool (True)
If true, print information information about the convergence during If true, print information information about the convergence during
resume: Bool (True) resume: Bool (False)
Whether or not to resume from a previous run Whether or not to resume from a previous run
output: str output: str
Where to write the CPNest, by default this is Where to write the CPNest, by default this is
...@@ -36,7 +36,7 @@ class Cpnest(NestedSampler): ...@@ -36,7 +36,7 @@ class Cpnest(NestedSampler):
""" """
default_kwargs = dict(verbose=1, nthreads=1, nlive=500, maxmcmc=1000, default_kwargs = dict(verbose=1, nthreads=1, nlive=500, maxmcmc=1000,
seed=None, poolsize=100, nhamiltonian=0, resume=True, seed=None, poolsize=100, nhamiltonian=0, resume=False,
output=None) output=None)
def _translate_kwargs(self, kwargs): def _translate_kwargs(self, kwargs):
......
...@@ -112,7 +112,7 @@ class TestCPNest(unittest.TestCase): ...@@ -112,7 +112,7 @@ class TestCPNest(unittest.TestCase):
def test_default_kwargs(self): def test_default_kwargs(self):
expected = dict(verbose=1, nthreads=1, nlive=500, maxmcmc=1000, expected = dict(verbose=1, nthreads=1, nlive=500, maxmcmc=1000,
seed=None, poolsize=100, nhamiltonian=0, resume=True, seed=None, poolsize=100, nhamiltonian=0, resume=False,
output='outdir/cpnest_label/') output='outdir/cpnest_label/')
self.assertDictEqual(expected, self.sampler.kwargs) self.assertDictEqual(expected, self.sampler.kwargs)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment