foscat 3.0.41__py3-none-any.whl → 3.0.43__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- foscat/FoCUS.py +5 -5
- foscat/backend.py +9 -1
- foscat/scat_cov.py +77 -86
- {foscat-3.0.41.dist-info → foscat-3.0.43.dist-info}/METADATA +1 -1
- {foscat-3.0.41.dist-info → foscat-3.0.43.dist-info}/RECORD +7 -7
- {foscat-3.0.41.dist-info → foscat-3.0.43.dist-info}/WHEEL +1 -1
- {foscat-3.0.41.dist-info → foscat-3.0.43.dist-info}/top_level.txt +0 -0
foscat/FoCUS.py
CHANGED
|
@@ -32,7 +32,7 @@ class FoCUS:
|
|
|
32
32
|
mpi_size=1,
|
|
33
33
|
mpi_rank=0):
|
|
34
34
|
|
|
35
|
-
self.__version__ = '3.0.
|
|
35
|
+
self.__version__ = '3.0.43'
|
|
36
36
|
# P00 coeff for normalization for scat_cov
|
|
37
37
|
self.TMPFILE_VERSION=TMPFILE_VERSION
|
|
38
38
|
self.P1_dic = None
|
|
@@ -1340,10 +1340,10 @@ class FoCUS:
|
|
|
1340
1340
|
res=v1/vh
|
|
1341
1341
|
if calc_var:
|
|
1342
1342
|
if self.backend.bk_is_complex(vtmp):
|
|
1343
|
-
res2=self.backend.bk_sqrt((self.backend.bk_real(v2)/self.backend.bk_real(vh)
|
|
1343
|
+
res2=self.backend.bk_sqrt(((self.backend.bk_real(v2)/self.backend.bk_real(vh)
|
|
1344
1344
|
-self.backend.bk_real(res)*self.backend.bk_real(res)) + \
|
|
1345
1345
|
(self.backend.bk_imag(v2)/self.backend.bk_real(vh) \
|
|
1346
|
-
|
|
1346
|
+
-self.backend.bk_imag(res)*self.backend.bk_imag(res)))/self.backend.bk_real(vh))
|
|
1347
1347
|
else:
|
|
1348
1348
|
res2=self.backend.bk_sqrt((v2/vh-res*res)/(vh))
|
|
1349
1349
|
return res,res2
|
|
@@ -1361,10 +1361,10 @@ class FoCUS:
|
|
|
1361
1361
|
res=v1/vh
|
|
1362
1362
|
if calc_var:
|
|
1363
1363
|
if self.backend.bk_is_complex(l_x):
|
|
1364
|
-
res2=self.backend.bk_sqrt(self.backend.bk_real(v2)/self.backend.bk_real(vh)
|
|
1364
|
+
res2=self.backend.bk_sqrt((self.backend.bk_real(v2)/self.backend.bk_real(vh)
|
|
1365
1365
|
-self.backend.bk_real(res)*self.backend.bk_real(res) + \
|
|
1366
1366
|
self.backend.bk_imag(v2)/self.backend.bk_real(vh) \
|
|
1367
|
-
-self.backend.bk_imag(res)*self.backend.bk_imag(res))
|
|
1367
|
+
-self.backend.bk_imag(res)*self.backend.bk_imag(res))/self.backend.bk_real(vh))
|
|
1368
1368
|
else:
|
|
1369
1369
|
res2=self.backend.bk_sqrt((v2/vh-res*res)/(vh))
|
|
1370
1370
|
return res,res2
|
foscat/backend.py
CHANGED
|
@@ -292,7 +292,9 @@ class foscat_backend:
|
|
|
292
292
|
if self.BACKEND==self.TENSORFLOW:
|
|
293
293
|
return(self.backend.cast(x>threshold,x.dtype)*x)
|
|
294
294
|
if self.BACKEND==self.TORCH:
|
|
295
|
-
|
|
295
|
+
x.to(x.dtype)
|
|
296
|
+
return (x>threshold)*x
|
|
297
|
+
#return(self.backend.cast(x>threshold,x.dtype)*x)
|
|
296
298
|
if self.BACKEND==self.NUMPY:
|
|
297
299
|
return (x>threshold)*x
|
|
298
300
|
|
|
@@ -787,6 +789,12 @@ class foscat_backend:
|
|
|
787
789
|
else:
|
|
788
790
|
return(x)
|
|
789
791
|
|
|
792
|
+
if isinstance(x,np.int32) or isinstance(x,np.int64) or isinstance(x,int):
|
|
793
|
+
if self.all_bk_type=='float64':
|
|
794
|
+
return(np.float64(x))
|
|
795
|
+
else:
|
|
796
|
+
return(np.float32(x))
|
|
797
|
+
|
|
790
798
|
if self.bk_is_complex(x):
|
|
791
799
|
out_type=self.all_cbk_type
|
|
792
800
|
else:
|
foscat/scat_cov.py
CHANGED
|
@@ -68,63 +68,31 @@ class scat_cov:
|
|
|
68
68
|
self.backend.constant(self.C01),
|
|
69
69
|
self.backend.constant(self.C11),
|
|
70
70
|
s1=s1, c10=c10,backend=self.backend)
|
|
71
|
-
|
|
71
|
+
|
|
72
|
+
def conv2complex(self,val):
|
|
73
|
+
if val.dtype=='complex64' or val.dtype=='complex128' :
|
|
74
|
+
return val
|
|
75
|
+
else:
|
|
76
|
+
return self.backend.bk_complex(val,0*val)
|
|
77
|
+
return val
|
|
72
78
|
# ---------------------------------------------−---------
|
|
73
79
|
def flatten(self):
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
self.S1.flatten(),
|
|
91
|
-
self.P00.flatten(),
|
|
92
|
-
self.C01.flatten(),
|
|
93
|
-
self.C11.flatten()],0)
|
|
94
|
-
else:
|
|
95
|
-
return np.concatenate([self.S0.flatten(),
|
|
96
|
-
self.S1.flatten(),
|
|
97
|
-
self.P00.flatten(),
|
|
98
|
-
self.C01.flatten(),
|
|
99
|
-
self.C10.flatten(),
|
|
100
|
-
self.C11.flatten()],0)
|
|
101
|
-
else:
|
|
102
|
-
if self.S1 is None:
|
|
103
|
-
if self.C10 is None:
|
|
104
|
-
return self.backend.bk_concat([self.backend.bk_flattenR(self.S0),
|
|
105
|
-
self.backend.bk_flattenR(self.P00),
|
|
106
|
-
self.backend.bk_flattenR(self.C01),
|
|
107
|
-
self.backend.bk_flattenR(self.C11)],0)
|
|
108
|
-
else:
|
|
109
|
-
return self.backend.bk_concat([self.backend.bk_flattenR(self.S0),
|
|
110
|
-
self.backend.bk_flattenR(self.P00),
|
|
111
|
-
self.backend.bk_flattenR(self.C01),
|
|
112
|
-
self.backend.bk_flattenR(self.C10),
|
|
113
|
-
self.backend.bk_flattenR(self.C11)],0)
|
|
114
|
-
else:
|
|
115
|
-
if self.C10 is None:
|
|
116
|
-
return self.backend.bk_concat([self.backend.bk_flattenR(self.S0),
|
|
117
|
-
self.backend.bk_flattenR(self.S1),
|
|
118
|
-
self.backend.bk_flattenR(self.P00),
|
|
119
|
-
self.backend.bk_flattenR(self.C01),
|
|
120
|
-
self.backend.bk_flattenR(self.C11)],0)
|
|
121
|
-
else:
|
|
122
|
-
return self.backend.bk_concat([self.backend.bk_flattenR(self.S0),
|
|
123
|
-
self.backend.bk_flattenR(self.S1),
|
|
124
|
-
self.backend.bk_flattenR(self.P00),
|
|
125
|
-
self.backend.bk_flattenR(self.C01),
|
|
126
|
-
self.backend.bk_flattenR(self.C10),
|
|
127
|
-
self.backend.bk_flattenR(self.C11)],0)
|
|
80
|
+
tmp=[self.conv2complex(self.backend.bk_reshape(self.S0[0],[self.S0.shape[1]]))]
|
|
81
|
+
if self.S1 is not None:
|
|
82
|
+
tmp=tmp+[self.conv2complex(self.backend.bk_reshape(self.S1[0],
|
|
83
|
+
[self.S1.shape[1]*self.S1.shape[2]*self.S1.shape[3]]))]
|
|
84
|
+
tmp=tmp+[self.conv2complex(self.backend.bk_reshape(self.P00[0],
|
|
85
|
+
[self.S1.shape[1]*self.S1.shape[2]*self.S1.shape[3]])),
|
|
86
|
+
self.conv2complex(self.backend.bk_reshape(self.C01[0],
|
|
87
|
+
[self.C01.shape[1]*self.C01.shape[2]*self.C01.shape[3]*self.C01.shape[4]]))]
|
|
88
|
+
if self.C10 is not None:
|
|
89
|
+
tmp=tmp+[self.conv2complex(self.backend.bk_reshape(self.C10[0],
|
|
90
|
+
[self.C01.shape[1]*self.C01.shape[2]*self.C01.shape[3]*self.C01.shape[4]]))]
|
|
91
|
+
|
|
92
|
+
tmp=tmp+[self.conv2complex(self.backend.bk_reshape(self.C11[0],
|
|
93
|
+
[self.C11.shape[1]*self.C11.shape[2]*self.C11.shape[3]*self.C11.shape[4]*self.C11.shape[5]]))]
|
|
94
|
+
|
|
95
|
+
return self.backend.bk_concat(tmp,0)
|
|
128
96
|
|
|
129
97
|
# ---------------------------------------------−---------
|
|
130
98
|
def flattenMask(self):
|
|
@@ -780,32 +748,6 @@ class scat_cov:
|
|
|
780
748
|
if hold:
|
|
781
749
|
plt.figure(figsize=(16, 8))
|
|
782
750
|
|
|
783
|
-
if self.S1 is not None:
|
|
784
|
-
plt.subplot(2, 2, 1)
|
|
785
|
-
tmp=abs(self.get_np(self.S1))
|
|
786
|
-
test=None
|
|
787
|
-
if len(tmp.shape)>3:
|
|
788
|
-
for k in range(tmp.shape[3]):
|
|
789
|
-
for i1 in range(tmp.shape[0]):
|
|
790
|
-
for i2 in range(tmp.shape[1]):
|
|
791
|
-
if test is None:
|
|
792
|
-
test=1
|
|
793
|
-
plt.plot(tmp[i1,i2,:,k],color=color, label=r'%s $S_1$' % (name), lw=lw)
|
|
794
|
-
else:
|
|
795
|
-
plt.plot(tmp[i1,i2,:,k],color=color, lw=lw)
|
|
796
|
-
else:
|
|
797
|
-
for i1 in range(tmp.shape[0]):
|
|
798
|
-
for i2 in range(tmp.shape[1]):
|
|
799
|
-
if test is None:
|
|
800
|
-
test=1
|
|
801
|
-
plt.plot(tmp[i1,i2,:],color=color, label=r'%s $S_1$' % (name), lw=lw)
|
|
802
|
-
else:
|
|
803
|
-
plt.plot(tmp[i1,i2,:],color=color, lw=lw)
|
|
804
|
-
plt.yscale('log')
|
|
805
|
-
plt.legend()
|
|
806
|
-
plt.ylabel('S1')
|
|
807
|
-
plt.xlabel(r'$j_{1}$')
|
|
808
|
-
|
|
809
751
|
test=None
|
|
810
752
|
plt.subplot(2, 2, 2)
|
|
811
753
|
tmp=abs(self.get_np(self.P00))
|
|
@@ -831,17 +773,62 @@ class scat_cov:
|
|
|
831
773
|
plt.ylabel('P00')
|
|
832
774
|
plt.xlabel(r'$j_{1}$')
|
|
833
775
|
plt.legend()
|
|
776
|
+
|
|
777
|
+
if self.S1 is not None:
|
|
778
|
+
plt.subplot(2, 2, 1)
|
|
779
|
+
tmp=abs(self.get_np(self.S1))
|
|
780
|
+
test=None
|
|
781
|
+
if len(tmp.shape)>3:
|
|
782
|
+
for k in range(tmp.shape[3]):
|
|
783
|
+
for i1 in range(tmp.shape[0]):
|
|
784
|
+
for i2 in range(tmp.shape[1]):
|
|
785
|
+
if test is None:
|
|
786
|
+
test=1
|
|
787
|
+
if norm:
|
|
788
|
+
plt.plot(tmp[i1,i2,:,k,]/ntmp[i1,i2,:,k],color=color, label=r'%s norm. $S_1$' % (name), lw=lw)
|
|
789
|
+
else:
|
|
790
|
+
plt.plot(tmp[i1,i2,:,k],color=color, label=r'%s $S_1$' % (name), lw=lw)
|
|
791
|
+
else:
|
|
792
|
+
if norm:
|
|
793
|
+
plt.plot(tmp[i1,i2,:,k]/ntmp[i1,i2,:,k],color=color, lw=lw)
|
|
794
|
+
else:
|
|
795
|
+
plt.plot(tmp[i1,i2,:,k],color=color, lw=lw)
|
|
796
|
+
else:
|
|
797
|
+
for i1 in range(tmp.shape[0]):
|
|
798
|
+
for i2 in range(tmp.shape[1]):
|
|
799
|
+
if test is None:
|
|
800
|
+
test=1
|
|
801
|
+
plt.plot(tmp[i1,i2,:],color=color, label=r'%s $S_1$' % (name), lw=lw)
|
|
802
|
+
else:
|
|
803
|
+
plt.plot(tmp[i1,i2,:],color=color, lw=lw)
|
|
804
|
+
plt.yscale('log')
|
|
805
|
+
plt.legend()
|
|
806
|
+
if norm:
|
|
807
|
+
plt.ylabel(r'$\frac{S_1}{\sqrt{P_{00}}}$')
|
|
808
|
+
else:
|
|
809
|
+
plt.ylabel('$S_1$')
|
|
810
|
+
plt.xlabel(r'$j_{1}$')
|
|
834
811
|
|
|
835
812
|
ax1=plt.subplot(2, 2, 3)
|
|
836
813
|
ax2 = ax1.twiny()
|
|
837
814
|
n=0
|
|
838
815
|
tmp=abs(self.get_np(self.C01))
|
|
839
|
-
|
|
840
|
-
|
|
816
|
+
if norm:
|
|
817
|
+
lname=r'%s norm. $C_{01}$' % (name)
|
|
818
|
+
ax1.set_ylabel(r'$\frac{C_{01}}{\sqrt{P_{00,j_1}P_{00,j_2}}}$')
|
|
819
|
+
else:
|
|
820
|
+
lname=r'%s $C_{01}$' % (name)
|
|
821
|
+
ax1.set_ylabel(r'$C_{01}$')
|
|
822
|
+
|
|
841
823
|
if self.C10 is not None:
|
|
842
824
|
tmp=abs(self.get_np(self.C01))
|
|
843
|
-
|
|
844
|
-
|
|
825
|
+
if norm:
|
|
826
|
+
lname=r'%s norm. $C_{10}$' % (name)
|
|
827
|
+
ax1.set_ylabel(r'$\frac{C_{10}}{\sqrt{P_{00,j_1}P_{00,j_2}}}$')
|
|
828
|
+
else:
|
|
829
|
+
lname=r'%s $C_{10}$' % (name)
|
|
830
|
+
ax1.set_ylabel(r'$C_{10}$')
|
|
831
|
+
|
|
845
832
|
test=None
|
|
846
833
|
tabx=[]
|
|
847
834
|
tabnx=[]
|
|
@@ -992,7 +979,11 @@ class scat_cov:
|
|
|
992
979
|
tab2nx=tab2nx+['%d'%(i2)]
|
|
993
980
|
ax1.axvline(n-0.5,ls=':',color='gray')
|
|
994
981
|
plt.yscale('log')
|
|
995
|
-
|
|
982
|
+
if norm:
|
|
983
|
+
ax1.set_ylabel(r'$\frac{C_{11}}{\sqrt{P_{00,j_1}P_{00,j_2}}}$')
|
|
984
|
+
else:
|
|
985
|
+
ax1.set_ylabel(r'$C_{11}$')
|
|
986
|
+
|
|
996
987
|
ax1.set_xticks(tabx)
|
|
997
988
|
ax1.set_xticklabels(tabnx,fontsize=6)
|
|
998
989
|
ax1.set_xlabel(r"$j_{2},j_{3}$",fontsize=6)
|
|
@@ -1,25 +1,25 @@
|
|
|
1
1
|
foscat/CNN.py,sha256=M7i9gdPQvFTPxKySrlaKsCnOXK0iwXBKcQ2FqdPK-JM,4408
|
|
2
2
|
foscat/CircSpline.py,sha256=610sgsWeZzRXYh7gYEqUmGQVrXoHSaFGKjH5mCdh4jU,1684
|
|
3
|
-
foscat/FoCUS.py,sha256=
|
|
3
|
+
foscat/FoCUS.py,sha256=NJEtmH7ggBmyUzmwjowBXnm9b2qXM8lAoIhOlIuR-uA,76562
|
|
4
4
|
foscat/GCNN.py,sha256=qyKJpv238rwXPIMRRw4opHKaS6JaDtpC63QNncydeD0,6706
|
|
5
5
|
foscat/GetGPUinfo.py,sha256=c01MFYCk38niYCTp0vX3WP24zVDHIsex-Cu42hc9Q18,724
|
|
6
6
|
foscat/Softmax.py,sha256=UDc8Kbl0qWfH1bqDDwfLnkxhON7p93ueZ-Qg2oY4Ke4,2874
|
|
7
7
|
foscat/Spline1D.py,sha256=9oeM8SSHjpfUE5z72YxGt1RVt22vJYM1zhHbNBW8phw,1232
|
|
8
8
|
foscat/Synthesis.py,sha256=aqV_3Npcl2RQj-wxQ0hDMCo650lrN6YRaMd0fAoCrQ4,12615
|
|
9
9
|
foscat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
10
|
-
foscat/backend.py,sha256=
|
|
10
|
+
foscat/backend.py,sha256=0VyVB629qsZukJ9bseVqA8047snkpZAoiMd2kbSrqcY,32255
|
|
11
11
|
foscat/backend_tens.py,sha256=zEFZ71j0nMNP9_91tz21ZVBTayr75l-sfONOLkJ8DyI,1432
|
|
12
12
|
foscat/loss_backend_tens.py,sha256=WbGC4vy1pBg_bxUXnlCRiXX9WszN6MaUWUc_lUvZNvQ,1667
|
|
13
13
|
foscat/loss_backend_torch.py,sha256=WYK3Cvgo4AvVFfLaE8daZP4N3QwLiVGB2QIj2GmfYVQ,2327
|
|
14
14
|
foscat/scat.py,sha256=s132WtITyuvBZKLu7T2_qhnoA2xdT2h1ZufP-Awlb8w,61175
|
|
15
15
|
foscat/scat1D.py,sha256=GalTfBmPVNy3wC2ddsckwE3KmgkSJS2sZyplKBi9ugM,45855
|
|
16
16
|
foscat/scat2D.py,sha256=Xtisjc5KsbLQAlbn71P0Xg1UIu3r1gUKXoYG2vIMK1M,523
|
|
17
|
-
foscat/scat_cov.py,sha256=
|
|
17
|
+
foscat/scat_cov.py,sha256=zbsf9VDdqH5hnS8VfWd4wzdDaOF1-C_2xkYkxtu9Lt8,110925
|
|
18
18
|
foscat/scat_cov1D.py,sha256=1bhzaW-5Pcr1aEPOYIXiwu8KOy38JE0g_Y5PvFzGQs8,60599
|
|
19
19
|
foscat/scat_cov2D.py,sha256=8_XvC-lOEVUWP9vT3Wx10G_ATeVeh0SdrSWuBV7Xf5k,536
|
|
20
20
|
foscat/scat_cov_map.py,sha256=ocU2xd41GtJhiU9S3dEv38KfPCvz0tJKY2f8lPxpm5c,2729
|
|
21
21
|
foscat/scat_cov_map2D.py,sha256=t4llIt7DVIyU1b_u-dJSX4lBr2FhDict8RnNnHpRvHM,2754
|
|
22
|
-
foscat-3.0.
|
|
23
|
-
foscat-3.0.
|
|
24
|
-
foscat-3.0.
|
|
25
|
-
foscat-3.0.
|
|
22
|
+
foscat-3.0.43.dist-info/METADATA,sha256=uVSoZ70Gjq-JPFRWe6BGatP9poVGhZJS9eA7kE1yW2Y,1013
|
|
23
|
+
foscat-3.0.43.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
|
|
24
|
+
foscat-3.0.43.dist-info/top_level.txt,sha256=AGySXBBAlJgb8Tj8af6m_F-aiNg2zNTcybCUPVOKjAg,7
|
|
25
|
+
foscat-3.0.43.dist-info/RECORD,,
|
|
File without changes
|