From 6e6d5d0e3a24acc2d6e7964a11877afb477fd757 Mon Sep 17 00:00:00 2001 From: Lanqing Yuan Date: Tue, 30 Jul 2024 00:41:47 -0500 Subject: [PATCH 1/6] Document to increase CPUs (#178) * Update README.md * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Robert Hammann <53221264+hammannr@users.noreply.github.com> --- alea/submitters/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alea/submitters/README.md b/alea/submitters/README.md index 9e6d5d8..f9fd5e8 100644 --- a/alea/submitters/README.md +++ b/alea/submitters/README.md @@ -32,7 +32,7 @@ Following this as an example htcondor_configurations: template_path: "/ospool/uc-shared/project/xenon/binference_common/binference_common/nt_cevns_templates/v7" cluster_size: 1 - request_cpus: 1 + request_cpus: 4 request_memory: 2000 request_disk: 2000000 combine_disk: 20000000 @@ -46,7 +46,7 @@ htcondor_configurations: ``` - `template_path`: where you put your input templates. Note that **all files have to have unique names**. All templates inside will be tarred and the tarball will be uploaded to the grid when computing. - `cluster_size`: clustering multiple `alea-run_toymc` jobs into a single job. For example, now you expect to run 100 individual `alea-run_toymc` jobs, and you specified `cluster_size: 10`, there will be only 10 `alea-run_toymc` in the end, each containing 10 jobs to run in sequence. Unless you got crazy amount of jobs like >200, I don't recommend changing it from 1. -- `request_cpus`: number of CPUs for each job. The default 1 should be good. +- `request_cpus`: number of CPUs for each job. It should be larger than alea max multi-threading number, otherwise OSG will complains. - `request_memory`: requested memory for each job in unit of MB. Please don't put a number larger than what you need, because it will significantly reduce our available slots. - `request_disk`: requested disk for each job in unit of KB. Please don't put a number larger than what you need, because it will significantly reduce our available slots. - `combine_disk`: requested disk for combine job in unit of KB. In most cases 20GB is enough. From 14572cd2387b896fce2c76ac31cb94ee187cb1ee Mon Sep 17 00:00:00 2001 From: Robert Hammann Date: Tue, 30 Jul 2024 07:47:08 +0200 Subject: [PATCH 2/6] =?UTF-8?q?Bump=20version:=200.2.4=20=E2=86=92=200.2.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- alea/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 8939913..147fc07 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.4 +current_version = 0.2.5 files = setup.py alea/__init__.py commit = True tag = True diff --git a/alea/__init__.py b/alea/__init__.py index 11d8efc..4ca3949 100644 --- a/alea/__init__.py +++ b/alea/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.2.4" +__version__ = "0.2.5" from .parameters import * diff --git a/setup.py b/setup.py index dfa4233..87e1b97 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def open_requirements(path): setuptools.setup( name="alea-inference", - version="0.2.4", + version="0.2.5", description="A tool to perform toyMC-based inference constructions", author="Alea contributors, the XENON collaboration", long_description=readme + "\n\n" + history, From 6432d0f3db4bb7bca0a6c5fbc06da178d0a45fae Mon Sep 17 00:00:00 2001 From: Robert Hammann Date: Tue, 30 Jul 2024 07:48:15 +0200 Subject: [PATCH 3/6] writing history --- HISTORY.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index fd862ee..1de85ef 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,28 @@ +## What's Changed +* Consistent sorting for BlueiceExtendedModel by @hammannr in https://github.com/XENONnT/alea/pull/149 +* Fixed data storing by @hammannr in https://github.com/XENONnT/alea/pull/152 +* Add lxml_html_clean to fix readthedocs building error by @zihaoxu98 in https://github.com/XENONnT/alea/pull/157 +* Fitting index variables by @zihaoxu98 in https://github.com/XENONnT/alea/pull/156 +* Print Argument combinations to be submitted by @hammannr in https://github.com/XENONnT/alea/pull/151 +* Minor changes to fitting index variables (PR #156) by @hammannr in https://github.com/XENONnT/alea/pull/159 +* Set `i_batch` for `SubmitterLocal` when submitting by @dachengx in https://github.com/XENONnT/alea/pull/164 +* Debug for interpolator deduction of `NeymanConstructor` by @dachengx in https://github.com/XENONnT/alea/pull/165 +* The first i batch should be 0 by @dachengx in https://github.com/XENONnT/alea/pull/166 +* Try prefix every file path in likelihood configuration with template folder by @dachengx in https://github.com/XENONnT/alea/pull/169 +* Forbid prexing every key when adapt_likelihood_config_for_blueice by @FaroutYLq in https://github.com/XENONnT/alea/pull/170 +* Refactored Pegasus-based OSG submitter by @FaroutYLq in https://github.com/XENONnT/alea/pull/163 +* Try fixing https://github.com/XENONnT/alea/issues/173 by @dachengx in https://github.com/XENONnT/alea/pull/176 +* Allow assigning kwargs in debug mode by @dachengx in https://github.com/XENONnT/alea/pull/174 +* Allow `confidence_level` in filename by @dachengx in https://github.com/XENONnT/alea/pull/179 +* Add 68% coverage as one of the defaults of `confidence_levels` by @dachengx in https://github.com/XENONnT/alea/pull/180 +* Document to increase CPUs by @FaroutYLq in https://github.com/XENONnT/alea/pull/178 + +## New Contributors +* @FaroutYLq made their first contribution in https://github.com/XENONnT/alea/pull/170 + +**Full Changelog**: https://github.com/XENONnT/alea/compare/v0.2.4...v0.2.5 + + 0.2.4 / 2024-03-18 ------------------ * Point away from alea for physics models by @kdund in https://github.com/XENONnT/alea/pull/143 From 0af5858dc4a98375466ee139765fdb63506a10fa Mon Sep 17 00:00:00 2001 From: Dacheng Xu Date: Wed, 31 Jul 2024 16:51:14 +0800 Subject: [PATCH 4/6] Defunctionalize `apply_efficiency`, apply efficiency when `efficiency_name` is specified (#183) * Defunctionalize `apply_efficiency` * debug --- alea/examples/configs/unbinned_wimp_statistical_model.yaml | 2 -- .../unbinned_wimp_statistical_model_template_source_test.yaml | 2 -- alea/models/blueice_extended_model.py | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/alea/examples/configs/unbinned_wimp_statistical_model.yaml b/alea/examples/configs/unbinned_wimp_statistical_model.yaml index d09f1d4..22fd92b 100644 --- a/alea/examples/configs/unbinned_wimp_statistical_model.yaml +++ b/alea/examples/configs/unbinned_wimp_statistical_model.yaml @@ -101,7 +101,6 @@ likelihood_config: named_parameters: - wimp_mass template_filename: wimp{wimp_mass:d}gev_template.ii.h5 - apply_efficiency: True efficiency_name: signal_efficiency # SR1 @@ -134,5 +133,4 @@ likelihood_config: named_parameters: - wimp_mass template_filename: wimp{wimp_mass:d}gev_template.ii.h5 - apply_efficiency: True efficiency_name: signal_efficiency diff --git a/alea/examples/configs/unbinned_wimp_statistical_model_template_source_test.yaml b/alea/examples/configs/unbinned_wimp_statistical_model_template_source_test.yaml index ebb80e7..5c3dce8 100644 --- a/alea/examples/configs/unbinned_wimp_statistical_model_template_source_test.yaml +++ b/alea/examples/configs/unbinned_wimp_statistical_model_template_source_test.yaml @@ -93,7 +93,6 @@ likelihood_config: - wimp_mass - signal_efficiency template_filename: wimp50gev_template.ii.h5 - apply_efficiency: True efficiency_name: signal_efficiency # SR3, 1D inference on cS2 space @@ -127,5 +126,4 @@ likelihood_config: - signal_efficiency template_filename: wimp50gev_template.ii.h5 spectrum_name: test_cs1_spectrum.json - apply_efficiency: True efficiency_name: signal_efficiency diff --git a/alea/models/blueice_extended_model.py b/alea/models/blueice_extended_model.py index d0be28a..0506b1a 100644 --- a/alea/models/blueice_extended_model.py +++ b/alea/models/blueice_extended_model.py @@ -360,7 +360,7 @@ def _build_ll_from_config( ) # set efficiency parameters - if source.get("apply_efficiency", False): + if source.get("efficiency_name", None): self._set_efficiency(source, ll) # set shape parameters From 6d74bee67a4d034cf83e455ca9348737c26ca8b4 Mon Sep 17 00:00:00 2001 From: Dacheng Xu Date: Wed, 31 Jul 2024 16:58:07 +0800 Subject: [PATCH 5/6] Bump to v0.2.6 (#184) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update HISTORY.md * Bump version: 0.2.5 → 0.3.0 * v0.2.6 --- .bumpversion.cfg | 2 +- HISTORY.md | 12 ++++++++++-- alea/__init__.py | 2 +- setup.py | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 147fc07..12ac14e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.5 +current_version = 0.2.6 files = setup.py alea/__init__.py commit = True tag = True diff --git a/HISTORY.md b/HISTORY.md index 1de85ef..0684941 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,12 @@ -## What's Changed +0.2.6 / 2024-07-31 +------------------ +* Defunctionalize `apply_efficiency`, apply efficiency when `efficiency_name` is specified by @dachengx in https://github.com/XENONnT/alea/pull/183 + +**Full Changelog**: https://github.com/XENONnT/alea/compare/v0.2.5...v0.3.0 + + +0.2.5 / 2024-07-30 +------------------ * Consistent sorting for BlueiceExtendedModel by @hammannr in https://github.com/XENONnT/alea/pull/149 * Fixed data storing by @hammannr in https://github.com/XENONnT/alea/pull/152 * Add lxml_html_clean to fix readthedocs building error by @zihaoxu98 in https://github.com/XENONnT/alea/pull/157 @@ -17,7 +25,7 @@ * Add 68% coverage as one of the defaults of `confidence_levels` by @dachengx in https://github.com/XENONnT/alea/pull/180 * Document to increase CPUs by @FaroutYLq in https://github.com/XENONnT/alea/pull/178 -## New Contributors +New Contributors * @FaroutYLq made their first contribution in https://github.com/XENONnT/alea/pull/170 **Full Changelog**: https://github.com/XENONnT/alea/compare/v0.2.4...v0.2.5 diff --git a/alea/__init__.py b/alea/__init__.py index 4ca3949..6435676 100644 --- a/alea/__init__.py +++ b/alea/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.2.5" +__version__ = "0.2.6" from .parameters import * diff --git a/setup.py b/setup.py index 87e1b97..b15f7f1 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def open_requirements(path): setuptools.setup( name="alea-inference", - version="0.2.5", + version="0.2.6", description="A tool to perform toyMC-based inference constructions", author="Alea contributors, the XENON collaboration", long_description=readme + "\n\n" + history, From dbfbb8fc17691991a8c545c57e28dafdff959787 Mon Sep 17 00:00:00 2001 From: Robert Hammann <53221264+hammannr@users.noreply.github.com> Date: Wed, 31 Jul 2024 17:00:57 +0200 Subject: [PATCH 6/6] Update pypi_install.yml (#185) --- .github/workflows/pypi_install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypi_install.yml b/.github/workflows/pypi_install.yml index ac2373c..437e978 100644 --- a/.github/workflows/pypi_install.yml +++ b/.github/workflows/pypi_install.yml @@ -5,7 +5,7 @@ name: PyPI on: workflow_dispatch: release: - types: [ created ] + types: [published] jobs: build: