1. remove useless imports; 2. fix bugs in csv_validator.py and navier_stokes.py; 3. replace f-string with string if f-string has no placeholders

HydrogenSulfate · HydrogenSulfate · commit 862076b1f912 · 2023-03-28T03:02:06.000Z
diff --git a/ppsci/arch/base.py b/ppsci/arch/base.py
@@ -32,7 +32,7 @@ def __init__(self, *args, **kwargs):
         self._output_transform = None
 
     def forward(self, *args, **kwargs):
-        raise NotImplementedError(f"NetBase.forward is not implemented")
+        raise NotImplementedError("NetBase.forward is not implemented")
 
     @property
     def num_params(self):
diff --git a/ppsci/arch/mlp.py b/ppsci/arch/mlp.py
@@ -51,12 +51,12 @@ def __init__(
         if isinstance(hidden_size, (tuple, list)):
             if num_layers is not None:
                 raise ValueError(
-                    f"num_layers should be None when hidden_size is specified"
+                    "num_layers should be None when hidden_size is specified"
                 )
         elif isinstance(hidden_size, int):
             if not isinstance(num_layers, int):
                 raise ValueError(
-                    f"num_layers should be an int when hidden_size is an int"
+                    "num_layers should be an int when hidden_size is an int"
                 )
             hidden_size = [hidden_size] * num_layers
         else:
diff --git a/ppsci/constraint/base.py b/ppsci/constraint/base.py
@@ -13,8 +13,6 @@
 limitations under the License.
 """
 
-import numpy as np
-
 from ppsci import data
 
 
diff --git a/ppsci/constraint/boundary_constraint.py b/ppsci/constraint/boundary_constraint.py
@@ -13,7 +13,6 @@
 limitations under the License.
 """
 
-import os.path as osp
 import types
 
 import numpy as np
@@ -23,7 +22,6 @@
 from ppsci import geometry
 from ppsci.constraint import base
 from ppsci.data import dataset
-from ppsci.utils import misc
 
 
 class BoundaryConstraint(base.Constraint):
diff --git a/ppsci/constraint/supervised_constraint.py b/ppsci/constraint/supervised_constraint.py
@@ -13,7 +13,6 @@
 limitations under the License.
 """
 
-import os.path as osp
 import types
 
 import numpy as np
@@ -61,7 +60,7 @@ def __init__(
             # load data
             data = self._load_csv_file(data_file, input_keys + label_keys, alias_dict)
             if "t" not in data and timestamps is None:
-                raise ValueError(f"must given time data from t0 or data itself.")
+                raise ValueError("Time should be given by arg t0 or data itself.")
             if timestamps is not None:
                 if "t" in data:
                     raw_time_array = data["t"]
@@ -95,7 +94,7 @@ def __init__(
 
             self.label_expr = {key: (lambda d, k=key: d[k]) for key in self.output_keys}
         else:
-            raise NotImplementedError(f"Only suppport .csv file now.")
+            raise NotImplementedError("Only suppport .csv file now.")
 
         weight = {key: np.ones_like(next(iter(label.values()))) for key in label}
         if weight_dict is not None:
@@ -162,7 +161,7 @@ def __init__(
             # load data
             data = misc.load_csv_file(data_file, input_keys + label_keys, alias_dict)
             if "t" not in data and t0 is None:
-                raise ValueError(f"must given time data from t0 or data itself.")
+                raise ValueError("Time should be given by arg t0 or data itself.")
             if t0 is not None:
                 data = misc.convert_to_array(data, self.input_keys + self.output_keys)
                 data = misc.combine_array_with_time(data, [t0])
@@ -178,7 +177,7 @@ def __init__(
             self.label_expr = {key: (lambda d, k=key: d[k]) for key in self.output_keys}
             self.num_timestamp = 1
         else:
-            raise NotImplementedError(f"Only suppport .csv file now.")
+            raise NotImplementedError("Only suppport .csv file now.")
 
         weight = {key: np.ones_like(next(iter(label.values()))) for key in label}
         if weight_dict is not None:
diff --git a/ppsci/equation/pde/navier_stokes.py b/ppsci/equation/pde/navier_stokes.py
@@ -94,8 +94,8 @@ def momentum_y_compute_func(out):
         if self.dim == 3:
 
             def momentum_z_compute_func(out):
-                x, y = out["x"], out["y"]
-                u, v, p = out["u"], out["v"], out["p"]
+                x, y, z = out["x"], out["y"], out["z"]
+                u, v, w, p = out["u"], out["v"], out["w"], out["p"]
                 momentum_z = (
                     u * jacobian(w, x)
                     + v * jacobian(w, y)
diff --git a/ppsci/geometry/geometry.py b/ppsci/geometry/geometry.py
@@ -78,7 +78,7 @@ def sample_interior(self, n, random="pseudo", criteria=None, evenly=False):
                 _nsuc += 1
 
             if _ntry >= 1000 and _nsuc == 0:
-                raise RuntimeError(f"sample interior failed")
+                raise RuntimeError("sample interior failed")
         return misc.convert_to_dict(x, self.dim_keys)
 
     def sample_boundary(self, n, random="pseudo", criteria=None, evenly=False):
@@ -117,7 +117,7 @@ def sample_boundary(self, n, random="pseudo", criteria=None, evenly=False):
                 _nsuc += 1
 
             if _ntry >= 1000 and _nsuc == 0:
-                raise RuntimeError(f"sample boundary failed")
+                raise RuntimeError("sample boundary failed")
 
         if not (
             misc.typename(self) == "TimeXGeometry"
diff --git a/ppsci/geometry/mesh.py b/ppsci/geometry/mesh.py
@@ -270,7 +270,7 @@ def sample_boundary(
             while _size < n:
                 if evenly:
                     raise ValueError(
-                        f"Can't sample evenly on mesh now, please set evenly=False."
+                        "Can't sample evenly on mesh now, please set evenly=False."
                     )
                     # points, normal, area = self.uniform_boundary_points(n, False)
                 else:
@@ -290,7 +290,7 @@ def sample_boundary(
                     _nsuc += 1
 
                 if _ntry >= 1000 and _nsuc == 0:
-                    raise RuntimeError(f"sample boundary failed")
+                    raise RuntimeError("sample boundary failed")
 
         normal_dict = misc.convert_to_dict(
             normal, [f"normal_{key}" for key in self.dim_keys if key != "t"]
@@ -348,7 +348,7 @@ def sample_interior(self, n, random="pseudo", criteria=None, evenly=False):
                 _nsuc += 1
 
             if _ntry >= 1000 and _nsuc == 0:
-                raise RuntimeError(f"sample interior failed")
+                raise RuntimeError("sample interior failed")
 
         x_dict = misc.convert_to_dict(x, self.dim_keys)
 
diff --git a/ppsci/geometry/pointcloud.py b/ppsci/geometry/pointcloud.py
@@ -13,8 +13,6 @@
 limitations under the License.
 """
 
-import os.path as osp
-
 import numpy as np
 
 from ppsci.geometry import geometry
@@ -136,7 +134,7 @@ def scale(self, scale):
     def uniform_boundary_points(self, n: int):
         """Compute the equispaced points on the boundary."""
         raise NotImplementedError(
-            f"PointCloud do not have 'uniform_boundary_points' method"
+            "PointCloud do not have 'uniform_boundary_points' method"
         )
 
     def random_boundary_points(self, n, random="pseudo"):
@@ -163,32 +161,32 @@ def random_points(self, n, random="pseudo"):
 
     def union(self, rhs):
         raise NotImplementedError(
-            f"Union operation for PointCloud is not supported yet."
+            "Union operation for PointCloud is not supported yet."
         )
 
     def __or__(self, rhs):
         raise NotImplementedError(
-            f"Union operation for PointCloud is not supported yet."
+            "Union operation for PointCloud is not supported yet."
         )
 
     def difference(self, rhs):
         raise NotImplementedError(
-            f"Subtraction operation for PointCloud is not supported yet."
+            "Subtraction operation for PointCloud is not supported yet."
         )
 
     def __sub__(self, rhs):
         raise NotImplementedError(
-            f"Subtraction operation for PointCloud is not supported yet."
+            "Subtraction operation for PointCloud is not supported yet."
         )
 
     def intersection(self, rhs):
         raise NotImplementedError(
-            f"Intersection operation for PointCloud is not supported yet."
+            "Intersection operation for PointCloud is not supported yet."
         )
 
     def __and__(self, rhs):
         raise NotImplementedError(
-            f"Intersection operation for PointCloud is not supported yet."
+            "Intersection operation for PointCloud is not supported yet."
         )
 
     def __str__(self) -> str:
diff --git a/ppsci/geometry/timedomain.py b/ppsci/geometry/timedomain.py
@@ -370,7 +370,7 @@ def sample_initial_interior(
                 _nsuc += 1
 
             if _ntry >= 1000 and _nsuc == 0:
-                raise RuntimeError(f"sample initial interior failed")
+                raise RuntimeError("sample initial interior failed")
         return misc.convert_to_dict(x, self.dim_keys)
 
     def __str__(self) -> str:
diff --git a/ppsci/solver/solver.py b/ppsci/solver/solver.py
@@ -18,7 +18,6 @@
 from typing import Any
 from typing import Dict
 from typing import Optional
-from typing import Union
 
 import paddle
 import paddle.amp as amp
@@ -185,7 +184,7 @@ def __init__(
         logger.info(f"Using paddlepaddle {paddle_version} on device {self.device}")
 
     @staticmethod
-    def from_conf(cfg: Dict[str, Any], mode: Literal["train", "eval"]):
+    def from_config(cfg: Dict[str, Any], mode: Literal["train", "eval"]):
         config.print_config(cfg)
         # TODO(sensen): sanity check for config
         output_dir = cfg["Global"]["output_dir"]
diff --git a/ppsci/utils/misc.py b/ppsci/utils/misc.py
@@ -27,7 +27,8 @@
     "AverageMeter",
     "PrettyOrderedDict",
     "Prettydefaultdict",
-    "concat_dict_list" "convert_to_array",
+    "concat_dict_list",
+    "convert_to_array",
     "convert_to_dict",
     "load_csv_file",
     "stack_dict_list",
diff --git a/ppsci/validate/csv_validator.py b/ppsci/validate/csv_validator.py
@@ -51,8 +51,12 @@ def __init__(
     ):
         # read data
         data_dict = misc.load_csv_file(csv_path, input_keys + label_keys, alias_dict)
-        self.input_keys = list(input.keys())
-        self.output_keys = list(label.keys())
+        self.input_keys = [
+            alias_dict[key] if key in alias_dict else key for key in input_keys
+        ]
+        self.output_keys = [
+            alias_dict[key] if key in alias_dict else key for key in input_keys
+        ]
 
         input = {}
         for key in self.input_keys:
diff --git a/ppsci/validate/geo_validator.py b/ppsci/validate/geo_validator.py
@@ -82,7 +82,7 @@ def __init__(
                     )
             else:
                 raise NotImplementedError(
-                    f"TimeXGeometry with random timestamp not implemented yet."
+                    "TimeXGeometry with random timestamp not implemented yet."
                 )
         else:
             input = geom.sample_interior(nx, random, criteria, evenly)
