Skip to content

Commit 38a01a0

Browse files
committed
fix the last two commits
1 parent f2d1e4e commit 38a01a0

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

py/dynesty/utils.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2147,7 +2147,7 @@ def restore_sampler(fname, pool=None):
21472147
f'does not match the current dynesty version'
21482148
f'({DYNESTY_VERSION}). That is *NOT* guaranteed to work')
21492149
if pool is not None:
2150-
queue_size_old = getattr(sampler, 'queue_size')
2150+
queue_size_old = getattr(sampler, 'queue_size', None)
21512151
try:
21522152
# we first try to get the new queue_size
21532153
# that may fail if the pool has no information about the size
@@ -2227,14 +2227,15 @@ def _parse_pool_queue(pool, queue_size):
22272227
if queue_size is not None and queue_size < 1:
22282228
raise ValueError("The queue must contain at least one element!")
22292229
if pool is None:
2230-
if queue_size > 1:
2230+
if queue_size is not None and queue_size > 1:
22312231
raise ValueError("`queue_size > 1` but no `pool` provided.")
22322232
mapper = map
22332233
queue_size = 1
22342234
elif pool is not None:
22352235
mapper = pool.map
22362236
if queue_size is None:
2237-
queue_size = getattr(pool, '_processes') or getattr(pool, 'size')
2237+
queue_size = getattr(pool, '_processes', None) or getattr(
2238+
pool, 'size', None)
22382239
if queue_size is None:
22392240
raise ValueError(
22402241
"Cannot initialize `queue_size` because "

0 commit comments

Comments
 (0)