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

foscat/FoCUS.py

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

foscat/GCNN.py

@@ -71,7 +71,7 @@ class GCNN:
         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.KERNELSZ*self.KERNELSZ+self.chanlist[self.nscale]*self.n_chan_out
+            +(totnchan+self.chanlist[i+1]*self.n_chan_out)*self.KERNELSZ*self.KERNELSZ
 
     def set_weights(self,x):
         self.x=x
@@ -107,8 +107,12 @@ class GCNN:
                 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)
+        ww=self.scat_operator.backend.bk_reshape(x[nn:],[self.KERNELSZ*self.KERNELSZ,self.chanlist[self.nscale],self.n_chan_out])
+        if indices is None:
+            im=self.scat_operator.healpix_layer(im,ww,axis=1)
+        else:
+            im=self.scat_operator.healpix_layer(im,ww,indices=indices[self.nscale],weights=weights[self.nscale],axis=1)
+            
         if axis==0:
             im=self.scat_operator.backend.bk_reshape(im,[im.shape[1],im.shape[2]])
         return im

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

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

@@ -1,7 +1,7 @@
 foscat/CNN.py,sha256=M7i9gdPQvFTPxKySrlaKsCnOXK0iwXBKcQ2FqdPK-JM,4408
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=9Oxf-muKAwa2vyT8l8l_6A8tad52kSXJNvisPalFlkE,72101
-foscat/GCNN.py,sha256=uaJteFo9DUIYnp0yGj7MeW6z3ZQEHFUBGRBuUhy46yY,4241
+foscat/FoCUS.py,sha256=iTE2vwey63bCl1mLwkp2PffxbkxDS1dKGnt1Op2ldgg,72101
+foscat/GCNN.py,sha256=hJWPJTCrd07fJp1ypeVb9WYgVAsipYRUuENg5sQEfo8,4445
 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.34.dist-info/METADATA,sha256=Fq0p3sOVZh9JRuD4SdSayx5W8tTCT7eS_CWPpvnZFsI,1013
-foscat-3.0.34.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-foscat-3.0.34.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.0.34.dist-info/RECORD,,
+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,,