foscat 3.0.45__tar.gz → 3.0.47__tar.gz

{foscat-3.0.45 → foscat-3.0.47}/PKG-INFO

@@ -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 → foscat-3.0.47}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='foscat',
-    version='3.0.45',
+    version='3.0.47',
     description='Generate synthetic Healpix or 2D data using Cross Scattering Transform' ,
     long_description='Utilize the Cross Scattering Transform (described in https://arxiv.org/abs/2207.12527) to synthesize Healpix or 2D data that is suitable for component separation purposes, such as denoising. \n A demo package for this process can be found at https://github.com/jmdelouis/FOSCAT_DEMO. \n Complete doc can be found at https://foscat-documentation.readthedocs.io/en/latest/index.html. \n\n List of developers : J.-M. Delouis, T. Foulquier, L. Mousset, T. Odaka, F. Paul, E. Allys ' ,
     license='MIT',

{foscat-3.0.45 → foscat-3.0.47}/src/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-3.0.45 → foscat-3.0.47}/src/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 → foscat-3.0.47}/src/foscat.egg-info/PKG-INFO

@@ -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