foscat 3.0.35__py3-none-any.whl → 3.0.36__py3-none-any.whl

foscat/FoCUS.py

@@ -32,7 +32,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.0.35'
+        self.__version__ = '3.0.36'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None

foscat/GCNN.py

@@ -14,6 +14,7 @@ class GCNN:
                  n_chan_out=1,
                  nbatch=1,
                  SEED=1234,
+                 hidden=None,
                  filename=None):
 
         if filename is not None:
@@ -29,7 +30,11 @@ class GCNN:
             self.in_nside=outlist[4] 
             self.nbatch=outlist[1]
             self.n_chan_out=outlist[8]
-        
+            if len(outlist[9])>0:
+                self.hidden=outlist[9]
+            else:
+                self.hidden=None
+                
             self.x=self.scat_operator.backend.bk_cast(outlist[6])
         else:
             self.nscale=nscale
@@ -46,21 +51,33 @@ class GCNN:
             self.KERNELSZ= scat_operator.KERNELSZ
             self.all_type= scat_operator.all_type
             self.in_nside=in_nside
+            self.hidden=hidden
 
             np.random.seed(SEED)
             self.x=scat_operator.backend.bk_cast(np.random.randn(self.get_number_of_weights())/(self.KERNELSZ*self.KERNELSZ))
 
     def save(self,filename):
+
+        if self.hidden is None:
+            tabh=[]
+        else:
+            tabh=self.hidden
+
+        www= self.get_weights()
         
+        if not isinstance(www,np.ndarray):
+            www=www.numpy()
+            
         outlist=[self.chanlist, \
                  self.nbatch, \
                  self.npar, \
                  self.KERNELSZ, \
                  self.in_nside, \
                  self.nscale, \
-                 self.get_weights().numpy(), \
+                 www, \
                  self.all_type, \
-                 self.n_chan_out]
+                 self.n_chan_out, \
+                 tabh]
         
         myout=open("%s.pkl"%(filename),"wb")
         pickle.dump(outlist,myout)
@@ -68,10 +85,19 @@ class GCNN:
     
     def get_number_of_weights(self):
         totnchan=0
+        szk=self.KERNELSZ*self.KERNELSZ
+        if self.hidden is not None:
+            totnchan=totnchan+self.hidden[0]*self.npar
+            for i in range(1,len(self.hidden)):
+                totnchan=totnchan+self.hidden[i]*self.hidden[i-1]
+            totnchan=totnchan+self.hidden[len(self.hidden)-1]*12*self.in_nside**2*self.chanlist[0]
+        else:
+            totnchan=self.npar*12*self.in_nside**2*self.chanlist[0]
+            
         for i in range(self.nscale):
-            totnchan=totnchan+self.chanlist[i]*self.chanlist[i+1]
-        return self.npar*12*self.in_nside**2*self.chanlist[0] \
-            +(totnchan+self.chanlist[i+1]*self.n_chan_out)*self.KERNELSZ*self.KERNELSZ
+            totnchan=totnchan+self.chanlist[i]*self.chanlist[i+1]*szk
+            
+        return totnchan+self.chanlist[i+1]*self.n_chan_out*szk
 
     def set_weights(self,x):
         self.x=x
@@ -83,20 +109,46 @@ class GCNN:
 
         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]])
 
         if axis==0:
             nval=1
         else:
             nval=param.shape[0]
-            
+        
+        nn=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)
+        if self.hidden is not None:
+            ww=self.scat_operator.backend.bk_reshape(x[nn:nn+self.npar*self.hidden[0]], \
+                                                     [self.npar,self.hidden[0]])
+            im=self.scat_operator.backend.bk_matmul(im,ww)
+            im=self.scat_operator.backend.bk_relu(im)
+            nn+=self.npar*self.hidden[0]
+            
+            for i in range(1,len(self.hidden)):
+                ww=self.scat_operator.backend.bk_reshape(x[nn:nn+self.hidden[i]*self.hidden[i-1]], \
+                                                     [self.hidden[i-1],self.hidden[i]])
+                im=self.scat_operator.backend.bk_matmul(im,ww)
+                im=self.scat_operator.backend.bk_relu(im)
+                nn+=self.hidden[i]*self.hidden[i-1]
+            
+            ww=self.scat_operator.backend.bk_reshape(x[nn:nn+self.hidden[len(self.hidden)-1]*12*self.in_nside**2*self.chanlist[0]], \
+                                                     [self.hidden[len(self.hidden)-1],
+                                                      12*self.in_nside**2*self.chanlist[0]])
+            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.hidden[len(self.hidden)-1]*12*self.in_nside**2*self.chanlist[0]
+            
+        else:
+            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(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
+            nn=self.npar*12*self.chanlist[0]*self.in_nside**2
+
+        
         for k in range(self.nscale):
             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]])

{foscat-3.0.35.dist-info → foscat-3.0.36.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
 foscat/CNN.py,sha256=M7i9gdPQvFTPxKySrlaKsCnOXK0iwXBKcQ2FqdPK-JM,4408
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=iTE2vwey63bCl1mLwkp2PffxbkxDS1dKGnt1Op2ldgg,72101
-foscat/GCNN.py,sha256=hJWPJTCrd07fJp1ypeVb9WYgVAsipYRUuENg5sQEfo8,4445
+foscat/FoCUS.py,sha256=bWlgf4FqTbzqkE49K328XGIdSy1RanqDyozvTpA4szA,72101
+foscat/GCNN.py,sha256=qyKJpv238rwXPIMRRw4opHKaS6JaDtpC63QNncydeD0,6706
 foscat/GetGPUinfo.py,sha256=c01MFYCk38niYCTp0vX3WP24zVDHIsex-Cu42hc9Q18,724
 foscat/Softmax.py,sha256=UDc8Kbl0qWfH1bqDDwfLnkxhON7p93ueZ-Qg2oY4Ke4,2874
 foscat/Spline1D.py,sha256=9oeM8SSHjpfUE5z72YxGt1RVt22vJYM1zhHbNBW8phw,1232
@@ -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.35.dist-info/METADATA,sha256=gaxEaUUxLtDg8ZWKgPhPasaR3Bjob-q5E9Ph3j3QPpw,1013
-foscat-3.0.35.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-foscat-3.0.35.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.0.35.dist-info/RECORD,,
+foscat-3.0.36.dist-info/METADATA,sha256=Tr45RWQz0jDP2uktP7N7cmpyPcl3mc8flON3d0atMYk,1013
+foscat-3.0.36.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+foscat-3.0.36.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.0.36.dist-info/RECORD,,