foscat 2025.11.1__py3-none-any.whl → 2026.2.1__py3-none-any.whl

foscat/scat_cov.py

@@ -2419,13 +2419,13 @@ class funct(FOC.FoCUS):
             if smooth_scale > 0:
                 for m in range(smooth_scale):
                     if cc.shape[0] > 12:
-                        cc, _ = self.ud_grade_2(self.smooth(cc))
-                        ss, _ = self.ud_grade_2(self.smooth(ss))
+                        cc, _ = self.ud_grade_2(cc)
+                        ss, _ = self.ud_grade_2(ss)
 
             if cc.shape[-1] != tmp.shape[-1]:
                 ll_nside = int(np.sqrt(tmp.shape[-1] // 12))
-                cc = self.up_grade(cc, ll_nside)
-                ss = self.up_grade(ss, ll_nside)
+                cc = self.up_grade(self.backend.bk_cast(cc), ll_nside)
+                ss = self.up_grade(self.backend.bk_cast(ss), ll_nside)
 
             # compute local phase from weighted cos and sin (same as before)
             if self.BACKEND == "numpy":
@@ -2518,13 +2518,13 @@ class funct(FOC.FoCUS):
                 if smooth_scale > 0:
                     for m in range(smooth_scale):
                         if cc2.shape[1] > 12:
-                            cc2, _ = self.ud_grade_2(self.smooth(cc2))
-                            ss2, _ = self.ud_grade_2(self.smooth(ss2))
+                            cc2, _ = self.ud_grade_2(cc2)
+                            ss2, _ = self.ud_grade_2(ss2)
 
                 if cc2.shape[-1] != sim.shape[-1]:
                     ll_nside = int(np.sqrt(sim.shape[-1] // 12))
-                    cc2 = self.up_grade(cc2, ll_nside)
-                    ss2 = self.up_grade(ss2, ll_nside)
+                    cc2 = self.up_grade(self.backend.bk_cast(cc2), ll_nside)
+                    ss2 = self.up_grade(self.backend.bk_cast(ss2), ll_nside)
 
                 if self.BACKEND == "numpy":
                     phase2 = np.fmod(np.arctan2(ss2, cc2) + 2 * np.pi, 2 * np.pi)
@@ -2701,7 +2701,7 @@ class funct(FOC.FoCUS):
             if nside is None:
                 nside = int(np.sqrt(npix // 12))
 
-            J = int(np.log(nside) / np.log(2))  # Number of j scales
+            J = int(np.log2(nside)+1)  # Number of j scales
             if cell_ids is not None:
                 J=np.min([J,int(np.log(cell_ids.shape[0]) / (2*np.log(2)))-1])
 
@@ -2712,7 +2712,7 @@ class funct(FOC.FoCUS):
         if Jmax > J:
             print("==========\n\n")
             print(
-                "The Jmax you requested is larger than the data size, which may cause problems while computing the scattering transform."
+                "The Jmax you requested is larger than the data size ", J,", which may cause problems while computing the scattering transform."
             )
             print("\n\n==========")
 
@@ -2742,7 +2742,7 @@ class funct(FOC.FoCUS):
             # if the kernel size is bigger than 3 increase the binning before smoothing
             if self.use_2D:
                 vmask = self.up_grade(
-                    vmask, I1.shape[-2] * 2, nouty=I1.shape[-1] * 2,axis=-2
+                    self.backend.bk_cast(vmask), I1.shape[-2] * 2, nouty=I1.shape[-1] * 2,axis=-2
                 )
                 I1 = self.up_grade(
                     I1, I1.shape[-2] * 2, nouty=I1.shape[-1] * 2,axis=-2
@@ -3550,14 +3550,14 @@ class funct(FOC.FoCUS):
             ### Image I1,
             # downscale the I1 [Nbatch, Npix_j3]
             if j3 != Jmax - 1:
-                I1 = self.smooth(I1, cell_ids=cell_ids_j3, nside=nside_j3)
+                #I1 = self.smooth(I1, cell_ids=cell_ids_j3, nside=nside_j3)
                 I1, new_cell_ids_j3 = self.ud_grade_2(
                     I1, cell_ids=cell_ids_j3, nside=nside_j3
                 )
 
                 ### Image I2
                 if cross:
-                    I2 = self.smooth(I2,  cell_ids=cell_ids_j3, nside=nside_j3)
+                    #I2 = self.smooth(I2,  cell_ids=cell_ids_j3, nside=nside_j3)
                     I2, new_cell_ids_j3 = self.ud_grade_2(
                         I2, cell_ids=cell_ids_j3, nside=nside_j3
                     )
@@ -3565,20 +3565,20 @@ class funct(FOC.FoCUS):
                 ### Modules
                 for j2 in range(0, j3 + 1):  # j2 =< j3
                     ### Dictionary M1_dic[j2]
-                    M1_smooth = self.smooth(
-                        M1_dic[j2], cell_ids=cell_ids_j3, nside=nside_j3
-                    )  # [Nbatch, Npix_j3, Norient3]
+                    #M1_smooth = self.smooth(
+                    #    M1_dic[j2], cell_ids=cell_ids_j3, nside=nside_j3
+                    #)  # [Nbatch, Npix_j3, Norient3]
                     M1_dic[j2], new_cell_ids_j2 = self.ud_grade_2(
-                        M1_smooth,  cell_ids=cell_ids_j3, nside=nside_j3
+                        M1_dic[j2],  cell_ids=cell_ids_j3, nside=nside_j3
                     )  # [Nbatch, Npix_j3, Norient3]
 
                     ### Dictionary M2_dic[j2]
                     if cross:
-                        M2_smooth = self.smooth(
-                            M2_dic[j2],  cell_ids=cell_ids_j3, nside=nside_j3
-                        )  # [Nbatch, Npix_j3, Norient3]
+                        #M2_smooth = self.smooth(
+                        #    M2_dic[j2],  cell_ids=cell_ids_j3, nside=nside_j3
+                        #)  # [Nbatch, Npix_j3, Norient3]
                         M2_dic[j2], new_cell_ids_j2 = self.ud_grade_2(
-                            M2_smooth,  cell_ids=cell_ids_j3, nside=nside_j3
+                            M2_dic[j2],  cell_ids=cell_ids_j3, nside=nside_j3
                         )  # [Nbatch, Npix_j3, Norient3]
                 ### Mask
                 vmask, new_cell_ids_j3 = self.ud_grade_2(
@@ -6571,15 +6571,15 @@ class funct(FOC.FoCUS):
                 # Increase the resolution between each step
                 if self.use_2D:
                     imap = self.up_grade(
-                        omap,
+                        self.backend.bk_cast(omap),
                         imap.shape[1] * 2,
                         axis=-2,
                         nouty=imap.shape[2] * 2
                     )
                 elif self.use_1D:
-                    imap = self.up_grade(omap, imap.shape[1] * 2)
+                    imap = self.up_grade(self.backend.bk_cast(omap), imap.shape[1] * 2)
                 else:
-                    imap = self.up_grade(omap, l_nside)
+                    imap = self.up_grade(self.backend.bk_cast(omap), l_nside)
                     
             if grd_mask is not None:
                 imap = imap * l_grd_mask[k] + tmp[k] * (1 - l_grd_mask[k])

{foscat-2025.11.1.dist-info → foscat-2026.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foscat
-Version: 2025.11.1
+Version: 2026.2.1
 Summary: Generate synthetic Healpix or 2D data using Cross Scattering Transform
 Author-email: Jean-Marc DELOUIS <jean.marc.delouis@ifremer.fr>
 Maintainer-email: Theo Foulquier <theo.foulquier@ifremer.fr>
@@ -91,74 +91,6 @@ git clone https://github.com/jmdelouis/FOSCAT_DEMO.git
 
 ```
 
-# Spherical data example
-
-## compute a synthetic image
-
-```
-python demo.py -n=32 -k -c -s=100
-```
-
-The _demo.py_ script serves as a demonstration of the capabilities of the foscat library. It utilizes the Cross Wavelet Scattering Transform to generate a Healpix map that possesses the same characteristics as a specified input map.
-
-- `-n=32` computes map with nside=32.
-- `-k` uses 5x5 kernel.
-- `-c` uses Scattering Covariance.
-- `-l` uses LBFGS minimizer.
-- `-s=100` computes 100 steps.
-
-```
-python demo.py -n=8 [-c|--cov][-s|--steps=3000][-S=1234|--seed=1234][-k|--k5x5][-d|--data][-o|--out][-r|--orient] [-p|--path][-a|--adam]
-
-```
-
-- The "-n" option specifies the nside of the input map. The maximum nside value is 256 with the default map.
-- The "--cov" option (optional) uses scat_cov instead of scat.
-- The "--steps" option (optional) specifies the number of iterations. If not specified, the default value is 1000.
-- The "--seed" option (optional) specifies the seed of the random generator.
-- The "--path" option (optional) allows you to define the path where the output files will be written. The default path is "data".
-- The "--k5x5" option (optional) uses a 5x5 kernel instead of a 3x3.
-- The "--data" option (optional) specifies the input data file to be used. If not specified, the default file "LSS_map_nside128.npy" will be used.
-- The "--out" option (optional) specifies the output file name. If not specified, the output file will be saved in "demo".
-- The "--orient" option (optional) specifies the number of orientations. If not specified, the default value is 4.
-- The "--adam" option (optional) makes the synthesis using the ADAM optimizer instead of the L_BFGS.
-
-## plot the result
-
-The following script generates a series of plots that showcase different aspects of the synthesis process using the _demo.py_ script.
-
-> python test2D.py
-
-```
-python plotdemo.py -n=32 -c
-```
-
-# 2D field demo
-
-> python test2Dplot.py
-
-# compute a synthetic turbulent field
-
-The python scripts _demo2D.py_ included in this package demonstrate how to use the foscat library to generate a 2D synthetic fields that have patterns with the same statistical properties as a specified 2D image. In this particular case, the input field is a sea surface temperature extracted from a north atlantic ocean simulation.
-
-> python testHealpix.py
-
-```
-python demo2d.py -n=32 -k -c
-```
-
-> python testHplot.py
-
-The following script generates a series of plots that showcase different aspects of the synthesis process using the _demo2D.py_ script.
-
-```
-python plotdemo2d.py -n=32 -c
-```
-
-For more information, see the [documentation](https://foscat-documentation.readthedocs.io/en/latest/index.html).
-
-> mpirun -np 3 testHealpix_mpi.py
-
 ## Authors and acknowledgment
 
 Authors: J.-M. Delouis, P. Campeti, T. Foulquier, J. Mangin, L. Mousset, T. Odaka, F. Paul, E. Allys

{foscat-2025.11.1.dist-info → foscat-2026.2.1.dist-info}/RECORD

@@ -4,24 +4,28 @@ foscat/BkTensorflow.py,sha256=iIdLx6VTOfOEocfZBOGyizQn5geDLTfdWWAwDeQr9YA,20056
 foscat/BkTorch.py,sha256=9utOTAfS99E7DPN0QfCnn5ULS1WdS4z3-Z0XJMriJY4,53202
 foscat/CNN.py,sha256=4vky7jqTshL1aYLWsc-hQwf7gDjTVjL7I6HZiAsa6x4,5158
 foscat/CircSpline.py,sha256=CXi49FxF8ZoeZ17Ua8c1AZXe2B5ICEC9aCXb97atB3s,4028
-foscat/FoCUS.py,sha256=Zdwh61Hehyxzo9Wug6gz8Iv2iPuOTAPubpv_NJr-XFc,107148
+foscat/FoCUS.py,sha256=HxXh9jHGtopt-jtYAz_dx4GH-88tALY6yZ30kkbDIHM,109790
 foscat/GCNN.py,sha256=q7yWHCMJpP7-m3WvR3OQnp5taeYWaMxIY2hQ6SIb9gs,4487
 foscat/HOrientedConvol.py,sha256=xMaS-zzoUyXisBCPsHBVpn54tuA9Qv3na-tT86Cwn7U,38744
 foscat/HealBili.py,sha256=YRPk9PO5G8NdwKeb33xiJs3_pMPAgIv5phCs8GT6LN0,12943
 foscat/HealSpline.py,sha256=YRotJ1NQuXYFyFiM8fp6qkATIwRJ8lqIVo4vGXpHO-w,7472
 foscat/Plot.py,sha256=bpohWGsblTBxMrqE_X-iRvuvT-YyHDcgfWB4iYk5l10,49218
 foscat/Softmax.py,sha256=UDZGrTroYtmGEyokGUVpwNO_cgbICi9QVuRr8Yx52_k,2917
-foscat/SphericalStencil.py,sha256=DFipxQWupYPBa_62CkuMe9K7HkLFiHteF7Q6lAs3TLQ,56714
+foscat/SphereDownGeo.py,sha256=B_ENfL4Mqn6VmpXEGGxEW8DR3R6zCNV-YVtsU00xwjY,15380
+foscat/SphereUpGeo.py,sha256=KvvXqVRW7eX79MJsJJS6g5ll84Qyx0bLZzQaDXy4fp4,7023
+foscat/SphericalStencil.py,sha256=kRyQXwZyoxdRW326e2ht8eGzg1-Lvl89tdHSpVTfJzg,47620
 foscat/Spline1D.py,sha256=rKzzenduaZZ-yBDJd35it6Gyrj1spqb7hoIaUgISPzY,2983
 foscat/Synthesis.py,sha256=ClrUkSKm2426ZX56dHoepoSQ2rJvwTXQnPPtlC2cESY,14174
 foscat/UNET.py,sha256=2vtJKFeNS6PtUjUblT50dOsk3XXBTJ5IvbJexQTOWug,19372
 foscat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 foscat/alm.py,sha256=XkK4rFVRoO-oJpr74iBffKt7hdS_iJkR016IlYm10gQ,33832
+foscat/alm_loc.py,sha256=erExGZ-x_x7qJOvpccPdzaeUlqVmZAOhy-dvDgcsD64,10736
 foscat/backend.py,sha256=l3aMwDyXP6jURMIvratFMGWCTcQpaR68KnUuuGDezqE,45418
 foscat/backend_tens.py,sha256=9Dp136m9frkclkwifJQLLbIpl3ETI3_txdPUZcKfuMw,1618
 foscat/heal_NN.py,sha256=krEHM9NMZ74T9HUf-qK5td0tFttBA5SbaRgzThM2GYs,16943
 foscat/healpix_unet_torch.py,sha256=CDdrWyPJqF_gUT6rwB-TnghsbtkJ89WFw-K14m37DDQ,52221
 foscat/healpix_vit_skip.py,sha256=26qpYoX7W1vCJujqtYUiRPUmwrDf_UJSN5kbL7DVV8I,20359
+foscat/healpix_vit_torch-old.py,sha256=_PJecWRIWJc2FTQB_rthEeqLKYJ_UIdTN8ib_JuQ_xw,28985
 foscat/healpix_vit_torch.py,sha256=XOqEOazob6WRptSD5dh5acWM_1_uErKXaVWPm08X-O0,22198
 foscat/loss_backend_tens.py,sha256=dCOVN6faDtIpN3VO78HTmYP2i5fnFAf-Ddy5qVBlGrM,1783
 foscat/loss_backend_torch.py,sha256=k3z18Dj3SaLKK6ZIKcm7GO4U_YKYVP6LtHG1aIbxkYk,1627
@@ -29,14 +33,14 @@ foscat/planar_vit.py,sha256=lQqwyz_P8G-Dav2vLqgkssDfeSe15YmjFzP5W-otjs0,6888
 foscat/scat.py,sha256=emN7MsSuoJzPWQfgDETScZeKLmu8K-jjEh5Dp7szQzY,72809
 foscat/scat1D.py,sha256=FvvxwhlzxwvIETkenpisvDteJ06DBYP5K7wsnJ2nHjM,53713
 foscat/scat2D.py,sha256=boKj0ASqMMSy7uQLK6hPniG87m3hZGJBYBiq5v8F9IQ,532
-foscat/scat_cov.py,sha256=I5cU_QnSEYn1ec9WUx9CCzJrKavnJf4HzaeDNn-p94s,271638
+foscat/scat_cov.py,sha256=R_-S1RLz6_TUUPGyZO9aenSfRWIzF-Ber5W3-LbdLwU,271770
 foscat/scat_cov1D.py,sha256=XOxsZZ5TYq8f34i2tUgIfzyaqaTDlICB3HzD2l_puro,531
 foscat/scat_cov2D.py,sha256=pAm0fKw8wyXram0TFbtw8tGcc8QPKuPXpQk0kh10r4U,7078
 foscat/scat_cov_map.py,sha256=9MzpwT2g9S3dmnjHEMK7PPLQ27oGQg2VFVsP_TDUU5E,2869
 foscat/scat_cov_map2D.py,sha256=zaIIYshXCqAeZ04I158GhD-Op4aoMlLnLEy7rxckVYY,2842
 foscat/unet_2_d_from_healpix_params.py,sha256=r8hN-s091f3yHYlvAAiBbLOvtsz9vPrdwrWPM0ULR2Q,15949
-foscat-2025.11.1.dist-info/licenses/LICENSE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
-foscat-2025.11.1.dist-info/METADATA,sha256=mTjF9ZSUgQD-hSDlQjkOR35gKcu2fRZKKda668z4zio,7216
-foscat-2025.11.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-foscat-2025.11.1.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
-foscat-2025.11.1.dist-info/RECORD,,
+foscat-2026.2.1.dist-info/licenses/LICENSE,sha256=i0ukIr8ZUpkSY2sZaE9XZK-6vuSU5iG6IgX_3pjatP8,1505
+foscat-2026.2.1.dist-info/METADATA,sha256=bj4y6lKOf7qwfFrR6KdRt_8GWXh6W3q0fkHKMo6fSD8,4489
+foscat-2026.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+foscat-2026.2.1.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
+foscat-2026.2.1.dist-info/RECORD,,

{foscat-2025.11.1.dist-info → foscat-2026.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any