foscat 3.0.17__tar.gz → 3.0.19__tar.gz

{foscat-3.0.17 → foscat-3.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.0.17
+Version: 3.0.19
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Home-page: https://github.com/jmdelouis/FOSCAT
 Author: Jean-Marc DELOUIS

{foscat-3.0.17 → foscat-3.0.19}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='foscat',
-    version='3.0.17',
+    version='3.0.19',
     description='Generate synthetic Healpix or 2D data using Cross Scattering Transform' ,
     long_description='Utilize the Cross Scattering Transform (described in https://arxiv.org/abs/2207.12527) to synthesize Healpix or 2D data that is suitable for component separation purposes, such as denoising. \n A demo package for this process can be found at https://github.com/jmdelouis/FOSCAT_DEMO. \n Complete doc can be found at https://foscat-documentation.readthedocs.io/en/latest/index.html. \n\n List of developers : J.-M. Delouis, T. Foulquier, L. Mousset, T. Odaka, F. Paul, E. Allys ' ,
     license='MIT',

{foscat-3.0.17 → foscat-3.0.19}/src/foscat/FoCUS.py

@@ -5,7 +5,7 @@ import foscat.backend as bk
 from scipy.interpolate import griddata
 
 
-TMPFILE_VERSION='V2_6'
+TMPFILE_VERSION='V3_0'
 
 class FoCUS:
     def __init__(self,
@@ -32,7 +32,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.0.17'
+        self.__version__ = '3.0.19'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None
@@ -872,7 +872,7 @@ class FoCUS:
         except:
             if self.use_2D==False:
                 if self.KERNELSZ*self.KERNELSZ>12*nside*nside:
-                    l_kernel=2*nside
+                    l_kernel=3
                     
                 aa=np.cos(np.arange(self.NORIENT)/self.NORIENT*np.pi).reshape(1,self.NORIENT)
                 bb=np.sin(np.arange(self.NORIENT)/self.NORIENT*np.pi).reshape(1,self.NORIENT)
@@ -890,14 +890,19 @@ class FoCUS:
                     lidx=np.arange(12*nside*nside)
 
                 pw=np.pi/4.0
-                pw2=1/2.0
-        
+                pw2=1/2
+                amp=1.0
+                
                 if l_kernel==5:
                     pw=np.pi/4.0
-                    pw2=1/2.0
+                    pw2=1/2.25
+                    amp=1.0/9.2038
+                    
                 elif l_kernel==3:
-                    pw=1.0
+                    pw=1.0/np.sqrt(2)
                     pw2=1.0
+                    amp=1/8.45
+                    
                 elif l_kernel==7:
                     pw=np.pi/4.0
                     pw2=1.0/3.0
@@ -920,7 +925,7 @@ class FoCUS:
                     w=np.exp(-pw2*delta[pidx]*(nside**2))
                     pidx=pidx[np.argsort(-w)[0:l_kernel**2]]
                     pidx=pidx[np.argsort(lidx[pidx])]
-                    
+
                     w=np.exp(-pw2*delta[pidx]*(nside**2))
                     iwav[k]=lidx[pidx]
                     wwav[k]=w
@@ -935,7 +940,7 @@ class FoCUS:
                     wav[k,:,:]=(np.cos(xx*aa+yy*bb)+complex(0.0,1.0)*np.sin(xx*aa+yy*bb))*np.expand_dims(w,-1)
     
                 wav=wav-np.expand_dims(np.mean(wav,1),1)
-                wav=wav/np.expand_dims(np.std(wav,1),1)
+                wav=amp*wav/np.expand_dims(np.std(wav,1),1)
                 wwav=wwav/np.expand_dims(np.sum(wwav,1),1)
                 
                 nk=l_kernel*l_kernel

{foscat-3.0.17 → foscat-3.0.19}/src/foscat/backend.py

@@ -38,17 +38,20 @@ class foscat_backend:
             self.BACKEND=self.TENSORFLOW
             #tf.config.threading.set_inter_op_parallelism_threads(1)
             #tf.config.threading.set_intra_op_parallelism_threads(1)
+            self.tf_function = tf.function
 
         if self.BACKEND=='torch':
             import torch
             self.BACKEND=self.TORCH
             self.backend=torch
+            self.tf_function = self.tf_loc_function
             
         if self.BACKEND=='numpy':
             self.BACKEND=self.NUMPY
             self.backend=np
             import scipy as scipy
             self.scipy=scipy
+            self.tf_function = self.tf_loc_function
             
         self.float64=self.backend.float64
         self.float32=self.backend.float32
@@ -114,7 +117,10 @@ class foscat_backend:
             except RuntimeError as e:
                 # Memory growth must be set before GPUs have been initialized
                 print(e)
-
+                
+    def tf_loc_function(self,func):
+        return func
+    
     def calc_iso_orient(self,norient):
         tmp=np.zeros([norient*norient,norient])
         for i in range(norient):

{foscat-3.0.17 → foscat-3.0.19}/src/foscat/scat.py

@@ -1,10 +1,19 @@
 import foscat.FoCUS as FOC
 import numpy as np
-import tensorflow as tf
 import pickle
 import foscat.backend as bk
 import healpy as hp
+import sys
   
+# Vérifier si TensorFlow est importé et défini
+tf_defined = 'tensorflow' in sys.modules
+
+if tf_defined:
+    tf_function = tf.function  # Facultatif : si vous voulez utiliser TensorFlow dans ce script
+else:
+    def tf_function(func):
+        return func
+    
 def read(filename):
     thescat=scat(1,1,1,1,1,[0],[0])
     return thescat.read(filename)
@@ -1392,7 +1401,7 @@ class funct(FOC.FoCUS):
     def one(self):
         return scat(1.0,1.0,1.0,1.0,1.0,[0],[0],backend=self.backend)
 
-    @tf.function
+    @tf_function
     def eval_comp_fast(self, image1, image2=None,mask=None,Auto=True,s0_off=1E-6):
 
         res=self.eval(image1, image2=image2,mask=mask,Auto=Auto,s0_off=s0_off)

{foscat-3.0.17 → foscat-3.0.19}/src/foscat/scat1D.py

@@ -1,9 +1,18 @@
 import foscat.FoCUS as FOC
 import numpy as np
-import tensorflow as tf
 import pickle
 import foscat.backend as bk
-  
+import sys
+
+# Vérifier si TensorFlow est importé et défini
+tf_defined = 'tensorflow' in sys.modules
+
+if tf_defined:
+    tf_function = tf.function  # Facultatif : si vous voulez utiliser TensorFlow dans ce script
+else:
+    def tf_function(func):
+        return func
+    
 def read(filename):
     thescat=scat1D(1,1,1,1,1,[0],[0])
     return thescat.read(filename)
@@ -1050,12 +1059,12 @@ class funct(FOC.FoCUS):
     def one(self):
         return scat1D(1.0,1.0,1.0,1.0,1.0,[0],[0],backend=self.backend)
 
-    @tf.function
     def eval_comp_fast(self, image1, image2=None,mask=None,Auto=True,s0_off=1E-6):
 
-        res=self.eval(image1, image2=image2,mask=mask,Auto=Auto,s0_off=s0_off)
+        res=self.eval_fast(image1, image2=image2,mask=mask,Auto=Auto,s0_off=s0_off)
         return res.P00,res.S0,res.S1,res.S2,res.S2L,res.j1,res.j2
 
+    @tf_function
     def eval_fast(self, image1, image2=None,mask=None,Auto=True,s0_off=1E-6):
         p0,s0,s1,s2,s2l,j1,j2=self.eval_comp_fast(image1, image2=image2,mask=mask,Auto=Auto,s0_off=s0_off)
         return scat1D(p0,s0,s1,s2,s2l,j1,j2,backend=self.backend)

{foscat-3.0.17 → foscat-3.0.19}/src/foscat/scat_cov.py

@@ -1,10 +1,19 @@
 import foscat.FoCUS as FOC
 import numpy as np
 import foscat.backend as bk
-#import tensorflow as tf
 import pickle
 import healpy as hp
+import sys
 
+# Vérifier si TensorFlow est importé et défini
+tf_defined = 'tensorflow' in sys.modules
+
+if tf_defined:
+    tf_function = tf.function  # Facultatif : si vous voulez utiliser TensorFlow dans ce script
+else:
+    def tf_function(func):
+        return func
+    
 def read(filename):
     thescat = scat_cov(1, 1, 1, 1)
     return thescat.read(filename)
@@ -2418,9 +2427,8 @@ class funct(FOC.FoCUS):
                                 x.domult(sig.C11,x.C11)*x.domult(sig.C11,x.C11),
                                 backend=self.backend)
         return(self.NORIENT)
-    """
-    @tf.function
-    """
+    
+    @tf_function
     def eval_comp_fast(self, image1, image2=None,mask=None,norm=None, Auto=True,cmat=None,cmat2=None):
 
         res=self.eval(image1, image2=image2,mask=mask,Auto=Auto,cmat=cmat,cmat2=cmat2)

{foscat-3.0.17 → foscat-3.0.19}/src/foscat/scat_cov1D.py

@@ -1,10 +1,20 @@
 import foscat.FoCUS as FOC
 import numpy as np
 import foscat.backend as bk
-import tensorflow as tf
 import pickle
 import matplotlib.pyplot as plt
+import sys
 
+
+# Vérifier si TensorFlow est importé et défini
+tf_defined = 'tensorflow' in sys.modules
+
+if tf_defined:
+    tf_function = tf.function  # Facultatif : si vous voulez utiliser TensorFlow dans ce script
+else:
+    def tf_function(func):
+        return func
+    
 def read(filename):
     thescat = scat_cov1D(1, 1, 1)
     return thescat.read(filename)
@@ -1461,7 +1471,7 @@ class funct(FOC.FoCUS):
         
         return result
 
-    @tf.function
+    @tf_function
     def eval_comp_fast(self, image1, image2=None,mask=None,norm=None, Auto=True,Add_R45=False):
 
         res=self.eval(image1, image2=image2,mask=mask,Auto=Auto,Add_R45=Add_R45)

{foscat-3.0.17 → foscat-3.0.19}/src/foscat.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.0.17
+Version: 3.0.19
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Home-page: https://github.com/jmdelouis/FOSCAT
 Author: Jean-Marc DELOUIS