Skip to content

Commit daebd43

Browse files
author
ktausch
committed
Added saving of RandomState of MCMC sampler for loading upon restart
1 parent 937ebe7 commit daebd43

File tree

288 files changed

+13
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

288 files changed

+13
-2
lines changed

.hgignore

100644100755
File mode changed.

CITATION

100644100755
File mode changed.

LICENSE

100644100755
File mode changed.

README

100644100755
File mode changed.

ares/__init__.py

100644100755
File mode changed.

ares/analysis/BlobFactory.py

100644100755
File mode changed.

ares/analysis/DerivedQuantities.py

100644100755
File mode changed.

ares/analysis/Global21cm.py

100644100755
File mode changed.

ares/analysis/InlineAnalysis.py

100644100755
File mode changed.

ares/analysis/MetaGalacticBackground.py

100644100755
File mode changed.

ares/analysis/ModelSelection.py

100644100755
File mode changed.

ares/analysis/ModelSet.py

100644100755
File mode changed.

ares/analysis/ModelSet21cm.py

100644100755
File mode changed.

ares/analysis/ModelSetLF.py

100644100755
File mode changed.

ares/analysis/MultiPhaseMedium.py

100644100755
File mode changed.

ares/analysis/MultiPlot.py

100644100755
File mode changed.

ares/analysis/ObservedLF.py

100644100755
File mode changed.

ares/analysis/Population.py

100644100755
File mode changed.

ares/analysis/RaySegment.py

100644100755
File mode changed.

ares/analysis/Source.py

100644100755
File mode changed.

ares/analysis/TurningPoints.py

100644100755
File mode changed.

ares/analysis/__init__.py

100644100755
File mode changed.

ares/inference/AbundanceMatching.py

100644100755
File mode changed.

ares/inference/FitGlobal21cm.py

100644100755
File mode changed.

ares/inference/FitLuminosityFunction.py

100644100755
File mode changed.

ares/inference/ModelFit.py

100644100755
+13-2
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,6 @@ def _saved_checkpoint_chain_files(self, prefix):
700700
def _saved_checkpoints(self, prefix):
701701
ans = [int(fn[-14:-10])\
702702
for fn in self._saved_checkpoint_chain_files(prefix)]
703-
print ans
704703
return ans
705704

706705

@@ -750,11 +749,13 @@ def _prep_from_scratch(self, clobber, by_proc=False):
750749

751750
os.system('rm -f %s.*.fail.pkl' % self.prefix)
752751
os.system('rm -f %s.*.chain.*pkl' % self.prefix)
752+
os.system('rm -f %s.*.logL.*pkl' % self.prefix)
753753
os.system('rm -f %s.*.blob*.*pkl' % self.prefix)
754754

755755
# Need to potentially axe a product file
756756
os.system('rm -f %s.fails.pkl' % self.prefix)
757757
os.system('rm -f %s.chain.pkl' % self.prefix)
758+
os.system('rm -f %s.rstate.pkl' % self.prefix)
758759

