foscat 3.0.31__py3-none-any.whl → 3.0.33__py3-none-any.whl

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/FoCUS.py

@@ -32,7 +32,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.0.31'
+        self.__version__ = '3.0.33'
         # 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
@@ -441,25 +441,37 @@ class FoCUS:
         return self.X_CNN[nside],self.Y_CNN[nside],self.Z_CNN[nside]
 
     # ---------------------------------------------−---------
-    def healpix_layer_transpose(self,im,ww,indices=None,weights=None):
-        nside=int(np.sqrt(im.shape[0]//12))
+    def healpix_layer_transpose(self,im,ww,indices=None,weights=None,axis=0):
+        nside=int(np.sqrt(im.shape[axis]//12))
         l_kernel=self.KERNELSZ*self.KERNELSZ
             
-        if im.shape[1]!=ww.shape[1]:
+        if im.shape[1+axis]!=ww.shape[1]:
             if not self.silent:
                 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)
+        if axis==1:
+            results=[]
+        
+            for k in range(im.shape[0]):
+                
+                tmp=self.healpix_layer(im[k],ww,indices=indices,weights=weights,axis=0)
+                tmp=self.backend.bk_reshape(self.up_grade(tmp,2*nside),[12*4*nside**2,ww.shape[2]])
+                
+                results.append(tmp)
+            
+            return self.backend.bk_stack(results,axis=0)
+        else:
+            tmp=self.healpix_layer(im,ww,indices=indices,weights=weights,axis=axis)
+        
+            return self.up_grade(tmp,2*nside)
     
     # ---------------------------------------------−---------
     # ---------------------------------------------−---------
-    def healpix_layer(self,im,ww,indices=None,weights=None):
-        nside=int(np.sqrt(im.shape[0]//12))
+    def healpix_layer(self,im,ww,indices=None,weights=None,axis=0):
+        nside=int(np.sqrt(im.shape[axis]//12))
         l_kernel=self.KERNELSZ*self.KERNELSZ
-            
-        if im.shape[1]!=ww.shape[1]:
+
+        if im.shape[1+axis]!=ww.shape[1]:
             if not self.silent:
                 print('Weights channels should be equal to the input image channels')
             return -1
@@ -474,12 +486,27 @@ class FoCUS:
                 return 0
             
             mat=self.backend.bk_SparseTensor(indices,weights,[12*nside*nside*l_kernel,12*nside*nside])
-            
-        tmp=self.backend.bk_sparse_dense_matmul(mat,im)
-        
-        density=self.backend.bk_reshape(tmp,[12*nside*nside,l_kernel*im.shape[1]])
+
+        if axis==1:
+            results=[]
         
-        return self.backend.bk_matmul(density,self.backend.bk_reshape(ww,[l_kernel*im.shape[1],ww.shape[2]]))
+            for k in range(im.shape[0]):
+                
+                tmp=self.backend.bk_sparse_dense_matmul(mat,im[k])
+                
+                density=self.backend.bk_reshape(tmp,[12*nside*nside,l_kernel*im.shape[1+axis]])
+                
+                density=self.backend.bk_matmul(density,self.backend.bk_reshape(ww,[l_kernel*im.shape[1+axis],ww.shape[2]]))
+                
+                results.append(self.backend.bk_reshape(density,[1,12*nside**2,ww.shape[2]]))
+            
+            return self.backend.bk_stack(results,axis=0)
+        else:
+            tmp=self.backend.bk_sparse_dense_matmul(mat,im)
+            
+            density=self.backend.bk_reshape(tmp,[12*nside*nside,l_kernel*im.shape[1]])
+
+            return self.backend.bk_matmul(density,self.backend.bk_reshape(ww,[l_kernel*im.shape[1],ww.shape[2]]))
     # ---------------------------------------------−---------
     
     # ---------------------------------------------−---------
@@ -519,7 +546,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 +607,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 +1084,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 +1369,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 +1494,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/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,15 +79,21 @@ class GCNN:
     def get_weights(self):
         return self.x
         
-    def eval(self,param):
+    def eval(self,param,indices=None,weights=None,axis=0):
 
         x=self.x
         
         ww=self.scat_operator.backend.bk_reshape(x[0:self.npar*12*self.in_nside**2*self.chanlist[0]], \
                                             [self.npar,12*self.in_nside**2*self.chanlist[0]])
-        
-        im=self.scat_operator.backend.bk_matmul(self.scat_operator.backend.bk_reshape(param,[1,self.npar]),ww)
-        im=self.scat_operator.backend.bk_reshape(im,[12*self.in_nside**2,self.chanlist[0]])
+
+        if axis==0:
+            nval=1
+        else:
+            nval=param.shape[0]
+            
+        im=self.scat_operator.backend.bk_reshape(param,[nval,self.npar])
+        im=self.scat_operator.backend.bk_matmul(im,ww)
+        im=self.scat_operator.backend.bk_reshape(im,[nval,12*self.in_nside**2,self.chanlist[0]])
         im=self.scat_operator.backend.bk_relu(im)
 
         nn=self.npar*12*self.chanlist[0]*self.in_nside**2
@@ -95,11 +101,16 @@ 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,axis=1)
+            else:
+                im=self.scat_operator.healpix_layer_transpose(im,ww,indices=indices[k],weights=weights[k],axis=1)
             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)
-        
+        if axis==0:
+            im=self.scat_operator.backend.bk_reshape(im,[im.shape[1],im.shape[2]])
         return im
-     
+
+        

foscat/GetGPUinfo.py

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

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/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:
@@ -253,6 +253,14 @@ class foscat_backend:
         if self.BACKEND==self.NUMPY:
             return self.scipy.sparse.coo_matrix((w,(indice[:,0],indice[:,1])),shape=dense_shape)
         
+    def bk_stack(self,list,axis=0):
+        if self.BACKEND==self.TENSORFLOW:
+            return self.backend.stack(list,axis=axis) 
+        if self.BACKEND==self.TORCH:
+            return self.backend.stack(list,axis=axis) 
+        if self.BACKEND==self.NUMPY:
+            return self.backend.stack(list,axis=axis) 
+        
     def bk_sparse_dense_matmul(self,smat,mat):
         if self.BACKEND==self.TENSORFLOW:
             return self.backend.sparse.sparse_dense_matmul(smat,mat) 

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/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/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/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.dist-info → foscat-3.0.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.0.31
+Version: 3.0.33
 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.33.dist-info/RECORD

@@ -0,0 +1,25 @@
+foscat/CNN.py,sha256=M7i9gdPQvFTPxKySrlaKsCnOXK0iwXBKcQ2FqdPK-JM,4408
+foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
+foscat/FoCUS.py,sha256=iKHY48ukkB4KCOSaGV03pYmqLCQhU1k7VkB8w_gK0o4,71802
+foscat/GCNN.py,sha256=uaJteFo9DUIYnp0yGj7MeW6z3ZQEHFUBGRBuUhy46yY,4241
+foscat/GetGPUinfo.py,sha256=c01MFYCk38niYCTp0vX3WP24zVDHIsex-Cu42hc9Q18,724
+foscat/Softmax.py,sha256=UDc8Kbl0qWfH1bqDDwfLnkxhON7p93ueZ-Qg2oY4Ke4,2874
+foscat/Spline1D.py,sha256=9oeM8SSHjpfUE5z72YxGt1RVt22vJYM1zhHbNBW8phw,1232
+foscat/Synthesis.py,sha256=aqV_3Npcl2RQj-wxQ0hDMCo650lrN6YRaMd0fAoCrQ4,12615
+foscat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+foscat/backend.py,sha256=XDxxMbtoLbxiiPlQZ83rXgTqXUXNw7-qRXtA5h6UpDI,31400
+foscat/backend_tens.py,sha256=zEFZ71j0nMNP9_91tz21ZVBTayr75l-sfONOLkJ8DyI,1432
+foscat/loss_backend_tens.py,sha256=WbGC4vy1pBg_bxUXnlCRiXX9WszN6MaUWUc_lUvZNvQ,1667
+foscat/loss_backend_torch.py,sha256=Fj_W3VwGgeD79eQ4jOxOmhZ548UKDRUb3JjUo2-gSWM,1755
+foscat/scat.py,sha256=tqJ1N5ih5ibHFBw5WV5JQH45OY8Q_6Qw4PG5763OkLM,60073
+foscat/scat1D.py,sha256=GalTfBmPVNy3wC2ddsckwE3KmgkSJS2sZyplKBi9ugM,45855
+foscat/scat2D.py,sha256=Xtisjc5KsbLQAlbn71P0Xg1UIu3r1gUKXoYG2vIMK1M,523
+foscat/scat_cov.py,sha256=kTE6Dur_bOxNZL5-87SUYkSRCy8gbTYw1DCRdM5oLwA,110223
+foscat/scat_cov1D.py,sha256=1bhzaW-5Pcr1aEPOYIXiwu8KOy38JE0g_Y5PvFzGQs8,60599
+foscat/scat_cov2D.py,sha256=8_XvC-lOEVUWP9vT3Wx10G_ATeVeh0SdrSWuBV7Xf5k,536
+foscat/scat_cov_map.py,sha256=ocU2xd41GtJhiU9S3dEv38KfPCvz0tJKY2f8lPxpm5c,2729
+foscat/scat_cov_map2D.py,sha256=t4llIt7DVIyU1b_u-dJSX4lBr2FhDict8RnNnHpRvHM,2754
+foscat-3.0.33.dist-info/METADATA,sha256=sblpIJBAMB9ZYPPPzdpIXqq0B5nmbo_y2JniYuI9LF4,1013
+foscat-3.0.33.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+foscat-3.0.33.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.0.33.dist-info/RECORD,,

{foscat-3.0.31.dist-info → foscat-3.0.33.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

foscat-3.0.31.dist-info/RECORD

@@ -1,25 +0,0 @@
-foscat/CNN.py,sha256=BVf-uD5K-_Tb_Q9xdckLF7PZq-Wcs6qexP9J2K8KCq0,4231
-foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=uIMwben7dllVoOM4udnK2uVgnuxlondh-uhZhqVfP4Y,70674
-foscat/GCNN.py,sha256=TEW81DGRM4WL7RzH50VKQ-_oHbl5i3iQKuhdkkgKEO8,3831
-foscat/GetGPUinfo.py,sha256=6sJWKO_OeiA0SoGQQdCT_h3D8rZtrv_4hpBc8H3nZls,731
-foscat/Softmax.py,sha256=UDc8Kbl0qWfH1bqDDwfLnkxhON7p93ueZ-Qg2oY4Ke4,2874
-foscat/Spline1D.py,sha256=9oeM8SSHjpfUE5z72YxGt1RVt22vJYM1zhHbNBW8phw,1232
-foscat/Synthesis.py,sha256=oYtHFVTqalVzBQs5okJBnP4pzXFhBMds-pytdEm4Bqs,12611
-foscat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-foscat/backend.py,sha256=43Q-OtWlB-S14LH5IiUTxg9j_1WvOBZea3DkuEET7aY,31066
-foscat/backend_tens.py,sha256=zEFZ71j0nMNP9_91tz21ZVBTayr75l-sfONOLkJ8DyI,1432
-foscat/loss_backend_tens.py,sha256=WbGC4vy1pBg_bxUXnlCRiXX9WszN6MaUWUc_lUvZNvQ,1667
-foscat/loss_backend_torch.py,sha256=Fj_W3VwGgeD79eQ4jOxOmhZ548UKDRUb3JjUo2-gSWM,1755
-foscat/scat.py,sha256=Ht_xyo7XKJJrUIbQIeucjhIrJo4RGrE63EyhTH8IYig,60061
-foscat/scat1D.py,sha256=fiGxyWSASGik9BimBKz_Z07jSPywJckLXaHDB_v5HHQ,45847
-foscat/scat2D.py,sha256=Xtisjc5KsbLQAlbn71P0Xg1UIu3r1gUKXoYG2vIMK1M,523
-foscat/scat_cov.py,sha256=uST8ij9o1sJh2AKhFffxMUr0WFQX9vz3VK4LGfiSOlE,110188
-foscat/scat_cov1D.py,sha256=I2GgEo7ASkb7JW443SAp25tmI2Rvuy4xggW8WMHI-L4,60591
-foscat/scat_cov2D.py,sha256=8_XvC-lOEVUWP9vT3Wx10G_ATeVeh0SdrSWuBV7Xf5k,536
-foscat/scat_cov_map.py,sha256=ocU2xd41GtJhiU9S3dEv38KfPCvz0tJKY2f8lPxpm5c,2729
-foscat/scat_cov_map2D.py,sha256=t4llIt7DVIyU1b_u-dJSX4lBr2FhDict8RnNnHpRvHM,2754
-foscat-3.0.31.dist-info/METADATA,sha256=NqS6zLTBxPev6AJWLSpriCVc6IV3ezI_SLEBrIk7tR4,1013
-foscat-3.0.31.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foscat-3.0.31.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.0.31.dist-info/RECORD,,