classy-szfast 0.0.15__py3-none-any.whl → 0.0.20__py3-none-any.whl

classy_szfast/config.py

@@ -1,10 +1,11 @@
 import os
 
 import get_cosmopower_emus
-
+import class_sz_data
 
 def get_cosmopower_path():
     get_cosmopower_emus.set()
     return os.getenv('PATH_TO_COSMOPOWER_ORGANIZATION')
 
 path_to_cosmopower_organization = get_cosmopower_path()
+class_sz_data.get_data_from_class_sz_repo(path_to_cosmopower_organization)

classy_szfast/restore_nn.py

@@ -18,7 +18,7 @@ with suppress_warnings():
     import tensorflow as tf
     tf.compat.v1.logging.set_verbosity(tf.compat.v1.logging.ERROR)
 dtype = tf.float32
-import pickle
+
 
 class Restore_NN(tf.keras.Model):
 
@@ -121,7 +121,10 @@ class Restore_NN(tf.keras.Model):
                              " does not exist."))
 
         with open(filename_npz, "rb") as fp:
-            fpz = np.load(fp)
+            fpz = np.load(fp, allow_pickle=True)["arr_0"].flatten()[0]
+
+            # print('filename_npz:', filename_npz)
+            # print("Keys in the .npz file:", list(fpz.keys()))
 
             self.architecture = fpz["architecture"]
             self.n_layers = fpz["n_layers"]
@@ -132,17 +135,35 @@ class Restore_NN(tf.keras.Model):
             self.parameters = list(fpz["parameters"])
             self.modes = fpz["modes"]
 
-            self.parameters_mean_ = fpz["parameters_mean"]
-            self.parameters_std_ = fpz["parameters_std"]
-            self.features_mean_ = fpz["features_mean"]
-            self.features_std_ = fpz["features_std"]
+            # self.parameters_mean_ = fpz["parameters_mean"]
+            # self.parameters_std_ = fpz["parameters_std"]
+            # self.features_mean_ = fpz["features_mean"]
+            # self.features_std_ = fpz["features_std"]
+
+            # Attempt to load 'parameters_mean' or fall back to 'param_train_mean'
+            self.parameters_mean_ = fpz.get("parameters_mean", fpz.get("param_train_mean"))
+            self.parameters_std_ = fpz.get("parameters_std", fpz.get("param_train_std"))
+            self.features_mean_ = fpz.get("features_mean", fpz.get("feature_train_mean"))
+            self.features_std_ = fpz.get("features_std", fpz.get("feature_train_std"))
+
+
+            # Fallback to 'weights_' if individual 'W_i' are not found
+            if "weights_" in fpz:
+                # Assign the list of weight arrays from 'weights_' directly
+                self.W_ = fpz["weights_"]
+            else:
+                # Use individual weight arrays if available
+                self.W_ = [fpz[f"W_{i}"] for i in range(self.n_layers)]
+
+            # Fallback to 'biases_' if individual 'b_i' are not found
+            if "biases_" in fpz:
+                self.b_ = fpz["biases_"]
+            else:
+                self.b_ = [fpz[f"b_{i}"] for i in range(self.n_layers)]
+
+            self.alphas_ = fpz[f"alphas_"]
+            self.betas_ = fpz[f"betas_"]
 
-            self.W_ = [fpz[f"W_{i}"] for i in range(self.n_layers)]
-            self.b_ = [fpz[f"b_{i}"] for i in range(self.n_layers)]
-            self.alphas_ = [
-                fpz[f"alphas_{i}"] for i in range(self.n_layers - 1)
-            ]
-            self.betas_ = [fpz[f"betas_{i}"] for i in range(self.n_layers - 1)]
 
     # auxiliary function to sort input parameters
     def dict_to_ordered_arr_np(self, 
@@ -342,7 +363,11 @@ class Restore_PCAplusNN(tf.keras.Model):
                              " does not exist."))
 
         with open(filename_npz, "rb") as fp:
-            fpz = np.load(fp)
+            fpz = np.load(fp, allow_pickle=True)["arr_0"].flatten()[0]
+
+            # print('filename_npz:', filename_npz)
+            # print("Keys in the .npz file:", list(fpz.keys()))
+
 
             self.architecture = fpz["architecture"]
             self.n_layers = fpz["n_layers"]
