foscat 3.0.45__py3-none-any.whl → 3.0.47__py3-none-any.whl

foscat/FoCUS.py

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

foscat/backend.py

@@ -271,9 +271,16 @@ class foscat_backend:
 
     def conv2d(self,x,w,strides=[1, 1, 1, 1],padding='SAME'):
         if self.BACKEND==self.TENSORFLOW:
-                return self.backend.nn.conv2d(x,w,
-                                               strides=strides,
-                                               padding=padding)
+            kx=w.shape[0]
+            ky=w.shape[1]
+            paddings = self.backend.constant([[0,0],
+                                              [kx//2,kx//2],
+                                              [ky//2,ky//2],
+                                              [0,0]])
+            tmp=self.backend.pad(x, paddings, "SYMMETRIC")
+            return self.backend.nn.conv2d(tmp,w,
+                                          strides=strides,
+                                          padding="VALID")
         # to be written!!!
         if self.BACKEND==self.TORCH:
             return x
@@ -379,14 +386,14 @@ class foscat_backend:
             xr=self.bk_real(x)
             xi=self.bk_imag(x)
                 
-            r=self.backend.sign(xr)*self.backend.sqrt(xr*xr)
-            i=self.backend.sign(xi)*self.backend.sqrt(xi*xi)
+            r=self.backend.sign(xr)*self.backend.sqrt(self.backend.sign(xr)*xr)
+            i=self.backend.sign(xi)*self.backend.sqrt(self.backend.sign(xi)*xi)
             if self.BACKEND==self.TORCH:
                 return r
             else:
                 return self.bk_complex(r,i)
         else:
-            return self.backend.sign(x)*self.backend.sqrt(x*x)
+            return self.backend.sign(x)*self.backend.sqrt(self.backend.sign(x)*x)
         
     def bk_square_comp(self,x):
         if x.dtype==self.all_cbk_type:

{foscat-3.0.45.dist-info → foscat-3.0.47.dist-info}/METADATA

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

@@ -1,13 +1,13 @@
 foscat/CNN.py,sha256=M7i9gdPQvFTPxKySrlaKsCnOXK0iwXBKcQ2FqdPK-JM,4408
 foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
-foscat/FoCUS.py,sha256=CulqUr3i0RcmYhjiVNmXlPw3O45z7u09TyVlgjgppd8,76562
+foscat/FoCUS.py,sha256=viOAUS9JmJ0eehZYxBDUAMpGUYlQTf9lUEPfnzk6zTI,76562
 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
 foscat/Synthesis.py,sha256=aqV_3Npcl2RQj-wxQ0hDMCo650lrN6YRaMd0fAoCrQ4,12615
 foscat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-foscat/backend.py,sha256=0VyVB629qsZukJ9bseVqA8047snkpZAoiMd2kbSrqcY,32255
+foscat/backend.py,sha256=aX8JRF_T_Pxr1qD9gWw9xO0Zw23voYM9p0zHj2gH78c,32640
 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=WYK3Cvgo4AvVFfLaE8daZP4N3QwLiVGB2QIj2GmfYVQ,2327
@@ -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.45.dist-info/METADATA,sha256=XaUtkifjXPdA8GeTW-W2g7rfyhjtftQfIM88xxh4O20,1013
-foscat-3.0.45.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foscat-3.0.45.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-3.0.45.dist-info/RECORD,,
+foscat-3.0.47.dist-info/METADATA,sha256=_YeqtCWQTNzWqFDEdDbLODT_HCM2athOBWhcNJK2q1U,1013
+foscat-3.0.47.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+foscat-3.0.47.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-3.0.47.dist-info/RECORD,,