diff --git a/docs/requirements.txt b/docs/requirements.txt index 153bd4a8..0a12fea8 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -9,7 +9,6 @@ dill scipy sympy tqdm -chaospy cloudpickle h5py pyyaml diff --git a/pydsge/examples/dfi_sampler.h5 b/pydsge/examples/dfi_sampler.h5 index 5d55ea5a..ea9dab1a 100644 Binary files a/pydsge/examples/dfi_sampler.h5 and b/pydsge/examples/dfi_sampler.h5 differ diff --git a/pydsge/mpile.py b/pydsge/mpile.py index b8e87e1e..2cfed589 100644 --- a/pydsge/mpile.py +++ b/pydsge/mpile.py @@ -3,12 +3,10 @@ """contains functions related to (re)compiling the model with different parameters """ - import time import dill import tqdm import random -import chaospy import numpy as np from emcwrap import get_prior_sample, get_prior from grgrlib.multiprocessing import serializer @@ -36,17 +34,6 @@ def posterior_sampler(self, nsamples, seed=0, verbose=True): return sample -def sample_box(self, dim0, dim1=None, bounds=None, lp_rule=None): - """Sample from a hypercube""" - - bnd = bounds or np.array(self.fdict["prior_bounds"]) - dim1 = dim1 or self.ndim - rule = lp_rule or "S" - res = chaospy.Uniform(0, 1).sample(size=(dim0, dim1), rule=rule) - res = (bnd[1] - bnd[0]) * res + bnd[0] - return res - - def prior_sampler( self, nsamples, diff --git a/requirements.txt b/requirements.txt index f2899454..d767cccc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,10 @@ numba -numpy<=1.26.4 +numpy pandas pathos dill scipy tqdm -chaospy cloudpickle h5py pyyaml diff --git a/setup.py b/setup.py index 284ce11a..ae7d0f3e 100644 --- a/setup.py +++ b/setup.py @@ -34,12 +34,11 @@ install_requires=[ "numba", "emcee", - "numpy<=1.26.4", + "numpy", "pandas", "pathos", "dill", "tqdm", - "chaospy", "cloudpickle", "h5py", "pyyaml",