[Fix] Fix inference path typo (PaddlePaddle#880)

* fix(test=document_fix) * fix typo for correcting 'pdpiparmas' to 'pdiparams' * add left bracket for docstring of CuboidSelfAttentionLayer
huohuohuohuohuo123 · May 6, 2024 · c61a5f6 · c61a5f6
1 parent 3f3d2f9
commit c61a5f6
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 24 deletions.
diff --git a/examples/NLS-MB/conf/NLS-MB_rogue_wave.yaml b/examples/NLS-MB/conf/NLS-MB_rogue_wave.yaml
@@ -62,7 +62,7 @@ INFER:
   pretrained_model_path: https://paddle-org.bj.bcebos.com/paddlescience/models/NLS-MB/NLS-MB_rogue_wave_pretrained.pdparams
   export_path: ./inference/NLS-MB_rogue_wave
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   device: gpu
   engine: native
   precision: fp32

diff --git a/examples/NLS-MB/conf/NLS-MB_soliton.yaml b/examples/NLS-MB/conf/NLS-MB_soliton.yaml
@@ -62,7 +62,7 @@ INFER:
   pretrained_model_path: https://paddle-org.bj.bcebos.com/paddlescience/models/NLS-MB/NLS-MB_soliton_pretrained.pdparams
   export_path: ./inference/NLS-MB_soliton
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   device: gpu
   engine: native
   precision: fp32

diff --git a/examples/allen_cahn/conf/allen_cahn.yaml b/examples/allen_cahn/conf/allen_cahn.yaml
@@ -70,7 +70,7 @@ INFER:
   pretrained_model_path: https://paddle-org.bj.bcebos.com/paddlescience/models/AllenCahn/allen_cahn_plain_pretrained.pdparams
   export_path: ./inference/allen_cahn
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   onnx_path: ${INFER.export_path}.onnx
   device: gpu
   engine: native

diff --git a/examples/allen_cahn/conf/allen_cahn_causal_fourier_rwf.yaml b/examples/allen_cahn/conf/allen_cahn_causal_fourier_rwf.yaml
@@ -79,7 +79,7 @@ INFER:
   pretrained_model_path: https://paddle-org.bj.bcebos.com/paddlescience/models/AllenCahn/allen_cahn_plain_pretrained.pdparams
   export_path: ./inference/allen_cahn
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   onnx_path: ${INFER.export_path}.onnx
   device: gpu
   engine: native

diff --git a/examples/allen_cahn/conf/allen_cahn_default.yaml b/examples/allen_cahn/conf/allen_cahn_default.yaml
@@ -83,7 +83,7 @@ INFER:
   pretrained_model_path: https://paddle-org.bj.bcebos.com/paddlescience/models/AllenCahn/allen_cahn_plain_pretrained.pdparams
   export_path: ./inference/allen_cahn
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   onnx_path: ${INFER.export_path}.onnx
   device: gpu
   engine: native

diff --git a/examples/aneurysm/conf/aneurysm.yaml b/examples/aneurysm/conf/aneurysm.yaml
@@ -105,7 +105,7 @@ INFER:
   pretrained_model_path: https://paddle-org.bj.bcebos.com/paddlescience/models/aneurysm/aneurysm_pretrained.pdparams
   export_path: ./inference/aneurysm
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   onnx_path: ${INFER.export_path}.onnx
   device: gpu
   engine: native

diff --git a/examples/biharmonic2d/conf/biharmonic2d.yaml b/examples/biharmonic2d/conf/biharmonic2d.yaml
@@ -79,7 +79,7 @@ INFER:
   pretrained_model_path: https://paddle-org.bj.bcebos.com/paddlescience/models/biharmonic2d/biharmonic2d_pretrained.pdparams
   export_path: ./inference/biharmonic2d
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   output_keys: ["Mx", "Mxy", "My", "Qx", "Qy", "w"]
   device: gpu
   engine: native

diff --git a/examples/earthformer/conf/earthformer_enso_pretrain.yaml b/examples/earthformer/conf/earthformer_enso_pretrain.yaml
@@ -133,7 +133,7 @@ INFER:
   pretrained_model_path: ./checkpoint/enso/earthformer_enso.pdparams
   export_path: ./inference/earthformer/enso
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   device: gpu
   engine: native
   precision: fp32

diff --git a/examples/earthformer/conf/earthformer_sevir_pretrain.yaml b/examples/earthformer/conf/earthformer_sevir_pretrain.yaml
@@ -161,7 +161,7 @@ INFER:
   pretrained_model_path: ./checkpoint/sevir/earthformer_sevir.pdparams
   export_path: ./inference/earthformer/sevir
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   device: gpu
   engine: native
   precision: fp32

diff --git a/examples/earthformer/predictor.py b/examples/earthformer/predictor.py
@@ -32,7 +32,7 @@ def __init__(
     ):
         super().__init__(
             cfg.INFER.pdmodel_path,
-            cfg.INFER.pdpiparams_path,
+            cfg.INFER.pdiparams_path,
             device=cfg.INFER.device,
             engine=cfg.INFER.engine,
             precision=cfg.INFER.precision,

diff --git a/examples/euler_beam/conf/euler_beam.yaml b/examples/euler_beam/conf/euler_beam.yaml
@@ -66,7 +66,7 @@ INFER:
   pretrained_model_path: "https://paddle-org.bj.bcebos.com/paddlescience/models/euler_beam/euler_beam_pretrained.pdparams"
   export_path: ./inference/euler_beam
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   device: gpu
   engine: native
   precision: fp32

diff --git a/examples/fsi/conf/viv.yaml b/examples/fsi/conf/viv.yaml
@@ -68,7 +68,7 @@ INFER:
   pretrained_model_path: "https://paddle-org.bj.bcebos.com/paddlescience/models/viv/viv_pretrained.pdparams"
   export_path: ./inference/viv
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   input_keys: ${MODEL.input_keys}
   output_keys: ["eta", "f"]
   device: gpu

diff --git a/examples/ide/conf/volterra_ide.yaml b/examples/ide/conf/volterra_ide.yaml
@@ -66,7 +66,7 @@ INFER:
   pretrained_model_path: https://paddle-org.bj.bcebos.com/paddlescience/models/volterra_ide/volterra_ide_pretrained.pdparams
   export_path: ./inference/volterra_ide
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   device: gpu
   engine: native
   precision: fp32

diff --git a/examples/laplace/conf/laplace2d.yaml b/examples/laplace/conf/laplace2d.yaml
@@ -59,7 +59,7 @@ INFER:
   pretrained_model_path: https://paddle-org.bj.bcebos.com/paddlescience/models/laplace2d/laplace2d_pretrained.pdparams
   export_path: ./inference/laplace2d
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   device: gpu
   engine: native
   precision: fp32

diff --git a/examples/lorenz/conf/transformer.yaml b/examples/lorenz/conf/transformer.yaml
@@ -70,7 +70,7 @@ INFER:
   pretrained_model_path: https://paddle-org.bj.bcebos.com/paddlescience/models/lorenz/lorenz_transformer_pretrained.pdparams
   export_path: ./inference/lorenz_transformer
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   device: gpu
   engine: native
   precision: fp32

diff --git a/examples/nsfnet/conf/VP_NSFNet4.yaml b/examples/nsfnet/conf/VP_NSFNet4.yaml
@@ -58,7 +58,7 @@ INFER:
   pretrained_model_path: https://paddle-org.bj.bcebos.com/paddlescience/models/nsfnet/nsfnet4.pdparams
   export_path: ./inference/VP_NSFNet4
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   output_keys: ['p', 'u', 'v', 'w']
   device: gpu
   engine: native

diff --git a/examples/rossler/conf/transformer.yaml b/examples/rossler/conf/transformer.yaml
@@ -69,7 +69,7 @@ INFER:
   pretrained_model_path: https://paddle-org.bj.bcebos.com/paddlescience/models/rossler/rossler_transformer_pretrained.pdparams
   export_path: ./inference/rossler_transformer
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   device: gpu
   engine: native
   precision: fp32

diff --git a/examples/topopt/conf/topopt.yaml b/examples/topopt/conf/topopt.yaml
@@ -70,7 +70,7 @@ INFER:
   pretrained_model_path_dict: {'Uniform': 'https://paddle-org.bj.bcebos.com/paddlescience/models/topopt/uniform_pretrained.pdparams', 'Poisson5': 'https://paddle-org.bj.bcebos.com/paddlescience/models/topopt/poisson5_pretrained.pdparams', 'Poisson10': 'https://paddle-org.bj.bcebos.com/paddlescience/models/topopt/poisson10_pretrained.pdparams', 'Poisson30': 'https://paddle-org.bj.bcebos.com/paddlescience/models/topopt/poisson30_pretrained.pdparams'}
   export_path: ./inference/topopt_${INFER.pretrained_model_name}
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   device: gpu
   engine: native
   precision: fp32

diff --git a/examples/yinglong1/conf/yinglong_12.yaml b/examples/yinglong1/conf/yinglong_12.yaml
@@ -35,7 +35,7 @@ INFER:
   pretrained_model_path: null
   export_path: ./inference/yinglong_12
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   onnx_path: ${INFER.export_path}.onnx
   device: gpu
   engine: native

diff --git a/examples/yinglong1/conf/yinglong_24.yaml b/examples/yinglong1/conf/yinglong_24.yaml
@@ -35,7 +35,7 @@ INFER:
   pretrained_model_path: null
   export_path: ./inference/yinglong_24
   pdmodel_path: ${INFER.export_path}.pdmodel
-  pdpiparams_path: ${INFER.export_path}.pdiparams
+  pdiparams_path: ${INFER.export_path}.pdiparams
   onnx_path: ${INFER.export_path}.onnx
   device: gpu
   engine: native

diff --git a/examples/yinglong1/predictor.py b/examples/yinglong1/predictor.py
@@ -38,7 +38,7 @@ def __init__(
     ):
         super().__init__(
             cfg.INFER.pdmodel_path,
-            cfg.INFER.pdpiparams_path,
+            cfg.INFER.pdiparams_path,
             device=cfg.INFER.device,
             engine=cfg.INFER.engine,
             precision=cfg.INFER.precision,

diff --git a/ppsci/arch/cuboid_transformer_encoder.py b/ppsci/arch/cuboid_transformer_encoder.py
@@ -460,10 +460,10 @@ class CuboidSelfAttentionLayer(paddle.nn.Layer):
 
     We adopt two mechanisms for decomposing the input tensor into cuboids:
 
-    1) local:
+    (1) local:
         We group the tensors within a local window, e.g., X[t:(t+b_t), h:(h+b_h), w:(w+b_w)]. We can also apply the
         shifted window strategy proposed in "[ICCV2021] Swin Transformer: Hierarchical Vision Transformer using Shifted Windows".
-    2) dilated:
+    (2) dilated:
         Inspired by the success of dilated convolution "[ICLR2016] Multi-Scale Context Aggregation by Dilated Convolutions",
          we split the tensor with dilation factors that are tied to the size of the cuboid. For example, for a cuboid that has width `b_w`,
          we sample the elements starting from 0 as 0, w / b_w, 2 * w / b_w, ..., (b_w - 1) * w / b_w.

diff --git a/ppsci/utils/config.py b/ppsci/utils/config.py
@@ -197,7 +197,7 @@ class InferConfig(BaseModel):
         pretrained_model_path: Optional[str] = None
         export_path: str
         pdmodel_path: Optional[str] = None
-        pdpiparams_path: Optional[str] = None
+        pdiparams_path: Optional[str] = None
         onnx_path: Optional[str] = None
         device: Literal["gpu", "cpu", "npu", "xpu"] = "cpu"
         engine: Literal["native", "tensorrt", "onnx", "mkldnn"] = "native"