@@ -353,22 +378,62 @@ class Restore_PCAplusNN(tf.keras.Model):
             self.parameters = fpz["parameters"]
             self.modes = fpz["modes"]
 
-            self.parameters_mean_ = fpz["parameters_mean"]
-            self.parameters_std_ = fpz["parameters_std"]
-            self.features_mean_ = fpz["features_mean"]
-            self.features_std_ = fpz["features_std"]
+            # Attempt to load 'parameters_mean' or fall back to 'param_train_mean'
+            self.parameters_mean_ = fpz.get("parameters_mean", fpz.get("param_train_mean"))
+            self.parameters_std_ = fpz.get("parameters_std", fpz.get("param_train_std"))
+            self.features_mean_ = fpz.get("features_mean", fpz.get("feature_train_mean"))
+            self.features_std_ = fpz.get("features_std", fpz.get("feature_train_std"))
+
+            # Handle PCA-related keys
+            # self.pca_mean_ = fpz["pca_mean"]
+            # self.pca_std_ = fpz["pca_std"]
+            # self.n_pcas = fpz["n_pcas"]
 
             self.pca_mean_ = fpz["pca_mean"]
             self.pca_std_ = fpz["pca_std"]
             self.n_pcas = fpz["n_pcas"]
             self.pca_transform_matrix_ = fpz["pca_transform_matrix"]
 
-            self.W_ = [fpz[f"W_{i}"] for i in range(self.n_layers)]
-            self.b_ = [fpz[f"b_{i}"] for i in range(self.n_layers)]
-            self.alphas_ = [
-                fpz[f"alphas_{i}"] for i in range(self.n_layers - 1)
-            ]
-            self.betas_ = [fpz[f"betas_{i}"] for i in range(self.n_layers - 1)]
+            # print('n_pcas:', self.n_pcas)
+
+            # filename  = "/Users/boris/Work/CLASS-SZ/SO-SZ/cosmopower-organization/lcdm/TTTEEE/TE_v1.pkl"
+            # f = open(filename, 'rb')
+            # self.W_, self.b_, self.alphas_, self.betas_, \
+            # self.parameters_mean_, self.parameters_std_, \
+            # self.pca_mean_, self.pca_std_, \
+            # self.features_mean_, self.features_std_, \
+            # self.parameters, self.n_parameters, \
+            # self.modes, self.n_modes, \
+            # self.n_pcas, self.pca_transform_matrix_, \
+            # self.n_hidden, self.n_layers, self.architecture = pickle.load(f)
+
+            # print('self.n_pcas:', self.n_pcas)
+            # print('self.pca_transform_matrix_:', self.pca_transform_matrix_)
+            # print('PCA mean:', self.pca_mean_)
+            # print('PCA std:', self.pca_std_)
+            # f.close()
+            # import sys
+            # sys.exit(0)
+
+            # self.pca_transform_matrix_ = fpz["pca_transform_matrix"]        
+
+            # Fallback to 'weights_' if individual 'W_i' are not found
+            if "weights_" in fpz:
+                # Assign the list of weight arrays from 'weights_' directly
+                self.W_ = fpz["weights_"]
+            else:
+                # Use individual weight arrays if available
+                self.W_ = [fpz[f"W_{i}"] for i in range(self.n_layers)]
+
+            # Fallback to 'biases_' if individual 'b_i' are not found
+            if "biases_" in fpz:
+                self.b_ = fpz["biases_"]
+            else:
+                self.b_ = [fpz[f"b_{i}"] for i in range(self.n_layers)]
+
+            # Handle alphas and betas
+            self.alphas_ = fpz.get("alphas_", [fpz.get(f"alphas_{i}") for i in range(self.n_layers - 1)])
+            self.betas_ = fpz.get("betas_", [fpz.get(f"betas_{i}") for i in range(self.n_layers - 1)])
 
 
 

{classy_szfast-0.0.15.dist-info → classy_szfast-0.0.20.dist-info}/METADATA

@@ -1,14 +1,15 @@
 Metadata-Version: 2.1
 Name: classy_szfast
