From bb8b9a3540d5e70053a9018495f70ecca4be3353 Mon Sep 17 00:00:00 2001 From: HydrogenSulfate <490868991@qq.com> Date: Wed, 31 May 2023 11:25:58 +0800 Subject: [PATCH 1/2] Update doc for release/1.0 (#356) * update links README.md and index.md from latest to release/1.0(test=document_fix) * update install_setup.md * update docstrings --- README.md | 8 ++++---- docs/index.md | 2 +- docs/zh/install_setup.md | 19 +++++++------------ ppsci/metric/anomaly_coef.py | 2 +- ppsci/metric/l2_rel.py | 6 +++++- ppsci/metric/mae.py | 6 +++++- ppsci/metric/mse.py | 6 +++++- ppsci/metric/rmse.py | 8 ++++++-- ppsci/utils/expression.py | 2 +- ppsci/visualize/plot.py | 4 ++-- 10 files changed, 37 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index ff9dc4f9f2..bb6401b5e0 100644 --- a/README.md +++ b/README.md @@ -54,15 +54,15 @@ PaddleScience 是一个基于深度学习框架 PaddlePaddle 开发的科学计 # write your code here... ``` -更多安装方式请参考 [**安装与使用**](https://paddlescience-docs.readthedocs.io/zh/latest/zh/install_setup/) +更多安装方式请参考 [**安装与使用**](https://paddlescience-docs.readthedocs.io/zh/release-1.0/zh/install_setup/) ## 快速开始 -请参考 [**快速开始**](https://paddlescience-docs.readthedocs.io/zh/latest/zh/quickstart/) +请参考 [**快速开始**](https://paddlescience-docs.readthedocs.io/zh/release-1.0/zh/quickstart/) ## 经典案例 -请参考 [**经典案例**](https://paddlescience-docs.readthedocs.io/zh/latest/zh/examples/viv/) +请参考 [**经典案例**](https://paddlescience-docs.readthedocs.io/zh/release-1.0/zh/examples/viv/) ## 支持 @@ -70,7 +70,7 @@ PaddleScience 是一个基于深度学习框架 PaddlePaddle 开发的科学计 ## 贡献代码 -PaddleScience 项目欢迎并依赖开发人员和开源社区中的用户,请参阅 [**贡献指南**](https://paddlescience-docs.readthedocs.io/zh/latest/zh/contribute/)。 +PaddleScience 项目欢迎并依赖开发人员和开源社区中的用户,请参阅 [**贡献指南**](https://paddlescience-docs.readthedocs.io/zh/release-1.0/zh/contribute/)。 ## 证书 diff --git a/docs/index.md b/docs/index.md index 1726766563..99a5de427f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -21,7 +21,7 @@ PaddleScience 是一个基于深度学习框架 PaddlePaddle 开发的科学计 ## 贡献代码 -PaddleScience 项目欢迎并依赖开发人员和开源社区中的用户,请参阅 [**贡献指南**](https://paddlescience-docs.readthedocs.io/zh/latest/zh/contribute/)。 +PaddleScience 项目欢迎并依赖开发人员和开源社区中的用户,请参阅 [**贡献指南**](https://paddlescience-docs.readthedocs.io/zh/release-1.0/zh/contribute/)。 ## 证书 diff --git a/docs/zh/install_setup.md b/docs/zh/install_setup.md index d35904f471..40e87317ee 100644 --- a/docs/zh/install_setup.md +++ b/docs/zh/install_setup.md @@ -26,25 +26,20 @@ pip install -r requirements.txt ``` - ???+ Info "安装注意事项" - - 如需使用外部导入STL文件来构建几何,以及使用加密采样等功能,还需额外安装三个依赖库: - [pymesh](https://pymesh.readthedocs.io/en/latest/installation.html#download-the-source)(推荐编译安装), - [open3d](https://github.com/isl-org/Open3D/tree/master#python-quick-start)(推荐pip安装), - [pysdf](https://github.com/sxyu/sdf)(推荐pip安装) - #### 1.2.2 pip 安装 -coming soon - -
+???+ Info "安装注意事项" + + 如需使用外部导入STL文件来构建几何,以及使用加密采样等功能,还需额外安装三个依赖库: + [pymesh](https://pymesh.readthedocs.io/en/latest/installation.html#download-the-source)(推荐编译安装), + [open3d](https://github.com/isl-org/Open3D/tree/master#python-quick-start)(推荐pip安装), + [pysdf](https://github.com/sxyu/sdf)(推荐pip安装) ## 2. 验证安装 diff --git a/ppsci/metric/anomaly_coef.py b/ppsci/metric/anomaly_coef.py index 4faf2ac9b1..a94af65edc 100644 --- a/ppsci/metric/anomaly_coef.py +++ b/ppsci/metric/anomaly_coef.py @@ -32,7 +32,7 @@ class LatitudeWeightedACC(base.Metric): $$ $$ - L_m = N_{lat}\dfrac{cos(lat_m)}{\sum\limits_{j=1}^{N_{lat}}cos(lat_j)} + L_m = N_{lat}\dfrac{\cos(lat_m)}{\sum\limits_{j=1}^{N_{lat}}\cos(lat_j)} $$ $lat_m$ is the latitude at m. diff --git a/ppsci/metric/l2_rel.py b/ppsci/metric/l2_rel.py index 501b7f9de9..80fe68a13e 100644 --- a/ppsci/metric/l2_rel.py +++ b/ppsci/metric/l2_rel.py @@ -21,7 +21,11 @@ class L2Rel(base.Metric): r"""Class for l2 relative error. $$ - metric = \dfrac{\Vert x-y \Vert_2}{\Vert y \Vert_2} + metric = \dfrac{\Vert \mathbf{x} - \mathbf{y} \Vert_2}{\Vert \mathbf{y} \Vert_2} + $$ + + $$ + \mathbf{x}, \mathbf{y} \in \mathcal{R}^{N} $$ Args: diff --git a/ppsci/metric/mae.py b/ppsci/metric/mae.py index 54f814aa1f..cd8e28f9ba 100644 --- a/ppsci/metric/mae.py +++ b/ppsci/metric/mae.py @@ -22,7 +22,11 @@ class MAE(base.Metric): r"""Mean absolute error. $$ - metric = \dfrac{1}{N}\sum\limits_{i=1}^{N}{|x_i-y_i|} + metric = \dfrac{1}{N} \Vert \mathbf{x} - \mathbf{y} \Vert_1 + $$ + + $$ + \mathbf{x}, \mathbf{y} \in \mathcal{R}^{N} $$ Args: diff --git a/ppsci/metric/mse.py b/ppsci/metric/mse.py index 979ca3c207..b0a1ae6ad4 100644 --- a/ppsci/metric/mse.py +++ b/ppsci/metric/mse.py @@ -22,7 +22,11 @@ class MSE(base.Metric): r"""Mean square error $$ - metric = \dfrac{1}{N}\sum\limits_{i=1}^{N}{(x_i-y_i)^2} + metric = \dfrac{1}{N} \Vert \mathbf{x} - \mathbf{y} \Vert_2^2 + $$ + + $$ + \mathbf{x}, \mathbf{y} \in \mathcal{R}^{N} $$ Args: diff --git a/ppsci/metric/rmse.py b/ppsci/metric/rmse.py index 7dff093432..8b2c7a7b08 100644 --- a/ppsci/metric/rmse.py +++ b/ppsci/metric/rmse.py @@ -28,7 +28,11 @@ class RMSE(base.Metric): r"""Root mean square error $$ - metric = \sqrt{\dfrac{1}{N}\sum\limits_{i=1}^{N}{(x_i-y_i)^2}} + metric = \sqrt{\dfrac{1}{N} \Vert \mathbf{x} - \mathbf{y} \Vert_2^2} + $$ + + $$ + \mathbf{x}, \mathbf{y} \in \mathcal{R}^{N} $$ Args: @@ -62,7 +66,7 @@ class LatitudeWeightedRMSE(base.Metric): $$ $$ - L_m = N_{lat}\dfrac{cos(lat_m)}{\sum\limits_{j=1}^{N_{lat}}cos(lat_j)} + L_m = N_{lat}\dfrac{\cos(lat_m)}{\sum\limits_{j=1}^{N_{lat}}\cos(lat_j)} $$ $lat_m$ is the latitude at m. diff --git a/ppsci/utils/expression.py b/ppsci/utils/expression.py index 33116e35a6..80fe50b8ef 100644 --- a/ppsci/utils/expression.py +++ b/ppsci/utils/expression.py @@ -166,7 +166,7 @@ def visu_forward( Args: expr_dict (Optional[Dict[str, Callable]]): Expression dict. - input_dict (Dict[str, paddle.Tensor]]): Input dict. + input_dict (Dict[str, paddle.Tensor]): Input dict. model (nn.Layer): NN model. Returns: diff --git a/ppsci/visualize/plot.py b/ppsci/visualize/plot.py index 7aa90d91ad..827847691e 100644 --- a/ppsci/visualize/plot.py +++ b/ppsci/visualize/plot.py @@ -165,7 +165,7 @@ def _save_plot_from_2d_array( Args: filename (str): Filename. visu_data (Tuple[np.ndarray, ...]): Data that requires visualization. - visu_keys (Tuple[str, ...]]): Keys for visualizing data. such as ("u", "v"). + visu_keys (Tuple[str, ...]): Keys for visualizing data. such as ("u", "v"). num_timestamps (int, optional): Number of timestamps coord/value contains. Defaults to 1. stride (int, optional): The time stride of visualization. Defaults to 1. xticks (Optional[Tuple[float, ...]]): Tuple of xtick locations. Defaults to None. @@ -314,7 +314,7 @@ def _save_plot_from_3d_array( Args: filename (str): Filename. visu_data (Tuple[np.ndarray, ...]): Data that requires visualization. - visu_keys (Tuple[str, ...]]): Keys for visualizing data. such as ("u", "v"). + visu_keys (Tuple[str, ...]): Keys for visualizing data. such as ("u", "v"). num_timestamps (int, optional): Number of timestamps coord/value contains. Defaults to 1. """ From 08a9bebc3f8d454cdcf56d59b4ab2dbd180b4663 Mon Sep 17 00:00:00 2001 From: HydrogenSulfate <490868991@qq.com> Date: Wed, 31 May 2023 20:28:24 +0800 Subject: [PATCH 2/2] Cherry pick panorama (#360) * fix panorama.png --- docs/images/overview/panorama.png | Bin 85712 -> 86177 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/images/overview/panorama.png b/docs/images/overview/panorama.png index 01d98652eaf6d6aa4e2e224148697b916de9ff5b..64bac4cd31e3a111fc1cc951c1f55391f83fd6c7 100644 GIT binary patch literal 86177 zcmdRWcQ~BeyLN1e8bnAWx`-a6=ruYKogjKdL>X=LQKCge5K*IzXruRDMoSQ)m%-?5 zn9)Zc%r{c@-sha}zwiA1_^yk%UU}D=XWi?0?x(FKOjBKnjD(it(xppeD$4TOmo8oA zymSd)lZXKK8zj_p2KNIGsI4S>sko1R4fk-_T1HLg(xtK}(o>5oxMyM~WkcYlOXTer z-*}ylxi2qW!e*<;%jkNVt~Z%}K1wn@D$_fe&EzsmvZ0O*{Ab zkT?I)F{=Qz!QMoCr%6oFyN-Pn*-dmd9Q8LYki7}wv8+KlbMUP077bdi>HR73Y1tG; z?KVBF_e%t#F4vIn^atGi-feNr(_dpP&-vSYt}Okeu*T*tl2SEis;6!f6`?6_DzA~2 zC@%$yp67*XsB4^p%nHXOd_KS+yWjn7HBJ?yB!ces;csf-ZYXhNosl;QefH5wM2;~R zzzy_594;$cAyOvb0|CaJ8qB39Un|V8Qydz`%-Br(Oc#Wbr>iu!ab#XxRTl96p)lU$ z0Cm{u7paGNi6>b{%Fc&~&0n~oYA#^TFnidsL|NoJ@i^+p{S?^@g2S;LksOVGI7 z?I6+c&EnZbE1+(F=vd-&mPD6Ii2lKsD9t{rTt xE?V}t!3%6OEjCypYI5QjTeW!V+ zc{Xd*oUJDR(dJRODcAgVET1a~*Ib-kD4)CiEL_F(!_hXYRYr}olgg<{B4dgWBNC2M zL^xC^Wx}__0kf~H1*m(uXdS$}R^C#d9dKz%quk3ur^+m-!J4%%S3K31+Sm(8`%z(J z+oE1~7vxfl`OR@jT6677+29YE@9LH#C15VykkCAF!&C-HiQ97%NP|0i1Tj|-B{RRj z@{f6eId+4FQTIht=;9RmmJUG?XEM83?p{ {eLram=m|yXqWKiY^x@Y95}pz0Drf)Vz!?a2K t z-6^1|>7H;PR9-M%NZ%4`5`E5$%X5fJlRRxxaJsK*GoBJs19&6StrK&qT#94{`!pD# zm)>s6)lw&$$f_ZW%(3}%J }S)x*A*qlBGUy6&R+ zvxvghpLRO6sQ@D(BHM}nQ1YpvG)?4;Qr^h%f;gf|*ptm4^w_CV&+He8_mT8Zqr3G@ z?)?AMs350XGUIoHgirL}T20R s@^<`aWLVwe_taan#&;-jei#=#BKB9iT+-R_uJ<1ViU?oboBfs7Q*%gnoBSj@SeP z4iOxi@P3S;Ac8;406wAdja7nISORfMq?xTeKB#*6LC}L`EGMy9cPtF!TCKDQLpa#R z)bvj()lQ0NkRo^Q1}?5A*<>wq_bLm-I%@ekkh>UtId}AhxTCEq26+mOCOPD*i?&ZB zEn2AV51g>^tT38q6BP-+9SHi)Flk;v_B&OhlX;4F?K1klg%InX4%B#?L@|ChI|dV1 zXg=u#HiE}87pAHilo08%dHsOK?DcSZ?KgC5g31WNdNQ>H2#7 vwoT~bmtRNKS5+kLC)#BLmFFwehFp{RY?CFGomLYkw8~#) zaYh->$TpTzw8yvx?sJT?C1f}~>C*{w`nB1Jdiq`?41Cw)>sVNnc_P>%1#9G3RA1BC zb9tN_kmdYP6V8R&ur=DvxW%yl4h21?p#@F5Xh=13L{KK){--i(>dt*5pK`wPq@8xA za23H1GAX1bJiI|ER}GuGFgm*t+3lI)2Hqc=inBQ74!;c5V}dFJ8%_*mOAM{N{f|SX z>jM@T>I5(OkQh3%U0$29)2>!ZY9p&&CRx(vx-_bTC*Op^mHA3~?k#sy$V3Q6_(MvH zVr1z%-u1E6Jks#`YTqEu )PZq@1x# zN|>+AFs|2Z>tgAYdCA!vt%LTW`8)2*C>gn*c}`TWlhX4oao_FLF}v9FF|q$h@Tyid z<0I@xQaL?0N!g~(FFW^vO(LGEvG49G%=!2gQJvGQK-pF3@XZ$jj!G4;!PI@t;Pn?} zk05q_6_0pRRHdeea3gc$qw`QrwV~Z`tFn_zM2>WaaX)WYpO(ww)9IvA>9%3o@>gyZ zhwO`|Ns*QkX96?FszLQ}QJAu;kq_TrTHzFmm!*gQK(h2aHh -~3^4erX z6)%nKMRe!6JiQeNU5I6;Pi7=n8x@o%g$8urUC%$L;pBkaicS}-TIU(vjuz?8;mC~| zHe<6V8I9>!P ;q6$vpD9xGn9s7d>#*U$MvI?7w9DzPGH0*6LU-IL5wSItGt zDAS3nBy9vBr=7M}fUw{tFQ+cX%DPwAv3n~%^9 3LRi=IWHv!YB@S z@Y!I7`&xB?O}2XKTeP?9cISGkbHsjNY_w(`5t*Wd_7Yl1ucZ@V5ELj_NxH!@p~8H+ zGAWOeDi80IPGr(wiI`AlvtgNWk{XQ3J09Wy7RsDQ`+0wa >CgX2OLY zv2O~ic*r2|!oap~mWLQhb7kD7%5crhDn;sbqi{-QAB_#G-4?SRuK5wCdM}--g6WXa zOZ+Z=N%B`K*ku1%vR!k{r&c9rKbsU;av3&w`2g|m^i*x(k(HW6(>;@8+OATPb1Oh* zzBJ2oX(LRtvTRney;>}ogeli=xkMJ|*zioKB@wJ>ZX?bvZ+&T#bK-H{Z+nr-@SqYj z=>JN~<#ixD;epSGO?I9en? vHAOIY2Uc%wBXz?mr!AH<}Vm@PA)*?fc9aZqH?T@OS>$^D4RV>*BR{ z`%)Qr5Lb_WJj^SazIGu<_JIkvZH$nQ^Y)Vb=VKQW-d19A7#6Etz^;n~PnK zdPC@sY$)KeHrU$ZmwoP@STk`0Q{=D$oT7lZY7A}fk$iEZx#Ro6QNGD$9Z*uIG{-rx zz2eM#@y+X9uf^bv)L^K~-EK$TfDu7S#MSoUmbkQjkR`86w vKOWm ztrisz?rELM!TwBHCSp20Hi>bv7N6CRPVydjY&;Sk0(FX8CZhO@vprRWy~{%j0xnJR zL_oCGi%Tv_?&Gm3P0x=Pvw)=NC-6HvI`Kf6ZP1tK`CoU8S)XF+98~G5HKd~`H_@qL z5}#4nkZ(~H*0cGiV$U%BVaJpe!jTrAu!p$6hB64iqKMn4A8pmKtO_nPzDC2y>&N7) zXwVV`vXFXp;xOC03;ifdhQ=Ha?_hs~CkoUnL8Mlg;Az;E{qf`8JE4H#RwBYQu=}0E zoda4NA~=LIMgJsAcH%tA` 7^5p+YE5JC;X=dY{otMt)Q6cdK_$W>VR(3?aM>xS zL1x=1Bd54J%$cU*(N=AY3hj(N(|lC-;)EsD`fy73=>^dGNa;zv?rhe11<6mEG8S73 zw!!7gQrj+R9TLcLrr*i$ALPj%Ce^>FB)24Sxt{aLN 5= z(eK9!+bIIjo+f)8qWwMlLaK%mT_#OKT2V;8{ %@N% zlYKlLU1#kxB|Q4*%fwG0Qa^M`-q(e)Ah+ADu2b^pdkQ3~pG{vrnB!MaSbcp%Q2w@r z?v}>)zD15O=)9G3KrJS948QAt(dF~Zup==0Onz*?d} WFqeWg zc;QB_Q#X?!veo<69EKfJ6rF1nA}l1JinUus^2PRMr2BSMNZu17*&ny-#L~$)KwiBi z*jBa_%(5OnoIXyLj^;^ITOzz-s ipEX}D=^yqNeljYIpw;^G*L3hYcyplO zphKCLUB?H=N5Q&Yl|VTrw*qUfxZZj@o(TiH#LBF*t10xdkA%Er0f7!J@*um)|FcXd zq&7O#qVwS}Y`{n9Jb`d+M> KKlY z9kI~L_Yw}XA)fgGi_ls#Z#w^}$B5Plu>N{_)$j*e3WKrqi9 E9MlBCW1~S3S8YZpgB3%xiYZgHPON*4C^6`I9yP0>b!wiW^oNDU zb>k!q6yy@rlkSl{@!3}0u?VZPq;a=q8jQx()!V(Hg}4FO-Z`hoU%N5Hay8(bBDUk@ zBZTyKlF>rn#|Gc=6Y7BL%>wa#!1mRKtPdzB$QuwoqmO&;q;GN`^)a-?mcX7ko6(?^ zWaVZ`kz)1=QxYAy`Nt^c?Cny>Jvi6)B`G4|shac`!2|bI59N6tm8_k-A5N>NGpsG{ z+kGFh7ieH3%oY@drHZT1TQYKDo}v)W%FzjVju`Rj!G>qBhFtXW4U>jhDUXmsDdxoo z_1l(}=?~((@6Q_@ENc?VLq)ae@0!8bBnh5L-Say0*%!Gq8;#OBpJH&eGulZ~5+|Pg zlT0t>5oOofOID?IS$fUh-=-MPLzbKNd6XD1c)e<)FM-jLFDZ+t7JA~5M(vKb$%V zDF+TnYl5tKtNTH)V&)~kC+BfCKvoD8xJyukQ=8sCUQj;B)DKUk5wx|g@4J}UPPs6~ zH1ug0`3uMBmJQw3oirYf`l(QN+n8d$-tvBC|8O&Qu}_&RmieC8-Et4^VhohC3|C}s zgP7N`Vrj^W-HQoPhc8sl6D# *|=t+V) z=UzzUP5*~-R_1AoEaOp$x%j- sadnmcTQbozP1F*>A2y`iFmGH{xB;$OzFr(haO8Qk(=JEq=cGmgzBvmH) zS|JEyaeT+^Ic8L#!+;T_#CiKm$3u|C^ev?O;!>FtNi$iVhc`)~BOwBrH;Eb>l;o7J zRR;p5=eBwR*ebC3N`!uq%|+u^3+Z`%7knN*XBxTTrg9*kthkpaLt};TF-p{5P2V~( zW&@n>MK*`ofnie|R&B9QZE02@k|_dul&{EP7~?y05i&y&w2i~ShYoA;X4&zu%cCdr z4_3~Ub8$ccFaXm!mnlem^yLvaG^FNeO6LUeNmKWcmftRQki0F 7`>it8(%&Dl=?5*tx=_^c TY;4_=86cT`z&uWfwJR~9~Jb9o0e9>aQw7fa$Fw=`xQ3h zXe@^F?K7(R>i>4?LbyRQ6L9xK35S$>KGWCSUv>Juxj6bXT~;Mz%+a}2foCFL%pgUF z3wI-Ub+;B4=pIdUg>i7A