foscat 3.0.23__py3-none-any.whl → 3.0.25__py3-none-any.whl

foscat/FoCUS.py

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

foscat/Softmax.py

@@ -16,7 +16,7 @@ class SoftmaxClassifier:
         Nhidden (int, optional): Number of neurons in the hidden layer. Defaults to 10.
     """
 
-    def __init__(self, Nval, Nclass, Nhidden=10):
+    def __init__(self, Nval, Nclass, Nhidden=10,Nlevel=1):
         """
         Initializes the SoftmaxClassifier with a specified number of input features, classes, and hidden neurons.
         
@@ -28,11 +28,15 @@ class SoftmaxClassifier:
             Nhidden (int): Number of neurons in the hidden layer.
         """
         # Create the model
-        self.model = Sequential([
-            Dense(units=Nhidden, activation='relu', input_shape=(Nval,)),  # A hidden layer with Nhidden neurons
-            Dense(units=Nclass),  # The output layer with Nclass neurons (for Nclass classes)
-            Softmax()  # Softmax activation for classification
-        ])
+        TheModel=[Dense(units=Nhidden, activation='relu', input_shape=(Nval,))]
+        
+        for k in range(1,Nlevel):
+            TheModel=TheModel+[Dense(units=Nhidden, activation='relu', input_shape=(Nhidden,))]
+            
+        TheModel=TheModel+[Dense(units=Nclass),  # The output layer with Nclass neurons (for Nclass classes)
+                           Softmax()  # Softmax activation for classification
+        ]
+        self.model = Sequential(TheModel)
 
         # Model compilation
         self.model.compile(

foscat/scat_cov.py

@@ -34,6 +34,9 @@ class scat_cov:
         self.idx2    = None
         
     def numpy(self):
+        if self.BACKEND=='numpy':
+            return self
+        
         if self.S1 is None:
             s1 = None
         else:
@@ -688,11 +691,18 @@ class scat_cov:
             return scat_cov(self.P00,self.C01,self.C11,s1=self.S1,c10=self.C10,backend=self.backend)
             
         if self.S1 is not None:
-            s1=self.S1.numpy()
+            if self.BACKEND=='numpy':
+                s1=self.S1
+            else:
+                s1=self.S1.numpy()
         else:
             s1=self.S1
 
-        p0=self.P00.numpy()
+        if self.BACKEND=='numpy':
+            p0=self.P00
+        else:
+            p0=self.P00.numpy()
+            
         for k in range(nscale):
             if constant:
                 if self.S1 is not None:
@@ -706,10 +716,16 @@ class scat_cov:
         j1,j2=self.get_j_idx()
 
         if self.C10 is not None:
-            c10=self.C10.numpy()
+            if self.BACKEND=='numpy':
+                c10=self.C10
+            else:
+                c10=self.C10.numpy()
         else:
             c10=self.C10
-        c01=self.C01.numpy()
+        if self.BACKEND=='numpy':
+            c01=self.C01
+        else:
+            c01=self.C01.numpy()
 
         for k in range(nscale):
 
@@ -724,8 +740,12 @@ class scat_cov:
                     c10[:,:,i0]=np.exp(2*np.log(c10[:,:,i1])-np.log(c10[:,:,i2]))
                     c01[:,:,i0]=np.exp(2*np.log(c01[:,:,i1])-np.log(c01[:,:,i2]))
 
-
-        c11=self.C11.numpy()
+        
+        if self.BACKEND=='numpy':
+            c11=self.C11
+        else:
+            c11=self.C11.numpy()
+            
         j1,j2,j3=self.get_jc11_idx()
 
         for k in range(nscale):
@@ -1329,14 +1349,20 @@ class scat_cov:
         
         inscale=self.P00.shape[2]
         p00=np.zeros([self.P00.shape[0],self.P00.shape[1],nscale,self.P00.shape[3]],dtype='complex')
-        p00[:,:,noff:,:]=self.P00.numpy()
+        if self.BACKEND=='numpy':
+            p00[:,:,noff:,:]=self.P00
+        else:
+            p00[:,:,noff:,:]=self.P00.numpy()
         for i in range(self.P00.shape[0]):
             for j in range(self.P00.shape[1]):
                 for k in range(self.P00.shape[3]):
                     p00[i,j,0:noff,k]=self.add_data_from_log_slope(p00[i,j,noff:,k],noff,ds=ds)
                     
         s1=np.zeros([self.S1.shape[0],self.S1.shape[1],nscale,self.S1.shape[3]])
-        s1[:,:,noff:,:]=self.S1.numpy()
+        if self.BACKEND=='numpy':
+            s1[:,:,noff:,:]=self.S1
+        else:
+            s1[:,:,noff:,:]=self.S1.numpy()
         for i in range(self.S1.shape[0]):
             for j in range(self.S1.shape[1]):
                 for k in range(self.S1.shape[3]):
@@ -1373,8 +1399,12 @@ class scat_cov:
                     for l in range(self.C01.shape[4]):
                         for ij in range(noff+1,nscale):
                             idx=np.where(jo2==ij)[0]
-                            c01[i,j,idx[noff:],k,l]=self.C01.numpy()[i,j,j2==ij-noff,k,l]
-                            c01[i,j,idx[:noff],k,l]=self.add_data_from_slope(self.C01.numpy()[i,j,j2==ij-noff,k,l],noff,ds=ds)
+                            if self.BACKEND=='numpy':
+                                c01[i,j,idx[noff:],k,l]=self.C01[i,j,j2==ij-noff,k,l]
+                                c01[i,j,idx[:noff],k,l]=self.add_data_from_slope(self.C01[i,j,j2==ij-noff,k,l],noff,ds=ds)
+                            else:
+                                c01[i,j,idx[noff:],k,l]=self.C01.numpy()[i,j,j2==ij-noff,k,l]
+                                c01[i,j,idx[:noff],k,l]=self.add_data_from_slope(self.C01.numpy()[i,j,j2==ij-noff,k,l],noff,ds=ds)
 
                         for ij in range(nscale):
                             idx=np.where(jo1==ij)[0]
@@ -1432,8 +1462,12 @@ class scat_cov:
                             for k in range(self.C11.shape[3]):
                                 for l in range(self.C11.shape[4]):
                                     for m in range(self.C11.shape[5]):
-                                        c11[i,j,idx2[noff:],k,l,m]=self.C11.numpy()[i,j,idx,k,l,m]
-                                        c11[i,j,idx2[:noff],k,l,m]=self.add_data_from_log_slope(self.C11.numpy()[i,j,idx,k,l,m],noff,ds=ds)
+                                        if self.BACKEND=='numpy':
+                                            c11[i,j,idx2[noff:],k,l,m]=self.C11[i,j,idx,k,l,m]
+                                            c11[i,j,idx2[:noff],k,l,m]=self.add_data_from_log_slope(self.C11[i,j,idx,k,l,m],noff,ds=ds)
+                                        else:
+                                            c11[i,j,idx2[noff:],k,l,m]=self.C11.numpy()[i,j,idx,k,l,m]
+                                            c11[i,j,idx2[:noff],k,l,m]=self.add_data_from_log_slope(self.C11.numpy()[i,j,idx,k,l,m],noff,ds=ds)
 
         idx=np.where(abs(c11[0,0,:,0,0,0])==0)[0]
         for iii in idx:
@@ -1476,15 +1510,25 @@ class funct(FOC.FoCUS):
         S0=None
         for k in list_scat:
             tmp=list_scat[k]
-            nS0=np.expand_dims(tmp.S0.numpy(),0)
-            nP00=np.expand_dims(tmp.P00.numpy(),0)
-            nC01=np.expand_dims(tmp.C01.numpy(),0)
-            nC11=np.expand_dims(tmp.C11.numpy(),0)
-            if tmp.C10 is not None:
-                nC10=np.expand_dims(tmp.C10.numpy(),0)
-            if tmp.S1 is not None:
-                nS1=np.expand_dims(tmp.S1.numpy(),0)
-                
+            if self.BACKEND=='numpy':
+                nS0=np.expand_dims(tmp.S0,0)
+                nP00=np.expand_dims(tmp.P00,0)
+                nC01=np.expand_dims(tmp.C01,0)
+                nC11=np.expand_dims(tmp.C11,0)
+                if tmp.C10 is not None:
+                    nC10=np.expand_dims(tmp.C10,0)
+                if tmp.S1 is not None:
+                    nS1=np.expand_dims(tmp.S1,0)
+            else:
+                nS0=np.expand_dims(tmp.S0.numpy(),0)
+                nP00=np.expand_dims(tmp.P00.numpy(),0)
+                nC01=np.expand_dims(tmp.C01.numpy(),0)
+                nC11=np.expand_dims(tmp.C11.numpy(),0)
+                if tmp.C10 is not None:
+                    nC10=np.expand_dims(tmp.C10.numpy(),0)
+                if tmp.S1 is not None:
+                    nS1=np.expand_dims(tmp.S1.numpy(),0)
+                    
             if S0 is None:
                 S0=nS0
                 P00=nP00
@@ -1560,7 +1604,12 @@ class funct(FOC.FoCUS):
                 ll_nside=int(np.sqrt(tmp.shape[1]//12))
                 cc=self.up_grade(cc,ll_nside)
                 ss=self.up_grade(ss,ll_nside)
-            phase=np.fmod(np.arctan2(ss.numpy(),cc.numpy())+2*np.pi,2*np.pi)
+                
+            if self.BACKEND=='numpy':
+                phase=np.fmod(np.arctan2(ss,cc)+2*np.pi,2*np.pi)
+            else:
+                phase=np.fmod(np.arctan2(ss.numpy(),cc.numpy())+2*np.pi,2*np.pi)
+                
             iph=(4*phase/(2*np.pi)).astype('int')
             alpha=(4*phase/(2*np.pi)-iph)
             mat=np.zeros([sim.shape[1],4*4])
@@ -1590,7 +1639,10 @@ class funct(FOC.FoCUS):
                     cc=self.up_grade(cc,ll_nside)
                     ss=self.up_grade(ss,ll_nside)
                     
-                phase=np.fmod(np.arctan2(ss.numpy(),cc.numpy())+2*np.pi,2*np.pi)
+                if self.BACKEND=='numpy':
+                    phase=np.fmod(np.arctan2(ss,cc)+2*np.pi,2*np.pi)
+                else:
+                    phase=np.fmod(np.arctan2(ss.numpy(),cc.numpy())+2*np.pi,2*np.pi)
                 """
                 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))

