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

foscat/FoCUS.py

@@ -32,7 +32,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.0.32'
+        self.__version__ = '3.0.33'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None
@@ -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)
+        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)
+            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]]))
     # ---------------------------------------------−---------
     
     # ---------------------------------------------−---------

foscat/GCNN.py

@@ -79,15 +79,21 @@ class GCNN:
     def get_weights(self):
         return self.x
         
-    def eval(self,param,indices=None,weights=None):
+    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
@@ -96,14 +102,15 @@ class GCNN:
                                                 [self.KERNELSZ*self.KERNELSZ,self.chanlist[k],self.chanlist[k+1]])
             nn=nn+self.KERNELSZ*self.KERNELSZ*self.chanlist[k]*self.chanlist[k+1]
             if indices is None:
-                im=self.scat_operator.healpix_layer_transpose(im,ww)
+                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])
+                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/backend.py

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

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

@@ -1,13 +1,13 @@
 foscat/CNN.py,sha256=M7i9gdPQvFTPxKySrlaKsCnOXK0iwXBKcQ2FqdPK-JM,4408
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=gpLSjh7hLclDvsZDWzZDGjBu4OhmxFTCuxglxaR5LLA,70710
-foscat/GCNN.py,sha256=G-M1yqLtqTfT3ddu-6vXhEFPGDgbtcEKVTRajgYHzUs,4026
+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=qw02rs8yVQsO12SR-SshtekX3ZjXLUAX6o04SiG3Krw,31074
+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
@@ -19,7 +19,7 @@ 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.32.dist-info/METADATA,sha256=hT7P_aLrB3sRXdnQCdYqNxUjSp-B9SQ7fh6J3P5wuvA,1013
-foscat-3.0.32.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foscat-3.0.32.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.0.32.dist-info/RECORD,,
+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.32.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