Skip to content

Commit 9d7031e

Browse files
JesusTorradocmbant
andauthored
Replace clik with clipy for Planck likelihoods and deprecation of Planck 2025 -- Duplicate of #427 (#444)
Co-authored-by: Antony Lewis <[email protected]>
1 parent 4fef870 commit 9d7031e

Some content is hidden

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

45 files changed

+372
-1367
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Cobaya Tests
55
on: [push, pull_request]
66

77
env:
8-
COBAYA_INSTALL_SKIP_BASE: planck_2015,CamSpec2021,2018_highl_CamSpec,unbinned,keck
8+
COBAYA_INSTALL_SKIP_BASE: CamSpec2021,2018_highl_CamSpec,unbinned,keck
99
COBAYA_PACKAGES_PATH: ../packages
1010

1111
jobs:

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
- Documentation can now be built as markdown for LLM context. Flat context file provided.
99
- Periodic sampled parameters implemented (for now fully supported by MCMC only), as well as tagging of derived parameters as periodic for analysis with GetDist.
1010

11+
### Cosmology
12+
13+
- Planck `clik`-based likelihoods now use the new `clipy` Python implementation
14+
- Planck 2015 likelihoods deprecated
15+
1116
## 3.5.7 - 2025-03-31
1217

1318
### General

cobaya/cosmo_input/input_database.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,8 +1148,7 @@
11481148
install_tests = deepcopy(install_basic)
11491149
install_tests["likelihood"].update(
11501150
{
1151-
"planck_2015_lowl": None,
1152-
"planck_2018_highl_plik.TT_unbinned": None,
1151+
"planck_2018_highl_plik.TT": None,
11531152
"planck_2018_highl_plik.TT_lite_native": None,
11541153
"planck_2018_highl_CamSpec.TT": None,
11551154
"planck_2018_highl_CamSpec2021.TT": None,

cobaya/install.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ def install(*infos, **kwargs):
198198
unknown_components = [] # could not be identified
199199
failed_components = [] # general errors
200200
obsolete_components = [] # older or unknown version already installed
201+
incompatible_components = [] # not compatible with current OS
201202
skip_keywords_arg = set(kwargs.get("skip") or [])
202203
# NB: if passed with quotes as `--skip "a b"`, it's interpreted as a single key
203204
skip_keywords_arg = set(chain(*[word.split() for word in skip_keywords_arg]))
@@ -304,10 +305,10 @@ def _imported_class():
304305
name_w_kind = imported_class.get_kind() + ":" + component
305306
is_compatible = getattr(imported_class, "is_compatible", lambda: True)()
306307
if not is_compatible:
307-
logger.error(
308+
logger.info(
308309
f"Skipping '{name_w_kind}' because it is not compatible with your OS."
309310
)
310-
failed_components += [name_w_kind]
311+
incompatible_components += [name_w_kind]
311312
continue
312313
logger.info("Checking if dependencies have already been installed...")
313314
is_installed = getattr(imported_class, "is_installed", None)
@@ -466,6 +467,12 @@ def _imported_class():
466467
),
467468
bullet + bullet.join(obsolete_components),
468469
)
470+
if incompatible_components:
471+
logger.warning(
472+
"The following components were skipped because they are not compatible "
473+
"with your OS: %s",
474+
bullet + bullet.join(incompatible_components),
475+
)
469476
if not unknown_components and not failed_components and not obsolete_components:
470477
logger.info(
471478
"All requested components' dependencies correctly installed at "

cobaya/likelihoods/base_classes/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from .InstallableLikelihood import InstallableLikelihood as InstallableLikelihood
88
from .Mb import Mb as Mb
99
from .planck_2018_CamSpec_python import Planck2018CamSpecPython as Planck2018CamSpecPython
10-
from .planck_clik import Planck2015Clik as Planck2015Clik
1110
from .planck_clik import Planck2018Clik as Planck2018Clik
1211
from .planck_clik import PlanckClik as PlanckClik
1312
from .planck_pliklite import PlanckPlikLite as PlanckPlikLite

0 commit comments

Comments
 (0)