foscat/scat_cov1D.py

@@ -375,14 +375,15 @@ class scat_cov1D:
                             (self.C01 - other),
                             c11,
                             s1=s1, c10=c10,backend=self.backend)
-        def domult(self,x,y):
+
+    def domult(self,x,y):
         try:
             return x*y
         except:
             if x.dtype==y.dtype:
                 return x*y
             if self.backend.bk_is_complex(x):
-
+                
                 return self.backend.bk_complex(self.backend.bk_real(x)*y,self.backend.bk_imag(x)*y)
             else:
                 return self.backend.bk_complex(self.backend.bk_real(y)*x,self.backend.bk_imag(y)*x)

{foscat-3.0.23.dist-info → foscat-3.0.25.dist-info}/METADATA

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

@@ -1,9 +1,9 @@
 foscat/CNN.py,sha256=BVf-uD5K-_Tb_Q9xdckLF7PZq-Wcs6qexP9J2K8KCq0,4231
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=zQ3X_iFWofiJnB54Gb4SCD8carkIykXqSrhMbfWDWoc,67309
+foscat/FoCUS.py,sha256=iN4hnwt2DUYhDZ9JgFFe_ElHVmeOUHIBV-35aASlM3k,67309
 foscat/GCNN.py,sha256=TEW81DGRM4WL7RzH50VKQ-_oHbl5i3iQKuhdkkgKEO8,3831
 foscat/GetGPUinfo.py,sha256=6sJWKO_OeiA0SoGQQdCT_h3D8rZtrv_4hpBc8H3nZls,731