-Version: 0.0.15
+Version: 0.0.20
 Summary: The accelerator of the class_sz code from https://github.com/CLASS-SZ
 Maintainer-email: Boris Bolliet <bb667@cam.ac.uk>
 Project-URL: Homepage, https://github.com/CLASS-SZ
 Project-URL: GitHub, https://github.com/CLASS-SZ
 Description-Content-Type: text/markdown
-Requires-Dist: numpy >=1.19.0
-Requires-Dist: Cython >=0.29.21
+Requires-Dist: numpy>=1.19.0
+Requires-Dist: Cython>=0.29.21
 Requires-Dist: tensorflow
 Requires-Dist: mcfit
 Requires-Dist: get-cosmopower-emus
+Requires-Dist: class-sz-data
 

{classy_szfast-0.0.15.dist-info → classy_szfast-0.0.20.dist-info}/RECORD

@@ -1,18 +1,18 @@
 classy_szfast/__init__.py,sha256=E2thrL0Z9oXFfdzwcsu-xbOytudLFTlRlPqVFGlPPPg,279
 classy_szfast/classy_sz.py,sha256=QmbwrSXInQLMvCDqsr7KPmtaU0KOiOt1Rb-cTKuulZw,22240
 classy_szfast/classy_szfast.py,sha256=A06tLt_Slxd5TvSQLHaqmX2-Z0aI6p3nWo6jEQ2oWeM,33748
-classy_szfast/config.py,sha256=4CvejtLcFOQR30bJ8tlEeBHhu3Rr7LakeLO6dbFgPSU,210
+classy_szfast/config.py,sha256=0sx_r9diFJ3mR4zvuTGxN63wTw10sEw06FbFcjVWaB0,304
 classy_szfast/cosmopower.py,sha256=eym72TFAcSJSTUlrwD-sAg8_9e2GdZq0m3lLPQ7uvPU,9858
 classy_szfast/cosmosis_classy_szfast_interface.py,sha256=zAnxvFtn73a5yS7jgs59zpWFEYKCIQyraYPs5hQ4Le8,11483
 classy_szfast/pks_and_sigmas.py,sha256=drtuujE1HhlrYY1hY92DyY5lXlYS1uE15MSuVI4uo6k,6625
-classy_szfast/restore_nn.py,sha256=tmR6qPLvf9JzEwUECeDeF8pbbmvoOGKuQDPSbC4kDu0,18010
+classy_szfast/restore_nn.py,sha256=DqA9thhTRiGBDVb9zjhqcbF2W4V0AU0vrjJFhnLboU4,21075
 classy_szfast/suppress_warnings.py,sha256=6wIBml2Sj9DyRGZlZWhuA9hqvpxqrNyYjuz6BPK_a6E,202
 classy_szfast/utils.py,sha256=VdaRsJK2ttHI9zkyxVhergxHPC6t99usrlycblyqcP8,1464
 classy_szfast/custom_bias/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 classy_szfast/custom_bias/custom_bias.py,sha256=aR2t5RTIwv7P0m2bsEU0Eq6BTkj4pG10AebH6QpG4qM,486
 classy_szfast/custom_profiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 classy_szfast/custom_profiles/custom_profiles.py,sha256=4LZwb2XoqwCyWNmW2s24Z7AJdmgVdaRG7yYaBYe-d9Q,1188
-classy_szfast-0.0.15.dist-info/METADATA,sha256=OGZWiFxqf0ZY1yVr_VsMH-E5Fgs49R2ldrryTWlpGl0,472
-classy_szfast-0.0.15.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-classy_szfast-0.0.15.dist-info/top_level.txt,sha256=hRgqpilUck4lx2KkaWI2y9aCDKqF6pFfGHfNaoPFxv0,14
-classy_szfast-0.0.15.dist-info/RECORD,,
+classy_szfast-0.0.20.dist-info/METADATA,sha256=rIQVXCYoFtsApJw-q1eieIam5rGa8B2YU7oALMVeuUU,499
+classy_szfast-0.0.20.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+classy_szfast-0.0.20.dist-info/top_level.txt,sha256=hRgqpilUck4lx2KkaWI2y9aCDKqF6pFfGHfNaoPFxv0,14
+classy_szfast-0.0.20.dist-info/RECORD,,

{classy_szfast-0.0.15.dist-info → classy_szfast-0.0.20.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any