foscat 3.0.40__tar.gz → 3.0.42__tar.gz

{foscat-3.0.40 → foscat-3.0.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.0.40
+Version: 3.0.42
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Home-page: https://github.com/jmdelouis/FOSCAT
 Author: Jean-Marc DELOUIS
@@ -9,12 +9,6 @@ Maintainer: Theo Foulquier
 Maintainer-email: theo.foulquier@ifremer.fr
 License: MIT
 Keywords: Scattering transform,Component separation,denoising
-Requires-Dist: imageio
-Requires-Dist: imagecodecs
-Requires-Dist: matplotlib
-Requires-Dist: numpy
-Requires-Dist: tensorflow
-Requires-Dist: healpy
 
 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. 
  A demo package for this process can be found at https://github.com/jmdelouis/FOSCAT_DEMO. 

{foscat-3.0.40 → foscat-3.0.42}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='foscat',
-    version='3.0.40',
+    version='3.0.42',
     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.40 → foscat-3.0.42}/src/foscat/FoCUS.py

@@ -32,7 +32,7 @@ class FoCUS:
                  mpi_size=1,
                  mpi_rank=0):
 
-        self.__version__ = '3.0.40'
+        self.__version__ = '3.0.42'
         # P00 coeff for normalization for scat_cov
         self.TMPFILE_VERSION=TMPFILE_VERSION
         self.P1_dic = None
@@ -1065,7 +1065,7 @@ class FoCUS:
                         normr=np.mean(wresr[idx])
                         normi=np.mean(wresi[idx])
 
-                        val=wresr[idx]-normr+np.complex(0,1)*(wresi[idx]-normi)
+                        val=wresr[idx]-normr+1J*(wresi[idx]-normi)
                         val=val/abs(val).sum()
                         
                         wav[iv:iv+nval]=val
@@ -1340,10 +1340,10 @@ class FoCUS:
             res=v1/vh
             if calc_var:
                 if self.backend.bk_is_complex(vtmp):
-                    res2=self.backend.bk_sqrt((self.backend.bk_real(v2)/self.backend.bk_real(vh)
+                    res2=self.backend.bk_sqrt(((self.backend.bk_real(v2)/self.backend.bk_real(vh)
                                             -self.backend.bk_real(res)*self.backend.bk_real(res)) + \
                                             (self.backend.bk_imag(v2)/self.backend.bk_real(vh) \
-                                            -self.backend.bk_imag(res)*self.backend.bk_imag(res)))
+                                             -self.backend.bk_imag(res)*self.backend.bk_imag(res)))/self.backend.bk_real(vh))
                 else:
                     res2=self.backend.bk_sqrt((v2/vh-res*res)/(vh))
                 return res,res2
@@ -1361,10 +1361,10 @@ class FoCUS:
             res=v1/vh
             if calc_var:
                 if self.backend.bk_is_complex(l_x):
-                    res2=self.backend.bk_sqrt(self.backend.bk_real(v2)/self.backend.bk_real(vh)
+                    res2=self.backend.bk_sqrt((self.backend.bk_real(v2)/self.backend.bk_real(vh)
                                               -self.backend.bk_real(res)*self.backend.bk_real(res) + \
                                                self.backend.bk_imag(v2)/self.backend.bk_real(vh) \
-                                                -self.backend.bk_imag(res)*self.backend.bk_imag(res))
+                                                -self.backend.bk_imag(res)*self.backend.bk_imag(res))/self.backend.bk_real(vh))
                 else:
                     res2=self.backend.bk_sqrt((v2/vh-res*res)/(vh))
                 return res,res2

{foscat-3.0.40 → foscat-3.0.42}/src/foscat/backend.py

@@ -292,7 +292,9 @@ class foscat_backend:
         if self.BACKEND==self.TENSORFLOW:
             return(self.backend.cast(x>threshold,x.dtype)*x)
         if self.BACKEND==self.TORCH:
-            return(self.backend.cast(x>threshold,x.dtype)*x)
+            x.to(x.dtype)
+            return (x>threshold)*x
+            #return(self.backend.cast(x>threshold,x.dtype)*x)
         if self.BACKEND==self.NUMPY:
             return (x>threshold)*x
 
@@ -787,6 +789,12 @@ class foscat_backend:
             else:
                 return(x)
 
+        if isinstance(x,np.int32) or isinstance(x,np.int64) or isinstance(x,int):
+            if self.all_bk_type=='float64':
+                return(np.float64(x))
+            else:
+                return(np.float32(x))
+            
         if self.bk_is_complex(x):
             out_type=self.all_cbk_type
         else:

{foscat-3.0.40 → foscat-3.0.42}/src/foscat.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foscat
-Version: 3.0.40
+Version: 3.0.42
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Home-page: https://github.com/jmdelouis/FOSCAT
 Author: Jean-Marc DELOUIS
@@ -9,12 +9,6 @@ Maintainer: Theo Foulquier
 Maintainer-email: theo.foulquier@ifremer.fr
 License: MIT
 Keywords: Scattering transform,Component separation,denoising
-Requires-Dist: imageio
-Requires-Dist: imagecodecs
-Requires-Dist: matplotlib
-Requires-Dist: numpy
-Requires-Dist: tensorflow
-Requires-Dist: healpy
 
 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. 
  A demo package for this process can be found at https://github.com/jmdelouis/FOSCAT_DEMO.