Merge branch 'master' into FKEM_flexibility

.github/environment.yml

@@ -9,8 +9,9 @@ dependencies:
   - fftw
   - swig
   - pyyaml
-  - numpy
-  # The below is only because the currnt version of fast-pt uses deprecated scipy functions.
+  - numpy<2
+  # The below is only because the current version of fast-pt uses deprecated scipy functions.
+  # DarkEmulator also uses an old scipy.
   # We should remove the <1.14 flag as soon as this is fixed.
   - scipy<1.14
   - camb

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Unreleased
 
+# v3.1.2 Changes
+- Fixed dynamic versioning
+
+# v3.1.1 Changes
+- Update physical constants (#1196)
+- Fixed bug in Despali 2016 mass function (#1197)
+
 # v3.1 Changes
 - Docstring improvements (#1168, #1177, #1184).
 - Minor bugfixes (#1167, #1169, #1170, #1172, #1187, #1188).

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.5)
 if (NOT CMAKE_BUILD_TYPE)
     message(STATUS "No build type selected, default to Release")
     set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
@@ -8,7 +8,7 @@ MESSAGE( STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE} )
 # Adding customized cmake module
 list(APPEND CMAKE_MODULE_PATH  "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
-project(ccl VERSION 3.1)
+project(ccl VERSION 3.1.2)
 
 # Uncomment to get detailed build outputs
 # set( CMAKE_VERBOSE_MAKEFILE on )

benchmarks/test_ptpk_bacco_lbias.py

@@ -3,8 +3,17 @@
 import pyccl as ccl
 import pyccl.nl_pt as pt
 import pytest
+import platform
 
-LPTPK_TOLERANCE = 1e-4
+
+if platform.system() == 'Darwin':
+    # TODO: This test fails on macOS, even if it passes
+    # on linux using the same version of bacco. As a
+    # patch we are increasing the tolerance for macOS,
+    # but this should be investigated.
+    LPTPK_TOLERANCE = 1e-3
+else:
+    LPTPK_TOLERANCE = 1e-4
 
 # Set cosmology
 COSMO = ccl.Cosmology(Omega_c=0.25, Omega_b=0.05,
@@ -37,6 +46,8 @@
 
 @pytest.mark.parametrize('comb', enumerate(order))
 def test_pt_pk(comb):
+    import baccoemu
+    print(baccoemu.__version__)
     i_d, cc = comb
     t1, t2 = cc
 

pyccl/halos/halo_model.py

@@ -186,7 +186,7 @@ def number_counts(self, cosmo, *, selection,
             mint[i] = self._integrator(
                 dVda[i] * self._mf[..., :] * _selm[..., :],
                 self._lmass
-            )
+            ).squeeze()
 
         # now do scale factor integral
         return self._integrator(mint, a)