From 5acf3c8adea4db31b04821ab56962ce8ee4a24a4 Mon Sep 17 00:00:00 2001
From: huanghui <huanghui44@huawei.com>
Date: Mon, 31 May 2021 10:08:05 +0800
Subject: [PATCH] [dfx]optimize exception info print

---
 mindspore/nn/cell.py                      | 29 ++++++++++++++++++++---
 tests/ut/python/nn/test_l1_regularizer.py |  2 +-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/mindspore/nn/cell.py b/mindspore/nn/cell.py
index 921a522ac31..e2314632b08 100755
--- a/mindspore/nn/cell.py
+++ b/mindspore/nn/cell.py
@@ -327,6 +327,31 @@ class Cell(Cell_):
             _pynative_exec.leave_construct(self)
         return output
 
+    def check_construct_args(self, *inputs, **kwargs):
+        """Check the args needed by the function construct"""
+        if kwargs:
+            raise ValueError("For 'graph' mode, the outermost network does not support passing "
+                             "variable key-value pair parameters.")
+        positional_args = 0
+        default_args = 0
+        for value in inspect.signature(self.construct).parameters.values():
+            if value.kind is inspect.Parameter.VAR_POSITIONAL or value.kind is inspect.Parameter.VAR_KEYWORD:
+                return
+            if value.kind is inspect.Parameter.POSITIONAL_OR_KEYWORD:
+                if value.default is inspect.Parameter.empty:
+                    positional_args += 1
+                else:
+                    default_args += 1
+
+        if len(inputs) < positional_args:
+            raise ValueError(
+                f"The function construct need {positional_args} positional argument, but only provided {len(inputs)}.")
+
+        if len(inputs) > positional_args + default_args:
+            raise ValueError(
+                f"The function construct need {positional_args} positional argument and {default_args} default "
+                f"argument, but provided {len(inputs)}")
+
     def __call__(self, *inputs, **kwargs):
         if self.__class__.construct is Cell.construct:
             logger.warning(f"The '{self.__class__}' does not override the method 'construct', "
@@ -336,9 +361,7 @@ class Cell(Cell_):
             inputs = bound_args.args
             kwargs = bound_args.kwargs
         if context.get_context("mode") == context.GRAPH_MODE:
-            if kwargs:
-                raise ValueError("For 'graph' mode, the outermost network does not support passing "
-                                 "variable key-value pair parameters.")
+            self.check_construct_args(*inputs, **kwargs)
             if self.enable_hook:
                 raise ValueError("The graph mode does not support hook function.")
             out = self.compile_and_run(*inputs)
diff --git a/tests/ut/python/nn/test_l1_regularizer.py b/tests/ut/python/nn/test_l1_regularizer.py
index 6d93b3cbb6c..a2d08db52dc 100644
--- a/tests/ut/python/nn/test_l1_regularizer.py
+++ b/tests/ut/python/nn/test_l1_regularizer.py
@@ -87,7 +87,7 @@ def test_l1_regularizer07():
     try:
         l1_regularizer = Net_l1_regularizer(scale)
         l1_regularizer()
-    except TypeError:
+    except ValueError:
         assert True