-foscat/Softmax.py,sha256=aCghstI2fchd8FHsBUcmPR4FGlCH9DglS7XMEWlKr8A,2709
+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
@@ -14,12 +14,12 @@ foscat/loss_backend_torch.py,sha256=Fj_W3VwGgeD79eQ4jOxOmhZ548UKDRUb3JjUo2-gSWM,
 foscat/scat.py,sha256=Ht_xyo7XKJJrUIbQIeucjhIrJo4RGrE63EyhTH8IYig,60061
 foscat/scat1D.py,sha256=7egOWL7GXcJEenl8r1DSdArpE1Yvywgo-vxHAQ1gMzY,46269
 foscat/scat2D.py,sha256=Xtisjc5KsbLQAlbn71P0Xg1UIu3r1gUKXoYG2vIMK1M,523
-foscat/scat_cov.py,sha256=62FqSBnU_Gow6YCwqJpQti6AyDOXqCICMLlqQIe9BLA,108094
-foscat/scat_cov1D.py,sha256=inAy_TWtUwJr6l9hX3u7r2Jud7DGy_CkjCfcjaUIdJI,58885
+foscat/scat_cov.py,sha256=uST8ij9o1sJh2AKhFffxMUr0WFQX9vz3VK4LGfiSOlE,110188
+foscat/scat_cov1D.py,sha256=wh65aUkqvkwDKykPrl7ZUpB-nw1Jf2zVOvcM0jHWY_k,58898
 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.23.dist-info/METADATA,sha256=JnSj9sqewiygAjaD3RT_X6ju_0EF8g3G-lQ_HQMrGms,1013
-foscat-3.0.23.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-foscat-3.0.23.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.0.23.dist-info/RECORD,,
+foscat-3.0.25.dist-info/METADATA,sha256=SWGvgdVYdhR4gWNcoFTYto-f2kG8bMaV8uFwrQoQtmg,1013
+foscat-3.0.25.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+foscat-3.0.25.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.0.25.dist-info/RECORD,,

{foscat-3.0.23.dist-info → foscat-3.0.25.dist-info}/WHEEL

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