update develop code

HydrogenSulfate · HydrogenSulfate · commit b6d713968b2e · 2024-05-15T06:38:38.000Z
diff --git a/ppsci/arch/phycrnet.py b/ppsci/arch/phycrnet.py
@@ -147,7 +147,7 @@ def __init__(
         )
 
         # ConvLSTM
-        self.ConvLSTM = paddle.nn.LayerList(
+        self.convlstm = paddle.nn.LayerList(
             [
                 ConvLSTMCell(
                     input_channels=self.input_channels[i],
@@ -194,16 +194,16 @@ def forward(self, x):
                 x = encoder(x)
 
             # convlstm
-            for i, LSTM in enumerate(self.ConvLSTM):
+            for i, lstm in enumerate(self.convlstm, self.num_encoder):
                 if step == 0:
-                    (h, c) = LSTM.init_hidden_tensor(
+                    (h, c) = lstm.init_hidden_tensor(
                         prev_state=self.initial_state[i - self.num_encoder]
                     )
                     internal_state.append((h, c))
 
                 # one-step forward
                 (h, c) = internal_state[i - self.num_encoder]
-                x, new_c = LSTM(x, h, c)
+                x, new_c = lstm(x, h, c)
                 internal_state[i - self.num_encoder] = (x, new_c)
 
             # output
diff --git a/ppsci/equation/pde/base.py b/ppsci/equation/pde/base.py
@@ -22,7 +22,7 @@
 from typing import Union
 
 import paddle
-import sympy
+import sympy as sp
 from paddle import nn
 
 DETACH_FUNC_NAME = "detach"
@@ -33,7 +33,7 @@ class PDE:
 
     def __init__(self):
         super().__init__()
-        self.equations = {}
+        self.equations: Dict[str, Union[Callable, sp.Basic]] = {}
         # for PDE which has learnable parameter(s)
         self.learnable_parameters = nn.ParameterList()
 
@@ -42,7 +42,7 @@ def __init__(self):
     @staticmethod
     def create_symbols(
         symbol_str: str,
-    ) -> Union[sympy.Symbol, Tuple[sympy.Symbol, ...]]:
+    ) -> Union[sp.Symbol, Tuple[sp.Symbol, ...]]:
         """create symbolic variables.
 
         Args:
@@ -61,11 +61,9 @@ def create_symbols(
             >>> print(symbols_xyz)
             (x, y, z)
         """
-        return sympy.symbols(symbol_str)
+        return sp.symbols(symbol_str)
 
-    def create_function(
-        self, name: str, invars: Tuple[sympy.Symbol, ...]
-    ) -> sympy.Function:
+    def create_function(self, name: str, invars: Tuple[sp.Symbol, ...]) -> sp.Function:
         """Create named function depending on given invars.
 
         Args:
@@ -86,14 +84,73 @@ def create_function(
             >>> print(f)
             f(x, y, z)
         """
-        expr = sympy.Function(name)(*invars)
+        expr = sp.Function(name)(*invars)
 
-        # wrap `expression(...)` to `detach(expression(...))`
-        # if name of expression is in given detach_keys
-        if self.detach_keys and name in self.detach_keys:
-            expr = sympy.Function(DETACH_FUNC_NAME)(expr)
         return expr
 
+    def _apply_detach(self):
+        """
+        Wrap detached sub_expr into detach(sub_expr) to prevent gradient
+        back-propagation, only for those items speicified in self.detach_keys.
+
+        NOTE: This function is expected to be called after self.equations is ready in PDE.__init__.
+
+        Examples:
+            >>> import ppsci
+            >>> ns = ppsci.equation.NavierStokes(1.0, 1.0, 2, False)
+            >>> print(ns)
+            NavierStokes
+                continuity: Derivative(u(x, y), x) + Derivative(v(x, y), y)
+                momentum_x: u(x, y)*Derivative(u(x, y), x) + v(x, y)*Derivative(u(x, y), y) + 1.0*Derivative(p(x, y), x) - 1.0*Derivative(u(x, y), (x, 2)) - 1.0*Derivative(u(x, y), (y, 2))
+                momentum_y: u(x, y)*Derivative(v(x, y), x) + v(x, y)*Derivative(v(x, y), y) + 1.0*Derivative(p(x, y), y) - 1.0*Derivative(v(x, y), (x, 2)) - 1.0*Derivative(v(x, y), (y, 2))
+            >>> detach_keys = ("u", "v__y")
+            >>> ns = ppsci.equation.NavierStokes(1.0, 1.0, 2, False, detach_keys=detach_keys)
+            >>> print(ns)
+            NavierStokes
+                continuity: detach(Derivative(v(x, y), y)) + Derivative(u(x, y), x)
+                momentum_x: detach(u(x, y))*Derivative(u(x, y), x) + v(x, y)*Derivative(u(x, y), y) + 1.0*Derivative(p(x, y), x) - 1.0*Derivative(u(x, y), (x, 2)) - 1.0*Derivative(u(x, y), (y, 2))
+                momentum_y: detach(u(x, y))*Derivative(v(x, y), x) + detach(Derivative(v(x, y), y))*v(x, y) + 1.0*Derivative(p(x, y), y) - 1.0*Derivative(v(x, y), (x, 2)) - 1.0*Derivative(v(x, y), (y, 2))
+        """
+        if self.detach_keys is None:
+            return
+
+        from copy import deepcopy
+
+        from sympy.core.traversal import postorder_traversal
+
+        from ppsci.utils.symbolic import _cvt_to_key
+
+        for name, expr in self.equations.items():
+            if not isinstance(expr, sp.Basic):
+                continue
+            # only process sympy expression
+            expr_ = deepcopy(expr)
+            for item in postorder_traversal(expr):
+                if _cvt_to_key(item) in self.detach_keys:
+                    # inplace all related sub_expr into detach(sub_expr)
+                    expr_ = expr_.replace(item, sp.Function(DETACH_FUNC_NAME)(item))
+
+                    # remove all detach wrapper for more-than-once wrapped items to prevent duplicated wrapping
+                    expr_ = expr_.replace(
+                        sp.Function(DETACH_FUNC_NAME)(
+                            sp.Function(DETACH_FUNC_NAME)(item)
+                        ),
+                        sp.Function(DETACH_FUNC_NAME)(item),
+                    )
+
+                    # remove unccessary detach wrapping for the first arg of Derivative
+                    for item_ in list(postorder_traversal(expr_)):
+                        if isinstance(item_, sp.Derivative):
+                            if item_.args[0].name == DETACH_FUNC_NAME:
+                                expr_ = expr_.replace(
+                                    item_,
+                                    sp.Derivative(
+                                        item_.args[0].args[0], *item_.args[1:]
+                                    ),
+                                )
+
+            self.equations[name] = expr_
+
     def add_equation(self, name: str, equation: Callable):
         """Add an equation.
 
@@ -110,7 +167,8 @@ def add_equation(self, name: str, equation: Callable):
             >>> equation = sympy.diff(u, x) + sympy.diff(u, y)
             >>> pde.add_equation('linear_pde', equation)
             >>> print(pde)
-            PDE, linear_pde: 2*x + 2*y
+            PDE
+                linear_pde: 2*x + 2*y
         """
         self.equations.update({name: equation})
 
@@ -181,7 +239,7 @@ def set_state_dict(
         return self.learnable_parameters.set_state_dict(state_dict)
 
     def __str__(self):
-        return ", ".join(
+        return "\n".join(
             [self.__class__.__name__]
-            + [f"{name}: {eq}" for name, eq in self.equations.items()]
+            + [f"    {name}: {eq}" for name, eq in self.equations.items()]
         )
diff --git a/ppsci/equation/pde/biharmonic.py b/ppsci/equation/pde/biharmonic.py
@@ -70,3 +70,5 @@ def __init__(
                 biharmonic += u.diff(invar_i, 2).diff(invar_j, 2)
 
         self.add_equation("biharmonic", biharmonic)
+
+        self._apply_detach()
diff --git a/ppsci/equation/pde/heat_exchanger.py b/ppsci/equation/pde/heat_exchanger.py
@@ -90,3 +90,5 @@ def __init__(
         self.add_equation("heat_boundary", heat_boundary)
         self.add_equation("cold_boundary", cold_boundary)
         self.add_equation("wall", wall)
+
+        self._apply_detach()
diff --git a/ppsci/equation/pde/laplace.py b/ppsci/equation/pde/laplace.py
@@ -51,3 +51,5 @@ def __init__(self, dim: int, detach_keys: Optional[Tuple[str, ...]] = None):
             laplace += u.diff(invar, 2)
 
         self.add_equation("laplace", laplace)
+
+        self._apply_detach()
diff --git a/ppsci/equation/pde/linear_elasticity.py b/ppsci/equation/pde/linear_elasticity.py
@@ -179,3 +179,5 @@ def __init__(
         self.add_equation("traction_y", traction_y)
         if self.dim == 3:
             self.add_equation("traction_z", traction_z)
+
+        self._apply_detach()
diff --git a/ppsci/equation/pde/navier_stokes.py b/ppsci/equation/pde/navier_stokes.py
@@ -147,3 +147,5 @@ def __init__(
         self.add_equation("momentum_y", momentum_y)
         if self.dim == 3:
             self.add_equation("momentum_z", momentum_z)
+
+        self._apply_detach()
diff --git a/ppsci/equation/pde/nls_m_b.py b/ppsci/equation/pde/nls_m_b.py
@@ -97,3 +97,5 @@ def __init__(
         self.add_equation("Maxwell_1", Maxwell_1)
         self.add_equation("Maxwell_2", Maxwell_2)
         self.add_equation("Bloch", Bloch)
+
+        self._apply_detach()
diff --git a/ppsci/equation/pde/normal_dot_vec.py b/ppsci/equation/pde/normal_dot_vec.py
@@ -55,3 +55,5 @@ def __init__(
             normal_dot_vec += normal * vec
 
         self.add_equation("normal_dot_vec", normal_dot_vec)
+
+        self._apply_detach()
diff --git a/ppsci/equation/pde/poisson.py b/ppsci/equation/pde/poisson.py
@@ -49,3 +49,5 @@ def __init__(self, dim: int, detach_keys: Optional[Tuple[str, ...]] = None):
             poisson += p.diff(invar, 2)
 
         self.add_equation("poisson", poisson)
+
+        self._apply_detach()
diff --git a/ppsci/equation/pde/viv.py b/ppsci/equation/pde/viv.py
@@ -60,3 +60,5 @@ def __init__(self, rho: float, k1: float, k2: float):
         k2 = self.create_symbols(self.k2.name)
         f = self.rho * eta.diff(t_f, 2) + sp.exp(k1) * eta.diff(t_f) + sp.exp(k2) * eta
         self.add_equation("f", f)
+
+        self._apply_detach()
diff --git a/ppsci/utils/download.py b/ppsci/utils/download.py
@@ -157,7 +157,7 @@ def _download(url, path, md5sum=None):
                     if chunk:
                         f.write(chunk)
         shutil.move(tmp_fullname, fullname)
-        logger.message(f"Finished downloading pretrained model and saved to {fullname}")
+        logger.message(f"Finish downloading pretrained model and saved to {fullname}")
 
     return fullname
 
diff --git a/ppsci/utils/symbolic.py b/ppsci/utils/symbolic.py
@@ -40,6 +40,7 @@
 
 __all__ = [
     "lambdify",
+    "_cvt_to_key",
 ]
 
 
@@ -116,14 +117,18 @@ def _cvt_to_key(expr: sp.Basic) -> str:
     Returns:
         str: Converted string key.
     """
+    if isinstance(expr, sp.Function) and str(expr.func) == equation.DETACH_FUNC_NAME:
+        return f"{_cvt_to_key(expr.args[0])}_{equation.DETACH_FUNC_NAME}"
+
     if isinstance(expr, (sp.Symbol, sp.core.function.UndefinedFunction, sp.Function)):
+        # use name of custom function(e.g. "f") instead of itself(e.g. "f(x, y)")
+        # for simplicity.
         if hasattr(expr, "name"):
-            # use name of custom function instead of itself.
             return expr.name
         else:
             return str(expr)
     elif isinstance(expr, sp.Derivative):
-        # convert Derivative(u(x,y),(x,2),(y,2)) to "u__x__x__y__y"
+        # convert "Derivative(u(x,y),(x,2),(y,2))" to "u__x__x__y__y"
         expr_str = expr.args[0].name
         for symbol, order in expr.args[1:]:
             expr_str += f"__{symbol}" * order
@@ -813,12 +818,13 @@ def _expr_to_callable_nodes(
                 else:
                     callable_nodes.append(OperatorNode(node))
             elif isinstance(node, sp.Function):
-                if node.name == equation.DETACH_FUNC_NAME:
+                if str(node.func) == equation.DETACH_FUNC_NAME:
                     callable_nodes.append(DetachNode(node))
+                    logger.debug(f"Detected detach node {node}")
                 else:
                     match_index = None
                     for j, model in enumerate(models):
-                        if str(node.func.name) in model.output_keys:
+                        if str(node.func) in model.output_keys:
                             callable_nodes.append(
                                 LayerNode(
                                     node,
@@ -828,13 +834,13 @@ def _expr_to_callable_nodes(
                             if match_index is not None:
                                 raise ValueError(
                                     f"Name of function: '{node}' should be unique along given"
-                                    f" models, but got same output_key: '{node.func.name}' "
+                                    f" models, but got same output_key: '{str(node.func)}' "
                                     f"in given models[{match_index}] and models[{j}]."
                                 )
                             match_index = j
                     # NOTE: Skip 'sdf' function, which should be already generated in
                     # given data_dict
-                    if match_index is None and node.name != "sdf":
+                    if match_index is None and str(node.func) != "sdf":
                         raise ValueError(
                             f"Node {node} can not match any model in given model(s)."
                         )
@@ -925,7 +931,7 @@ def _expr_to_callable_nodes(
             logger.debug(
                 f"Fused {len(candidate_pos)} derivatives nodes: "
                 f"{[callable_nodes_group[i][j].expr for i, j in candidate_pos]} into"
-                f" fuse node sequence: {fused_node_seq} at position: ([{gid0}][{nid0}])"
+                f" {len(fused_node_seq)} fuse node sequence: {fused_node_seq} at position: ([{gid0}][{nid0}])"
             )
 
             # mark merged node
diff --git a/test/utils/test_config.py b/test/utils/test_config.py
@@ -5,13 +5,11 @@
 import pytest
 import yaml
 
-# 假设你的回调类在这个路径下
 from ppsci.utils.callbacks import InitCallback
 
-# 设置 Paddle 的 seed
 paddle.seed(1024)
 
-# 测试函数不需要装饰器
+
 @pytest.mark.parametrize(
     "epochs,mode,seed",
     [
@@ -33,20 +31,18 @@ def test_invalid_epochs(tmpdir, epochs, mode, seed):
             "epochs": epochs,
         },
     }
-    # 创建一个临时的配置文件
+
     dir_ = os.path.dirname(__file__)
     config_abs_path = os.path.join(dir_, "test_config.yaml")
     with open(config_abs_path, "w") as f:
         f.write(yaml.dump(cfg_dict))
 
-    # 使用 hydra 的 compose API 来创建配置，而不是使用 main
     with hydra.initialize(config_path="./", version_base=None):
         cfg = hydra.compose(config_name="test_config.yaml")
-        # 手动触发回调
+
         with pytest.raises(SystemExit) as exec_info:
             InitCallback().on_job_start(config=cfg)
         assert exec_info.value.code == 2
-        # 你现在可以根据需要对 cfg 进行断言或进一步处理
 
 
 # 这部分通常不需要，除非你想直接从脚本运行测试
