Skip to content

Move to camb 2 and refresh the lock - #362

Merged
cailmdaley merged 6 commits into
developfrom
fix/lift-scipy-cap-camb2
Sep 30, 2026
Merged

cailmdaley merged 6 commits into
developfrom
fix/lift-scipy-cap-camb2

Conversation

@cailmdaley

@cailmdaley cailmdaley commented Sep 28, 2026 •

Copy link
Copy Markdown
Collaborator

Version conflicts had started to build up in the stack, so the lock could no longer be refreshed. This PR moves to the latest releases, which resolves them:

  • pyproject.toml: camb>=2.0 and pyccl>=3.3.5, the first release whose CAMB path works on camb 2. The scipy cap is removed.
  • uv.lock: camb 2.0.4, scipy 1.18.1, pyccl 3.3.6, and cs_util and shear_psf_leakage at their develop heads. Nothing else moves.
  • test_glass_mock: the CAMB reference is regenerated under camb 2, and the tolerance is 5e-4. That absorbs CAMB version drift but still catches a real config change, which moves these numbers by 1e-3 or more.

Effect on results, camb 1.6.6 → 2.0.4. These come from the CosmoSIS pipeline (cosmosis_pipeline_A_ia.ini) at the fiducial values, on the v1.4.6 ξ± data and covariance:

quantity max relative change
σ8, S8, H(z), D_M(z), growth ≤2e-7
Ω_ν h² (m_ν = 0.06 eV) 5e-5
Y_He (new default BBN table) −8e-4
linear / nonlinear P(k), z ≤ 1 9e-4 (BAO scales)
ξ+ / ξ− 3.5e-4 / 4e-5
scale-cut data vector ≤0.001σ; Δχ² = 1e-6

Tests: pytest -m "not slow" gives the same counts as develop.

— Claude (Opus) on behalf of Cail

🤖 Generated with Claude Code

https://claude.ai/code/session_01LsAQRxNg6yDsUX4y2SWxTJ

cailmdaley and others added 3 commits September 28, 2026 13:11
camb 2.0 makes its BBN Y_He predictor return a scalar, so set_cosmology
works under scipy 1.18.0 (whose RectBivariateSpline returned shape (1,)
for scalar input) and the scipy cap has no reason to exist.

camb 2.0 moves the glass-mock CAMB fingerprint beyond the test's 1e-6
tolerance (As +1.4e-4, P(k) up to 2.9e-4 relative), so regenerate that
reference under camb 2.0.4. The test now pins camb.config.AccuracyTarget
to CAMB's default: pyccl's CAMB path sets that process-global to 0, which
made the reference test depend on whether a pyccl test ran first.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LsAQRxNg6yDsUX4y2SWxTJ
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…kage develop heads

cs_util develop@e14cd686 (CosmoStat/cs_util#93) and shear_psf_leakage
develop@649edf4a (CosmoStat/shear_psf_leakage#45) lift their scipy caps and
admit camb 2; shear_psf_leakage no longer pulls gsl or stats.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LsAQRxNg6yDsUX4y2SWxTJ
@cailmdaley cailmdaley changed the title Move to camb 2: lift the scipy cap, refresh the lock Move to camb 2 and refresh the lock Sep 28, 2026
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
cailmdaley and others added 2 commits September 30, 2026 14:56
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01W4pb4vZJimNoYkWqQCqEwR

@sachaguer sachaguer left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks goot to me!

@cailmdaley
cailmdaley merged commit ef8af50 into develop Sep 30, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants