foscat 3.0.31__tar.gz → 3.0.32__tar.gz

{foscat-3.0.31 → foscat-3.0.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.0.31
+Version: 3.0.32
 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.31 → foscat-3.0.32}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='foscat',
-    version='3.0.31',
+    version='3.0.32',
     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.31 → foscat-3.0.32}/src/foscat/CNN.py

@@ -79,7 +79,7 @@ class CNN:
     def get_weights(self):
         return self.x
         
-    def eval(self,im):
+    def eval(self,im,indices=None,weights=None):
 
         x=self.x
         ww=self.scat_operator.backend.bk_reshape(x[0:self.KERNELSZ*self.KERNELSZ*self.n_chan_in*self.chanlist[0]],
@@ -93,7 +93,10 @@ class CNN:
             ww=self.scat_operator.backend.bk_reshape(x[nn:nn+self.KERNELSZ*self.KERNELSZ*self.chanlist[k]*self.chanlist[k+1]],
                                                 [self.KERNELSZ*self.KERNELSZ,self.chanlist[k],self.chanlist[k+1]])
             nn=nn+self.KERNELSZ*self.KERNELSZ*self.chanlist[k]*self.chanlist[k+1]
-            im=self.scat_operator.healpix_layer(im,ww)
+            if indices is None:
+                im=self.scat_operator.healpix_layer(im,ww)
+            else:
+                im=self.scat_operator.healpix_layer(im,ww,indices=indices[k],weights=weights[k])
             im=self.scat_operator.backend.bk_relu(im)
             im=self.scat_operator.ud_grade_2(im,axis=0)
 

{foscat-3.0.31 → foscat-3.0.32}/src/foscat/FoCUS.py

@@ -32,7 +32,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.0.31'
+        self.__version__ = '3.0.32'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None
@@ -64,7 +64,7 @@ class FoCUS:
             except:
                 if not self.silent:
                     print('Impossible to create the directory %s'%(self.TEMPLATE_PATH))
-                exit(0)
+                return None
                 
         self.number_of_loss=0
 
@@ -82,7 +82,7 @@ class FoCUS:
         if JmaxDelta<-1:
             if not self.silent:
                 print('Warning : Jmax can not be smaller than -1')
-            exit(0)
+            return None
             
         self.OSTEP=JmaxDelta
         self.use_2D=use_2D
@@ -450,7 +450,7 @@ class FoCUS:
                 print('Weights channels should be equal to the input image channels')
             return -1
         tmp=self.healpix_layer(im,ww,indices=indices,weights=weights)
-
+        
         return self.up_grade(tmp,2*nside)
     
     # ---------------------------------------------−---------
@@ -519,7 +519,7 @@ class FoCUS:
             if len(ishape)<axis+2:
                 if not self.silent:
                     print('Use of 2D scat with data that has less than 2D')
-                exit(0)
+                return None
                 
             npix=im.shape[axis]
             npiy=im.shape[axis+1]
@@ -580,7 +580,7 @@ class FoCUS:
             if len(ishape)<axis+2:
                 if not self.silent:
                     print('Use of 2D scat with data that has less than 2D')
-                exit(0)
+                return None
                 
             if nouty is None:
                 nouty=nout
@@ -1057,7 +1057,7 @@ class FoCUS:
                     if self.rank==0:
                         if not self.silent:
                             print('Only 3x3 and 5x5 kernel have been developped for Healpix and you ask for %dx%d'%(KERNELSZ,KERNELSZ))
-                        exit(0)
+                        return None
 
         self.barrier()  
         if self.use_2D:          
@@ -1342,7 +1342,7 @@ class FoCUS:
             if len(ishape)<axis+2:
                 if not self.silent:
                     print('Use of 2D scat with data that has less than 2D')
-                exit(0)
+                return None
                 
             npix=ishape[axis]
             npiy=ishape[axis+1]
@@ -1467,7 +1467,7 @@ class FoCUS:
             if len(ishape)<axis+2:
                 if not self.silent:
                     print('Use of 2D scat with data that has less than 2D')
-                exit(0)
+                return None
                 
             npix=ishape[axis]
             npiy=ishape[axis+1]

{foscat-3.0.31 → foscat-3.0.32}/src/foscat/GCNN.py

@@ -40,7 +40,7 @@ class GCNN:
         
             if len(chanlist)!=nscale+1:
                 print('len of chanlist (here %d) should of nscale+1 (here %d)'%(len(chanlist),nscale+1))
-                exit(0)
+                return None
             
             self.chanlist=chanlist
             self.KERNELSZ= scat_operator.KERNELSZ
@@ -79,7 +79,7 @@ class GCNN:
     def get_weights(self):
         return self.x
         
-    def eval(self,param):
+    def eval(self,param,indices=None,weights=None):
 
         x=self.x
         
@@ -95,11 +95,15 @@ class GCNN:
             ww=self.scat_operator.backend.bk_reshape(x[nn:nn+self.KERNELSZ*self.KERNELSZ*self.chanlist[k]*self.chanlist[k+1]],
                                                 [self.KERNELSZ*self.KERNELSZ,self.chanlist[k],self.chanlist[k+1]])
             nn=nn+self.KERNELSZ*self.KERNELSZ*self.chanlist[k]*self.chanlist[k+1]
-            im=self.scat_operator.healpix_layer_transpose(im,ww)
+            if indices is None:
+                im=self.scat_operator.healpix_layer_transpose(im,ww)
+            else:
+                im=self.scat_operator.healpix_layer_transpose(im,ww,indices=indices[k],weights=weights[k])
             im=self.scat_operator.backend.bk_relu(im)
             
         ww=self.scat_operator.backend.bk_reshape(x[nn:],[self.chanlist[self.nscale],self.n_chan_out])
         im=self.scat_operator.backend.bk_matmul(im,ww)
         
         return im
-     
+
+        

{foscat-3.0.31 → foscat-3.0.32}/src/foscat/GetGPUinfo.py

@@ -33,4 +33,4 @@ event.set()
 
 x.join()
 print('everything done')
-exit(0)
+

{foscat-3.0.31 → foscat-3.0.32}/src/foscat/Synthesis.py

@@ -77,7 +77,7 @@ class Synthesis:
             
         if self.operation.BACKEND=='numpy':
             print('Synthesis does not work with numpy. Please select Torch or Tensorflow FOSCAT backend')
-            exit(0)
+            return None
 
     # ---------------------------------------------−---------
     def get_gpu(self,event,delay):

{foscat-3.0.31 → foscat-3.0.32}/src/foscat/backend.py

@@ -29,7 +29,7 @@ class foscat_backend:
             print(' - tensorflow')
             print(' - torch')
             print(' - numpy (Impossible to do synthesis using numpy)')
-            exit(0)
+            return None
             
         if self.BACKEND=='tensorflow':
             import tensorflow as tf
@@ -70,7 +70,7 @@ class foscat_backend:
                 self.all_cbk_type=self.backend.complex128
             else:
                 print('ERROR INIT FOCUS ',all_type,' should be float32 or float64')
-                exit(0)
+                return None
         #===========================================================================
         # INIT 
         if mpi_rank==0:

{foscat-3.0.31 → foscat-3.0.32}/src/foscat/scat.py

@@ -1044,15 +1044,15 @@ class funct(FOC.FoCUS):
             if list(image1.shape)!=list(image2.shape):
                 print('The two input image should have the same size to eval Scattering')
                     
-                exit(0)
+                return None
         if mask is not None:
             if list(image1.shape)!=list(mask.shape)[1:]:
                 print('The mask should have the same size than the input image to eval Scattering')
                 print('Image shape ',image1.shape,'Mask shape ',mask.shape)
-                exit(0)
+                return None
         if self.use_2D and len(image1.shape)<2:
             print('To work with 2D scattering transform, two dimension is needed, input map has only on dimension')
-            exit(0)
+            return None
             
             
         ### AUTO OR CROSS

{foscat-3.0.31 → foscat-3.0.32}/src/foscat/scat1D.py

@@ -862,11 +862,11 @@ class funct(FOC.FoCUS):
             if len(image1.shape)==1:
                 if image1.shape[0]!=mask.shape[1]:
                     print('The mask should have the same size than the input timeline to eval Scattering')
-                    exit(0)
+                    return None
             else:
                 if image1.shape[1]!=mask.shape[1]:
                     print('The mask should have the same size than the input timeline to eval Scattering')
-                    exit(0)
+                    return None
             
         ### AUTO OR CROSS
         cross = False

{foscat-3.0.31 → foscat-3.0.32}/src/foscat/scat_cov.py

@@ -1647,7 +1647,7 @@ class funct(FOC.FoCUS):
                 for k in range(4):
                     hp.mollview(np.fmod(phase+np.pi,2*np.pi),cmap='jet',nest=True,hold=False,sub=(2,2,1+k))
                 plt.show()
-                exit(0)
+                return None
                 """
                 iph=(4*phase/(2*np.pi)).astype('int')
                 alpha=(4*phase/(2*np.pi)-iph)
@@ -1720,14 +1720,14 @@ class funct(FOC.FoCUS):
         if image2 is not None:
             if list(image1.shape)!=list(image2.shape):
                 print('The two input image should have the same size to eval Scattering Covariance')
-                exit(0)
+                return None
         if mask is not None:
             if list(image1.shape)!=list(mask.shape)[1:]:
-                print('The mask should have the same size ',mask.shape,'than the input image ',image1.shape,'to eval Scattering Covariance')
-                exit(0)
+                print('The LAST COLUMN of the mask should have the same size ',mask.shape,'than the input image ',image1.shape,'to eval Scattering Covariance')
+                return None
         if self.use_2D and len(image1.shape)<2:
             print('To work with 2D scattering transform, two dimension is needed, input map has only on dimension')
-            exit(0)
+            return None
 
         ### AUTO OR CROSS
         cross = False

{foscat-3.0.31 → foscat-3.0.32}/src/foscat/scat_cov1D.py

@@ -1056,11 +1056,11 @@ class funct(FOC.FoCUS):
         if image2 is not None:
             if list(image1.shape)!=list(image2.shape):
                 print('The two input image should have the same size to eval Scattering Covariance')
-                exit(0)
+                return None
         if mask is not None:
             if list(image1.shape)!=list(mask.shape)[1:]:
                 print('The mask should have the same size ',mask.shape,'than the input image ',image1.shape,'to eval Scattering Covariance')
-                exit(0)
+                return None
 
         ### AUTO OR CROSS
         cross = False

{foscat-3.0.31 → foscat-3.0.32}/src/foscat.egg-info/PKG-INFO

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