Merge latest main branch changes into nested_sampling #17
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Revert "Slice"
* TESTS * TESTS * UPDATE DOCSTRING * ADD STREAMING VERSION * ADD PRECONDITIONING TO MCLMC * ADD PRECONDITIONING TO TUNING FOR MCLMC * UPDATE GITIGNORE * UPDATE GITIGNORE * UPDATE TESTS * UPDATE TESTS * ADD DOCSTRING * ADD TEST * STREAMING AVERAGE * ADD TEST * REFACTOR RUN_INFERENCE_ALGORITHM * UPDATE DOCSTRING * Precommit * CLEAN TESTS * FIX BAD MERGE * ADJUSTED MCLMC * REMOVE BENCHMARKS: * ADD ADJUSTED MCLMC * GITIGNORE * PRECOMMIT CLEAN UP * FIX SPELLING, ADD OMELYAN, EXPORT COEFFICIENTS * TEMPORARILY ADD BENCHMARKS * ADD ADJUSTED MCLMC TUNING * CLEAN * UNIFY ADJUSTED MCLMC AND MCHMC * ADD INITIAL_POSITION * FIX TEST * CLEAN UP * REMOVE BENCHMARKS * ADD TEST * REMOVE BENCHMARKS * MODIFY WINDOW ADAPTATION TO TAKE INTEGRATOR * MODIFY WINDOW ADAPTATION TO TAKE INTEGRATOR * BUG FIX * CHANGE PRECISION * CHANGE PRECISION * ADD OMELYAN TEST * ADD ADJUSTED MCLMC TEST * ADD ADJUSTED MCLMC TEST * RENAME O * UPDATE STREAMING AVG * UPDATE STREAMING AVG * FIX MERGE * UPDATE PR * RENAME STD_MAT * RENAME STD_MAT * RENAME STD_MAT * MERGE MAIN * REMOVE COEFFICIENT EXPORTS * REMOVE COEFFICIENT EXPORTS * RESOLVE MYPY ISSUE * RESOLVE MYPY ISSUE * RETURN EXPECTATION HISTORY * FIX KWARG BUG * FIX KWARG BUG * FIX KWARG BUG IN ADJUSTED MCLMC * MAKE WINDOW ADAPTATION TAKE INTEGRATOR AS ARGUMENT * L_proposal_factor * SPLIT TUNING FOR AMCLMC INTO SEPARATE FILE * SPLIT TUNING FOR AMCLMC INTO SEPARATE FILE * RENAME STREAMING_AVERAGE_UPDATE ARGS IN ADJUSTED MCLMC ADAPTATION * diagnostics * fix bugs * FIX MINOR TUNING BUGS * UPDATE TUNING * UPDATE TUNING * UPDATE TUNING * names * test * tuning * update * ready for test * ready for test * ready for test * Update blackjax/adaptation/adjusted_mclmc_adaptation.py Co-authored-by: Junpeng Lao <[email protected]> * edit --------- Co-authored-by: Junpeng Lao <[email protected]>
* extracting taking last * test passing * layering * example * more * Adding another example * tests in place * rolling back changes * Adding test for num_mcmc_steps * format * better test coverage * linter * Flake8 * black * implementation[ * partial posteriors implementation * rolling back some changes * linter * fixing test * adding reference * typo * exposing in top level api * reruning precommit * up to now * one step working * fixes * tests passing * checkpoint tests passing * more * tests passing, implementation in place * tests passing * rounding * adding to init * rollbacks * rollback * rollback * docs * precommit * removing extra parameter * code review updates
* Remove meeting scheduling * Fix tests
* test CI * test CI * test CI: add static * test CI: add static * test CI: add static tests * Revert "test CI: add static" This reverts commit 2db919d. * Revert "test CI: add static" This reverts commit fa6558f. * test CI: add static tests * test CI: add static tests * test CI: add static tests * test CI: old tests * test CI: old tests * test CI: old tests with addition * test CI: old tests with addition of num tuning steps
* total_num_tuning_integrator_steps * Initial params for MCLMC adaptation
* impl * rename * docs --------- Co-authored-by: Junpeng Lao <[email protected]>
* energy error monitoring * energy error monitoring * jnp abs
* ping Jaxopt version to unbreak test * lower jaxopt version
…tics 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
- Add adjusted MCLMC and MCLMC adaptations from main - Add SMC pretuning functionality - Keep nested sampling (NS) and slice sampling (SS) features - Resolve import conflicts to support both feature sets - Update test infrastructure for new capabilities This merge brings the nested_sampling branch up to date with the latest main branch developments while preserving all NS/SS functionality. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
|
Closed as exercise will likely need to be repeated |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR merges the latest changes from the
mainbranch into thenested_samplingbranch to keep it up to date with recent developments.Changes Included from Main
Preserved Nested Sampling Features
Merge Resolution
This keeps the nested_sampling branch current while preserving all the specialized functionality for nested sampling and slice sampling algorithms.
🤖 Generated with Claude Code