from typing import Any, Dict, List, Mapping, Optional, Union
import numpy as np
-from numpy.random import RandomState
+from numpy.random import default_rng
from cmdstanpy import _TMPDIR
from cmdstanpy.utils import (
@@ -308,10 +312,9 @@ Source code for cmdstanpy.cmdstan_args
'Value for iter_warmup must be a non-negative integer,'
' found {}.'.format(self.iter_warmup)
)
- if self.iter_warmup > 0 and not self.adapt_engaged:
+ if self.iter_warmup == 0 and self.adapt_engaged:
raise ValueError(
- 'Argument "adapt_engaged" is False, '
- 'cannot specify warmup iterations.'
+ 'Must specify iter_warmup > 0 when adapt_engaged=True.'
)
if self.iter_sampling is not None:
if self.iter_sampling < 0 or not isinstance(
@@ -710,6 +713,8 @@ Source code for cmdstanpy.cmdstan_args
num_draws: Optional[int] = None,
num_elbo_draws: Optional[int] = None,
save_single_paths: bool = False,
+ psis_resample: bool = True,
+ calculate_lp: bool = True,
) -> None:
self.init_alpha = init_alpha
self.tol_obj = tol_obj
@@ -726,6 +731,8 @@ Source code for cmdstanpy.cmdstan_args
self.num_elbo_draws = num_elbo_draws
self.save_single_paths = save_single_paths
+ self.psis_resample = psis_resample
+ self.calculate_lp = calculate_lp
[docs] def validate(self, _chains: Optional[int] = None) -> None:
"""
@@ -778,6 +785,12 @@
Source code for cmdstanpy.cmdstan_args
if self.save_single_paths:
cmd.append('save_single_paths=1')
+ if not self.psis_resample:
+ cmd.append('psis_resample=0')
+
+ if not self.calculate_lp:
+ cmd.append('calculate_lp=0')
+
return cmd
@@ -1037,8 +1050,8 @@ Source code for cmdstanpy.cmdstan_args
)
if self.seed is None:
- rng = RandomState()
- self.seed = rng.randint(1, 99999 + 1)
+ rng = default_rng()
+ self.seed = rng.integers(low=1, high=99999, size=1).item()
else:
if not isinstance(self.seed, (int, list, np.integer)):
raise ValueError(
@@ -1177,9 +1190,8 @@ Source code for cmdstanpy.cmdstan_args