759760
# Each processor gets its own fail file
760761
f = open('%s.fail.pkl' % prefix_by_proc, 'wb')
@@ -913,8 +914,12 @@ def run(self, prefix, steps=1e2, burn=0, clobber=False, restart=False,
913914
elif not restart:
914915
pos = self.guesses
915916
state = None
917+
elif os.path.exists('%s.rstate.pkl' % (prefix,)):
918+
f = open('%s.rstate.pkl' % (prefix,), 'rb')
919+
state = pickle.load(f)
920+
f.close()
916921
else:
917-
state = None # should this be saved and restarted?
922+
state = None
918923

919924
#
920925
## MAIN CALCULATION BELOW
@@ -986,6 +991,12 @@ def run(self, prefix, steps=1e2, burn=0, clobber=False, restart=False,
986991
pickle.dump(self.sampler.acceptance_fraction, f)
987992
f.close()
988993

994+
####################################
995+
f = open('%s.rstate.pkl' % prefix, 'wb')
996+
pickle.dump(state, f)
997+
f.close()
998+
####################################
999+
9891000
print "Checkpoint #%i: %s" % (ct / save_freq, time.ctime())
9901001

9911002
del data, pos_all, prob_all, blobs_all

ares/inference/ModelGrid.py

100644100755
File mode changed.

ares/inference/ModelSample.py

100644100755
File mode changed.

ares/inference/OptimizeSpectrum.py

100644100755
File mode changed.

ares/inference/PriorSet.py

100644100755
File mode changed.

ares/inference/Priors.py

100644100755
File mode changed.

ares/inference/__init__.py

100644100755
File mode changed.

ares/phenom/DustCorrection.py

100644100755
File mode changed.

ares/phenom/Gaussian21cm.py

100644100755
File mode changed.

ares/phenom/HaloProperty.py

100644100755
File mode changed.

ares/phenom/Tanh21cm.py

100644100755
File mode changed.

ares/phenom/__init__.py

100644100755
File mode changed.

ares/physics/Constants.py

100644100755
File mode changed.

ares/physics/Cosmology.py

100644100755
File mode changed.

ares/physics/CrossSections.py

100644100755
File mode changed.

ares/physics/HaloMassFunction.py

100644100755
File mode changed.

ares/physics/Hydrogen.py

100644100755
File mode changed.

ares/physics/RateCoefficients.py

100644100755
File mode changed.

ares/physics/SecondaryElectrons.py

100644100755
File mode changed.

ares/physics/__init__.py

100644100755
File mode changed.

ares/populations/Composite.py

100644100755
File mode changed.

ares/populations/GalaxyAggregate.py

100644100755
File mode changed.

ares/populations/GalaxyCohort.py

100644100755
File mode changed.

ares/populations/GalaxyEnsemble.py

100644100755
File mode changed.

ares/populations/GalaxyPopulation.py

100644100755
File mode changed.

ares/populations/Halo.py

100644100755
File mode changed.

ares/populations/Parameterized.py

100644100755
File mode changed.

ares/populations/Population.py

100644100755
File mode changed.

ares/populations/SynthesisModel.py

100644100755
File mode changed.

ares/populations/__init__.py

100644100755
File mode changed.

ares/simulations/Collapse.py

100644100755
File mode changed.

ares/simulations/GasParcel.py

100644100755
File mode changed.

ares/simulations/Global21cm.py

100644100755
File mode changed.

ares/simulations/MetaGalacticBackground.py

100644100755
File mode changed.

ares/simulations/MultiPhaseMedium.py

100644100755
File mode changed.

ares/simulations/RaySegment.py

100644100755
File mode changed.

ares/simulations/__init__.py

100644100755
File mode changed.

ares/solvers/Chemistry.py

100644100755
File mode changed.

ares/solvers/OpticalDepth.py

100644100755
File mode changed.

ares/solvers/RadialField.py

100644100755
File mode changed.

ares/solvers/UniformBackground.py

100644100755
File mode changed.

ares/solvers/__init__.py

100644100755
File mode changed.

ares/sources/BlackHole.py

100644100755
File mode changed.

ares/sources/Composite.py

100644100755
File mode changed.

ares/sources/Diffuse.py

100644100755
File mode changed.

ares/sources/Source.py

100644100755
File mode changed.

ares/sources/Star.py

100644100755
File mode changed.

ares/sources/Toy.py

100644100755
File mode changed.

ares/sources/__init__.py

100644100755
File mode changed.

ares/static/ChemicalNetwork.py

100644100755
File mode changed.

ares/static/Grid.py

100644100755
File mode changed.

ares/static/IntegralTables.py

100644100755
File mode changed.

ares/static/InterpolationTables.py

100644100755
File mode changed.

ares/static/VolumeGlobal.py

100644100755
File mode changed.

ares/static/VolumeLocal.py

100644100755
File mode changed.

ares/static/__init__.py

100644100755
File mode changed.

ares/util/Aesthetics.py

100644100755
File mode changed.

ares/util/BackwardCompatibility.py

100644100755
File mode changed.

ares/util/CheckForParameterConflicts.py

100644100755
File mode changed.

ares/util/GridND.py

100644100755
File mode changed.

ares/util/MPIPool.py

100644100755
File mode changed.

ares/util/MagnitudeSystem.py

100644100755
File mode changed.

ares/util/Math.py

100644100755
File mode changed.

ares/util/Misc.py

100644100755
File mode changed.

ares/util/ParameterBundles.py

100644100755
File mode changed.

ares/util/ParameterFile.py

100644100755
File mode changed.

ares/util/PrintInfo.py

100644100755
File mode changed.

ares/util/ProblemTypes.py

100644100755
File mode changed.

ares/util/ProgressBar.py

100644100755
File mode changed.

ares/util/ReadData.py

100644100755
File mode changed.

ares/util/RestrictTimestep.py

100644100755
File mode changed.

ares/util/SetDefaultParameterValues.py

100644100755
File mode changed.

ares/util/Stats.py

100644100755
File mode changed.

ares/util/Warnings.py

100644100755
File mode changed.

ares/util/WriteData.py

100644100755
File mode changed.

ares/util/__init__.py

100644100755
File mode changed.

doc/Makefile

100644100755
File mode changed.

doc/analysis.rst

100644100755
File mode changed.

doc/conf.py

100644100755
File mode changed.

doc/contributing.rst

100644100755
File mode changed.

doc/example_21cm_multipop.rst

100644100755
File mode changed.

doc/example_21cm_simple.rst

100644100755
File mode changed.

doc/example_adv_RT_w_He.rst

100644100755
File mode changed.

doc/example_bh.rst

100644100755
File mode changed.

doc/example_crb_br.rst

100644100755
File mode changed.

doc/example_crb_ion.rst

100644100755
File mode changed.

doc/example_crb_uv.rst

100644100755
File mode changed.

doc/example_crb_xr.rst

100644100755
File mode changed.

doc/example_customization.rst

100644100755
File mode changed.

doc/example_galaxypop.rst

100644100755
File mode changed.

doc/example_grid.rst

100644100755
File mode changed.

doc/example_grid_analysis.rst

100644100755
File mode changed.

doc/example_ham.rst

100644100755
File mode changed.

doc/example_inline_analysis.rst

100644100755
File mode changed.

doc/example_litdata.rst

100644100755
File mode changed.

doc/example_mc_sampling.rst

100644100755
File mode changed.

doc/example_mcmc_I.rst

100644100755
File mode changed.

doc/example_mcmc_analysis.rst

100644100755
File mode changed.

doc/example_rt06_1.rst

100644100755
File mode changed.

doc/example_rt06_2.rst

100644100755
File mode changed.

doc/example_sedop.rst

100644100755
File mode changed.

doc/example_star.rst

100644100755
File mode changed.

doc/example_tau.rst

100644100755
File mode changed.

doc/examples.rst

100644100755
File mode changed.

doc/fields.rst

100644100755
File mode changed.

doc/history.rst

100644100755
File mode changed.

doc/index.rst

100644100755
File mode changed.

doc/inits_tables.rst

100644100755
File mode changed.

doc/install.rst

100644100755
File mode changed.

doc/methods.rst

100644100755
File mode changed.

doc/methods_integration.rst

100644100755
File mode changed.

doc/param_bundles.rst

100644100755
File mode changed.

doc/params.rst

100644100755
File mode changed.

doc/params_control.rst

100644100755
File mode changed.

doc/params_cosmology.rst

100644100755
File mode changed.

doc/params_grid.rst

100644100755
File mode changed.

doc/params_hmf.rst

100644100755
File mode changed.

doc/params_inference.rst

100644100755
File mode changed.

doc/params_physics.rst

100644100755
File mode changed.

doc/params_populations.rst

100644100755
File mode changed.

doc/params_sources.rst

100644100755
File mode changed.

doc/params_spectrum.rst

100644100755
File mode changed.

doc/problem_types.rst

100644100755
File mode changed.

doc/requirements.txt

100644100755
File mode changed.

doc/scripts/generate_figures.py

100644100755
File mode changed.

doc/scripts/run_example_crb_lw.py

100644100755
File mode changed.

doc/scripts/run_example_crb_uv.py

100644100755
File mode changed.

doc/scripts/run_example_crb_xr.py

100644100755
File mode changed.

doc/structure.rst

100644100755
File mode changed.

doc/troubleshooting.rst

100644100755
File mode changed.

doc/updates.rst

100644100755
File mode changed.

doc/uth.rst

100644100755
File mode changed.

doc/uth_litdata.rst

100644100755
File mode changed.

doc/uth_physics_constants.rst

100644100755
File mode changed.

doc/uth_physics_cosmo.rst

100644100755
File mode changed.

doc/uth_physics_esec.rst

100644100755
File mode changed.

doc/uth_physics_hydrogen.rst

100644100755
File mode changed.

doc/uth_physics_rcs.rst

100644100755
File mode changed.

doc/uth_pop_bh.rst

100644100755
File mode changed.

doc/uth_pop_radiation.rst

100644100755
File mode changed.

doc/uth_pop_sfrd.rst

100644100755
File mode changed.

doc/uth_pop_stellar.rst

100644100755
File mode changed.

doc/uth_solver_chem.rst

100644100755
File mode changed.

doc/uth_solver_igm.rst

100644100755
File mode changed.

doc/uth_solver_rt1d.rst

100644100755
File mode changed.

doc/uth_solver_rte.rst

100644100755
File mode changed.

doc/uth_src.rst

100644100755
File mode changed.

doc/uth_src_bh.rst

100644100755
File mode changed.

doc/uth_src_galaxy.rst

100644100755
File mode changed.

doc/uth_src_stellar.rst

100644100755
File mode changed.

doc/uth_src_toy.rst

100644100755
File mode changed.

examples/fits/test_abundance_matching.py

100644100755
File mode changed.

examples/fits/test_fitting_generic.py

100644100755
File mode changed.

examples/fits/test_fitting_lf.py

100644100755
File mode changed.

examples/fits/test_fitting_tanh.py

100644100755
File mode changed.

examples/fits/test_fitting_tanh_extrema.py

100644100755
File mode changed.

examples/fits/test_modelgrid.py

100644100755
File mode changed.

examples/fits/test_optimization_bb_n1.py

100644100755
File mode changed.

examples/fits/test_optimization_bb_n4.py

100644100755
File mode changed.

examples/gs/movie_21cm.py

100644100755
File mode changed.

examples/gs/test_cuvb.py

100644100755
File mode changed.

examples/gs/test_cxrb.py

100644100755
File mode changed.

examples/gs/test_helium.py

100644100755
File mode changed.

examples/lit/test_aird2015.py

100644100755
File mode changed.

examples/lit/test_atek2015.py

100644100755
File mode changed.

examples/lit/test_bouwens2015.py

100644100755
File mode changed.

examples/lit/test_eldridge2009.py

100644100755
File mode changed.

examples/lit/test_haardt2012.py

100644100755
File mode changed.

examples/lit/test_kroupa2001.py

100644100755
File mode changed.

examples/lit/test_leitherer1999.py

100644100755
File mode changed.

examples/lit/test_lf.py

100644100755
File mode changed.

examples/lit/test_robertson2015.py

100644100755
File mode changed.

examples/lit/test_sazonov2004.py

100644100755
File mode changed.

examples/lit/test_ueda2003.py

100644100755
File mode changed.

examples/lit/test_ueda2014.py

100644100755
File mode changed.

examples/rt06/test_rt06_00.py

100644100755
File mode changed.

examples/rt06/test_rt06_03.py

100644100755
File mode changed.

examples/rt06/test_rt06_1.py

100644100755
File mode changed.

examples/rt06/test_rt06_2.py

100644100755
File mode changed.

examples/rt06/test_rt06_2_m12.py

100644100755
File mode changed.

examples/rt06/test_rt06_2_w_he.py

100644100755
File mode changed.

examples/rt06/test_rt06_2_w_he_adv_e.py

100644100755
File mode changed.

examples/rt06/test_rt06_3.py

100644100755
File mode changed.

examples/sources/test_sed_agn.py

100644100755
File mode changed.

examples/sources/test_sed_apl.py

100644100755
File mode changed.

examples/sources/test_sed_bb.py

100644100755
File mode changed.

examples/sources/test_sed_mcd.py

100644100755
File mode changed.

examples/sources/test_sed_parameterized.py

100644100755
File mode changed.

examples/sources/test_sed_pl.py

100644100755
File mode changed.

examples/sources/test_sed_simpl.py

100644100755
File mode changed.

examples/sources/test_sed_zebra.py

100644100755
File mode changed.

examples/sources/test_src_bh.py

100644100755
File mode changed.

examples/sources/test_src_star.py

100644100755
File mode changed.

input/hmf/generate_hmf_tables.py

100644100755
File mode changed.

input/inits/run_CosmoRec.py

100644100755
File mode changed.

input/litdata/aird2015.py

100644100755
File mode changed.

input/litdata/atek2015.py

100644100755
File mode changed.

input/litdata/bouwens2015.py

100644100755
File mode changed.

input/litdata/eldridge2009.py

100644100755
File mode changed.

input/litdata/finkelstein2015.py

100644100755
File mode changed.

input/litdata/haardt2012.py

100644100755
File mode changed.

input/litdata/kroupa2001.py

100644100755
File mode changed.

input/litdata/leitherer1999.py

100644100755
File mode changed.

input/litdata/madau2014.py

100644100755
File mode changed.

input/litdata/mcbride2009.py

100644100755
File mode changed.

input/litdata/mirocha2016.py

100644100755
File mode changed.

input/litdata/oesch2013.py

100644100755
File mode changed.

input/litdata/oesch2014.py

100644100755
File mode changed.

input/litdata/oesch2016.py

100644100755
File mode changed.

input/litdata/parsa2016.py

100644100755
File mode changed.

input/litdata/robertson2015.py

100644100755
File mode changed.

input/litdata/sazonov2004.py

100644100755
File mode changed.

input/litdata/ueda2003.py

100644100755
File mode changed.

input/litdata/ueda2014.py

100644100755
File mode changed.

input/optical_depth/generate_optical_depth_tables.py

100644100755
File mode changed.

input/rctabs/generate_rc_table.py

100644100755
File mode changed.

input/secondary_electrons/read_FJS10.py

100644100755
File mode changed.

perf/README

100644100755
File mode changed.

perf/test_tabulation_speed_H.py

100644100755
File mode changed.

perf/test_tabulation_speed_He.py

100644100755
File mode changed.

remote.py

100644100755
File mode changed.

setup.py

100644100755
File mode changed.

tests/adv/README

100644100755
File mode changed.

tests/adv/test_gs_4par.py

100644100755
File mode changed.

tests/adv/test_gs_crt.py

100644100755
File mode changed.

tests/adv/test_gs_fcoll.py

100644100755
File mode changed.

tests/adv/test_physics_hmf.py

100644100755
File mode changed.

tests/adv/test_pop_galaxy.py

100644100755
File mode changed.

tests/adv/test_priors.py

100644100755
File mode changed.

tests/adv/test_priorset.py

100644100755
File mode changed.

tests/adv/test_setup_pbundles.py

100644100755
File mode changed.

tests/adv/test_solver_chem_he.py

100644100755
File mode changed.

tests/adv/test_solver_crt_xrb.py

100644100755
File mode changed.

tests/adv/test_src_bpass.py

100644100755
File mode changed.

tests/broken/test_cxrb_helium.py

100644100755
File mode changed.

tests/broken/test_cxrb_mcd.py

100644100755
File mode changed.

tests/broken/test_generator_uvb_qso.py

100644100755
File mode changed.

tests/broken/test_gs_param_rates.py

100644100755
File mode changed.

tests/broken/test_inline_tau.py

100644100755
File mode changed.

tests/broken/test_mpm.py

100644100755
File mode changed.

tests/broken/test_mpm_w_mgb.py

100644100755
File mode changed.

tests/broken/test_patch_cgm.py

100644100755
File mode changed.

tests/broken/test_patch_igm.py

100644100755
File mode changed.

tests/broken/test_patch_igm_analytic.py

100644100755
File mode changed.

tests/broken/test_tau_dynamic.py

100644100755
File mode changed.

tests/test_analysis_blobs.py

100644100755
File mode changed.

tests/test_gs_extrema_finder.py

100644100755
File mode changed.

tests/test_gs_param_hist.py

100644100755
File mode changed.

tests/test_gs_phenom.py

100644100755
File mode changed.

tests/test_phps_mlf.py

100644100755
File mode changed.

tests/test_phps_sfe.py

100644100755
File mode changed.

tests/test_physics_HI_cc.py

100644100755
File mode changed.

tests/test_physics_HI_wf.py

100644100755
File mode changed.

tests/test_physics_cosm.py

100644100755
File mode changed.

tests/test_physics_elec.py

100644100755
File mode changed.

tests/test_physics_rcoeff.py

100644100755
File mode changed.

tests/test_physics_xsec.py

100644100755
File mode changed.

tests/test_solver_chem_h.py

100644100755
File mode changed.

tests/test_solver_crt_tau.py

100644100755
File mode changed.

tests/test_solver_crt_uvb.py

100644100755
File mode changed.

tests/test_solver_crt_xrb.py

100644100755
File mode changed.

tests/test_solver_rt_const_flux.py

100644100755
File mode changed.

tests/test_solver_rt_const_ioniz.py

100644100755
File mode changed.

0 commit comments

Comments
 (0)