Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge emcee_batch Into dev #404

Open
wants to merge 60 commits into
base: dev
Choose a base branch
from
Open

Conversation

TimothyWillard
Copy link
Contributor

@TimothyWillard TimothyWillard commented Nov 21, 2024

Describe your changes.

This pull request makes the changes required to shape the emcee_batch branch into an appropriate format for dev.

Does this pull request make any user interface changes? If so please describe.

The user interface changes are:

  • The 'compartments' and 'seir' (and specifically a 'transitions' subsection) configuration sections are now required to create an instance of GempyorInference. Likely not a major change for users as any users doing inference are usually specifying compartments and transitions, but is a change for unit testing.

Those are reflected in updates to the documentation in the "Inference with EMCEE" GitBook documentation page.

What does your pull request address? Tag relevant issues.

This pull request addresses GH-403.

jcblemai and others added 30 commits September 16, 2024 00:09
jcblemai and others added 19 commits October 31, 2024 12:21
Merged in the remaining components of `gempyor` and resolved
corresponding conflicts.
Added a runtime error to `get_static_arguements` if `modinf`
compartments attribute is `None` and a corresponding test. Also
rearranged the logic in `ModelInfo.__init__` to always initialize a
`compartments` attribute, even if it's `None`.
* 'compartments' and 'seir' sections are now required in the config for
  inferece.
* Added logic to `get_static_arguments` to allow it to work without an
  'seir_modifiers' section in the config.
Updated test in `test_outcomes.py` to pass by adding the required
'compartments' and 'seir' sections to the config for inference.
Added required 'compartments' and 'seir' sections for inference to the
'config_npi.yml'.
Updated the 'config_npi_custom_pnames.yml' config to add the required
'compartments' and 'seir' sections for inference.
@TimothyWillard TimothyWillard added gempyor Concerns the Python core. batch Relating to batch processing. high priority High priority. inference Concerns the parameter inference framework. labels Nov 21, 2024
* Had to move seeding file to meet expected directory structure.
* Initialize `ModelInfo.npi_config_outcomes` with `None` always.
* Early exit for `read_parameters_from_config` if
  `ModelInfo.outcomes_config` is `None`.
Had to manually add seeding files to the `model_output/` directory to
make them work.
Add a 'transitions' section to the 'seir' config section to let the
`test_spatial_groups` NPIs test pass.
Added a bug fix to `compute_all_multioutcomes` to look for if a sourced
outcome exists and has not been processed yet and if so skip that
outcome for now and re-add it to the end of the outcomes to process.
Required for the `test_outcomes_pcomp` and
`test_outcomes_pcomp_read_write` tests to pass. Also minor edits to
`config_mc_selection.yml` to add the required 'compartments'/'seir'
sections.
@TimothyWillard TimothyWillard marked this pull request as ready for review November 22, 2024 18:21
@TimothyWillard
Copy link
Contributor Author

Didn't run automatically since I had this marked as draft, but manually ran them and GH actions do pass:

  1. gempyor: https://github.com/HopkinsIDD/flepiMoP/actions/runs/11978079961
  2. inference: https://github.com/HopkinsIDD/flepiMoP/actions/runs/11978250060

With commit 05b760b.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
batch Relating to batch processing. gempyor Concerns the Python core. high priority High priority. inference Concerns the parameter inference framework.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants