From 0f0f9b67112d8e814b3f7e8f9e401eca91e2fd66 Mon Sep 17 00:00:00 2001 From: Michael Himes Date: Fri, 5 Jan 2024 17:20:17 -0500 Subject: [PATCH] Updated to py3.8. Version bump. --- environment.yml | 22 +++++++++++----------- example/dream_example.py | 2 +- lisa/_version.py | 2 +- lisa/wrappers/helper.py | 1 + setup.py | 6 +++--- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/environment.yml b/environment.yml index d0b32d5..5d4df07 100644 --- a/environment.yml +++ b/environment.yml @@ -2,17 +2,17 @@ name: lisa channels: - conda-forge dependencies: - - python=3.7.2 - - mpi4py=3.0.3 + - python=3.8.18 + - mpi4py=3.1.4 - mpich=3.3.2 - - cython=0.29.5 - - matplotlib=3.0.2 - - numpy=1.16.5 + - numpy=1.24.3 + - matplotlib=3.7.2 + - multiprocess=0.70.15 - scipy=1.5.3 - - yaml=0.1.7 - - h5py=2.10.0 - - multinest=3.10 - - pymultinest=2.9 - - ultranest=2.2.1 - - dynesty=1.0.1 + - yaml=0.2.5 + - h5py=3.1.0 + - pymultinest=2.12 + - ultranest=3.6.4 + - dynesty=2.1.2 - dnest4=0.2.4 + - emcee=3.1.4 diff --git a/example/dream_example.py b/example/dream_example.py index 19e0bb6..657b674 100755 --- a/example/dream_example.py +++ b/example/dream_example.py @@ -37,7 +37,7 @@ # Run it samp = lisa.run('dream', fbestp='output_bestp.npy', fext='.png', fprefix='model', fsavefile='output_posterior.npy', - loglike=loglike, nchains=4, niter=100000, + loglike=loglike, nchains=4, niter=30000, outputdir=outputdir, pmax=pmax, pmin=pmin, pnames=pnames, pstep=pstep, thinning=1, truepars=pars, verb=1) diff --git a/lisa/_version.py b/lisa/_version.py index 58d168b..5a6f84c 100644 --- a/lisa/_version.py +++ b/lisa/_version.py @@ -1 +1 @@ -__version__ = '0.4' +__version__ = '0.5' diff --git a/lisa/wrappers/helper.py b/lisa/wrappers/helper.py index 42a8048..789ad26 100644 --- a/lisa/wrappers/helper.py +++ b/lisa/wrappers/helper.py @@ -5,6 +5,7 @@ mcpdir = os.path.join(os.path.dirname(__file__), '..', 'modules', 'MCcubed', 'MCcubed', 'plots') sys.path.append(mcpdir) +sys.path.append(os.path.join(mcpdir, '..', 'lib')) # so that mcplots finds binarray import mcplots as mcp diff --git a/setup.py b/setup.py index 0c5e623..0e3407b 100644 --- a/setup.py +++ b/setup.py @@ -44,8 +44,8 @@ def run(self): "Operating System :: OS Independent", ], python_requires='>=3.6', - install_requires=['numpy>=1.16', 'cython>=0.29.5', 'matplotlib>=3.0', - 'pymultinest==2.9', 'ultranest==2.2.1', 'dynesty==1.0.1', - 'dnest4==0.2.4', 'mpi4py==3.0.3'], + install_requires=['numpy>=1.16', 'matplotlib>=3.0', + 'pymultinest==2.9', 'ultranest>=2.2.1', 'dynesty>=1.0.1', + 'dnest4>=0.2.4', 'mpi4py>=3.0.3'], cmdclass={'build_py': lisa_build} )