classy-szfast 0.0.25.post12__tar.gz → 0.0.25.post14__tar.gz

{classy_szfast-0.0.25.post12 → classy_szfast-0.0.25.post14}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: classy_szfast
-Version: 0.0.25.post12
+Version: 0.0.25.post14
 Summary: The accelerator of the class_sz code from https://github.com/CLASS-SZ
 Maintainer-email: Boris Bolliet <bb667@cam.ac.uk>
 License: MIT

{classy_szfast-0.0.25.post12 → classy_szfast-0.0.25.post14}/classy_szfast/classy_szfast.py

@@ -173,9 +173,16 @@ class Class_szfast(object):
             self.cp_pkl_fftlog_alphas_imag_nn = cp_pkl_fftlog_alphas_imag_nn
 
         self.cosmo_model = 'ede-v2'
+
         self.use_Amod = 0
         self.Amod = 0 
-
+        
+        self.use_pk_z_bins = 0
+        self.pk_z_bins_z1 = 0
+        self.pk_z_bins_z2 = 0
+        self.pk_z_bins_A0 = 0
+        self.pk_z_bins_A1 = 0
+        self.pk_z_bins_A2 = 0
         
 
         if cosmo_model_dict[params_settings['cosmo_model']] == 'ede-v2':
@@ -223,6 +230,15 @@ class Class_szfast(object):
                 self.use_Amod = v
                 self.Amod  = params_settings['Amod']
 
+            if k == 'use_pk_z_bins':
+                self.use_pk_z_bins = v
+                self.pk_z_bins_z1 = params_settings['pk_z_bins_z1']
+                self.pk_z_bins_z2 = params_settings['pk_z_bins_z2']
+                self.pk_z_bins_A0 = params_settings['pk_z_bins_A0']
+                self.pk_z_bins_A1 = params_settings['pk_z_bins_A1']
+                self.pk_z_bins_A2 = params_settings['pk_z_bins_A2']
+
+
 
 
         if cosmo_model_dict[params_settings['cosmo_model']] == 'ede-v2':
@@ -535,6 +551,19 @@ class Class_szfast(object):
                 pk_ae  = pkl_p + self.Amod*(pknl_p-pkl_p)
                 predicted_pk_spectrum_z.append(pk_ae)
 
+        elif self.use_pk_z_bins:
+            # print('>>> using pk_z_bins')
+            for zp in z_arr:
+                params_dict_pp = params_dict.copy()
+                params_dict_pp['z_pk_save_nonclass'] = [zp]
+                pkl_p = self.cp_pkl_nn[self.cosmo_model].predictions_np(params_dict_pp)[0]
+                if zp < self.pk_z_bins_z1:
+                    pklp = self.pk_z_bins_A0*pkl_p
+                elif zp < self.pk_z_bins_z2:
+                    pklp = self.pk_z_bins_A1*pkl_p
+                else:
+                    pklp = self.pk_z_bins_A2*pkl_p
+                predicted_pk_spectrum_z.append(pklp)
         else:
 
             for zp in z_arr:

{classy_szfast-0.0.25.post12 → classy_szfast-0.0.25.post14}/classy_szfast/cosmopower_jax.py

@@ -7,6 +7,7 @@ from .suppress_warnings import suppress_warnings
 from .emulators_meta_data import *
 
 from cosmopower_jax.cosmopower_jax import CosmoPowerJAX as CPJ
+from jax.errors import TracerArrayConversionError
 
 
 cp_tt_nn_jax = {}
@@ -28,6 +29,32 @@ class CosmoPowerJAX_custom(CPJ):
         if 'ten_to_predictions' in kwargs.keys():
             self.ten_to_predictions = kwargs['ten_to_predictions']
 
+    def _dict_to_ordered_arr_np(self,
+                               input_dict,
+                               ):
+        """
+        Sort input parameters. Takend verbatim from CP 
+        (https://github.com/alessiospuriomancini/cosmopower/blob/main/cosmopower/cosmopower_NN.py#LL291C1-L308C73)
+
+        Parameters:
+            input_dict (dict [numpy.ndarray]):
+                input dict of (arrays of) parameters to be sorted
+
+        Returns:
+            numpy.ndarray:
+                parameters sorted according to desired order
+        """
+        if self.parameters is not None:
+            try:
+                return np.stack([input_dict[k] for k in self.parameters], axis=1)
+            except TracerArrayConversionError:
+                converted_dict = {k: jnp.array(v) if isinstance(v, list) else v for k, v in input_dict.items()}
+                return jnp.stack([converted_dict[k] for k in self.parameters], axis=1)
+
+        else:
+            return np.stack([input_dict[k] for k in input_dict], axis=1)
+
+
     def _predict(self, weights, hyper_params, param_train_mean, param_train_std,
                  feature_train_mean, feature_train_std, input_vec):
         """ Forward pass through pre-trained network.

{classy_szfast-0.0.25.post12 → classy_szfast-0.0.25.post14}/classy_szfast.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: classy_szfast
-Version: 0.0.25.post12
+Version: 0.0.25.post14
 Summary: The accelerator of the class_sz code from https://github.com/CLASS-SZ
 Maintainer-email: Boris Bolliet <bb667@cam.ac.uk>
 License: MIT

{classy_szfast-0.0.25.post12 → classy_szfast-0.0.25.post14}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
-version = "0.0.25.post12"
+version = "0.0.25.post14"
 license = { text = "MIT" }
 name = "classy_szfast"
 maintainers = [{name = "Boris Bolliet",email="bb667@cam.ac.uk"}]