classy-szfast 0.0.15__tar.gz → 0.0.20__tar.gz

{classy_szfast-0.0.15/classy_szfast.egg-info → classy_szfast-0.0.20}/PKG-INFO

@@ -1,6 +1,6 @@
 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
@@ -11,3 +11,4 @@ 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 → classy_szfast-0.0.20}/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-0.0.15 → classy_szfast-0.0.20}/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 → classy_szfast-0.0.20/classy_szfast.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 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
@@ -11,3 +11,4 @@ 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 → classy_szfast-0.0.20}/classy_szfast.egg-info/SOURCES.txt

@@ -1,11 +1,5 @@
-.gitignore
-MANIFEST.in
 README.md
-pypi_upload.sh
 pyproject.toml
-requirements.txt
-setup.cfg
-setup.py
 classy_szfast/__init__.py
 classy_szfast/classy_sz.py
 classy_szfast/classy_szfast.py

{classy_szfast-0.0.15 → classy_szfast-0.0.20}/classy_szfast.egg-info/requires.txt

@@ -3,3 +3,4 @@ Cython>=0.29.21
 tensorflow
 mcfit
 get_cosmopower_emus
+class_sz_data

{classy_szfast-0.0.15 → classy_szfast-0.0.20}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
-dynamic = ["version"]
+version = "0.0.20"
 name = "classy_szfast"
 maintainers = [{name = "Boris Bolliet",email="bb667@cam.ac.uk"}]
 description = "The accelerator of the class_sz code from https://github.com/CLASS-SZ"
@@ -13,9 +13,10 @@ dependencies = [
     "Cython>=0.29.21",
     "tensorflow",
     "mcfit",
-    "get_cosmopower_emus"
+    "get_cosmopower_emus",
+    "class_sz_data"
 ]
 
 [project.urls]
 Homepage = "https://github.com/CLASS-SZ"
-GitHub = "https://github.com/CLASS-SZ"
+GitHub = "https://github.com/CLASS-SZ"

classy_szfast-0.0.20/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

classy_szfast-0.0.15/.gitignore

@@ -1,6 +0,0 @@
-
-.DS_Store
-*egg-info
-test_classy_szfast.py
-test_classy_szfast-mnu3state.py 
-__pycache__

classy_szfast-0.0.15/MANIFEST.in

@@ -1 +0,0 @@
-

classy_szfast-0.0.15/pypi_upload.sh

@@ -1,44 +0,0 @@
-#!/bin/bash
-
-# Ensure to manually update the version number in setup.py before running this script
-
-# Function to increment version
-increment_version() {
-  current_version=$(grep -Eo 'version="[^"]*' setup.py | cut -d'"' -f2)
-  IFS='.' read -r -a version_parts <<< "$current_version"
-
-  major=${version_parts[0]}
-  minor=${version_parts[1]}
-  patch=${version_parts[2]}
-
-  patch=$((patch + 1))
-  if [ $patch -ge 100 ]; then
-    patch=0
-    minor=$((minor + 1))
-  fi
-  if [ $minor -ge 100 ]; then
-    minor=0
-    major=$((major + 1))
-  fi
-
-  new_version="$major.$minor.$patch"
-
-  # Update the setup.py with the new version
-  sed -i '' "s/version=\"$current_version\"/version=\"$new_version\"/" setup.py
-}
-
-# Increment the version
-increment_version
-
-
-# Remove old build files
-rm -rf build dist *.egg-info
-
-# Build the package
-python setup.py sdist bdist_wheel
-
-# Upload the package
-twine upload dist/*
-
-# Clean up build directories
-rm -rf build dist *.egg-info

classy_szfast-0.0.15/requirements.txt

@@ -1,2 +0,0 @@
-tensorflow
-mcfit 

classy_szfast-0.0.15/setup.cfg

@@ -1,14 +0,0 @@
-[metadata]
-description-file = README.md
-
-[options]
-install_requires = 
-	tensorflow==2.13.0
-	tensorflow-probability==0.21.0
-	cosmopower
-	mcfit
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

classy_szfast-0.0.15/setup.py

@@ -1,4 +0,0 @@
-from setuptools import setup
-
-if __name__ == "__main__":
-    setup(version="0.0.15")