update error type (#2606)

* fix error type

* fix

* rollback apibase

Author: zrr1999

.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 *.DS_Store
+__pycache__

framework/api/nn/test_functional_hardshrink.py

@@ -91,4 +91,4 @@ def test_hardshrink4():
     x = np.array([-1, -0.01, 2.5])
     threshold = "1"
     # res = np.array([-1, -0.01, 2.5])
-    obj.exception(etype="InvalidArgumentError", x=x, threshold=threshold)
+    obj.exception(etype="InvalidType", x=x, threshold=threshold)

framework/api/nn/test_functional_hardtanh.py

@@ -133,4 +133,4 @@ def test_hardtanh7():
     paddle_max = "-3.3"
     paddle_min = 3.3
     # res = np.minimum(np.maximum(x, paddle_min), paddle_max)
-    obj.exception(etype="InvalidArgumentError", x=x, max=paddle_max, min=paddle_min)
+    obj.exception(etype="InvalidType", x=x, max=paddle_max, min=paddle_min)

framework/api/nn/test_functional_logsoftmax.py

@@ -109,7 +109,7 @@ def test_logsoftmax5():
     # 算法
     res = x.transpose(2, 0, 1).reshape(4, 6)
     res = np.log((np.exp(res) / sum(np.exp(res))).reshape(4, 2, 3).transpose(1, 2, 0))
-    obj.exception(etype="InvalidArgumentError", x=x, axis=3)
+    obj.exception(etype="InvalidArgument", x=x, axis=3)
 
 
 @pytest.mark.api_nn_log_softmax_exception
@@ -121,7 +121,7 @@ def test_logsoftmax6():
     # 算法
     res = x.transpose(2, 0, 1).reshape(4, 6)
     res = np.log((np.exp(res) / sum(np.exp(res))).reshape(4, 2, 3).transpose(1, 2, 0))
-    obj.exception(etype="InvalidArgumentError", x=x, axis="3")
+    obj.exception(etype="InvalidType", x=x, axis="3")
 
 
 @pytest.mark.api_nn_log_softmax_parameters

framework/api/nn/test_hardshrink.py

@@ -91,4 +91,4 @@ def test_hardshrink4():
     x = np.array([-1, -0.01, 2.5])
     threshold = "1"
     # res = np.array([-1, -0.01, 2.5])
-    obj.exception(etype="InvalidArgumentError", data=x, threshold=threshold)
+    obj.exception(etype="InvalidType", data=x, threshold=threshold)

framework/api/nn/test_hardtanh.py

@@ -133,4 +133,4 @@ def test_hardtanh7():
     paddle_max = "-3.3"
     paddle_min = 3.3
     # res = np.minimum(np.maximum(x, paddle_min), paddle_max)
-    obj.exception(etype="InvalidArgumentError", data=x, max=paddle_max, min=paddle_min)
+    obj.exception(etype="InvalidType", data=x, max=paddle_max, min=paddle_min)

framework/api/nn/test_logsoftmax.py

@@ -108,7 +108,7 @@ def test_logsoftmax5():
     # 算法
     res = x.transpose(2, 0, 1).reshape(4, 6)
     res = np.log((np.exp(res) / sum(np.exp(res))).reshape(4, 2, 3).transpose(1, 2, 0))
-    obj.exception(etype="InvalidArgumentError", data=x, axis=3)
+    obj.exception(etype="InvalidArgument", data=x, axis=3)
 
 
 @pytest.mark.api_nn_LogSoftmax_exception
@@ -120,4 +120,4 @@ def test_logsoftmax6():
     # 算法
     res = x.transpose(2, 0, 1).reshape(4, 6)
     res = np.log((np.exp(res) / sum(np.exp(res))).reshape(4, 2, 3).transpose(1, 2, 0))
-    obj.exception(etype="InvalidArgumentError", data=x, axis="3")
+    obj.exception(etype="InvalidType", data=x, axis="3")

framework/api/paddlebase/test_diag.py

@@ -311,7 +311,7 @@ def test_diag24():
     x=2-D,x_shape=[3,3,3],c++error,static ValueError
     """
     x = np.zeros([3, 3, 3])
-    obj.exception(mode="c", x=x, etype="InvalidArgumentError")
+    obj.exception(mode="c", x=x, etype="InvalidArgument")
 
 
 @pytest.mark.api_base_diag_exception
@@ -321,7 +321,7 @@ def test_diag25():
     """
     x = np.array([1, 2])
     offset = 2.5
-    obj.exception(mode="c", x=x, offset=offset, etype="InvalidArgumentError")
+    obj.exception(mode="c", x=x, offset=offset, etype="InvalidType")
 
 
 # @pytest.mark.api_base_diag_exception

framework/api/paddlebase/test_expand.py

@@ -220,7 +220,7 @@ def test_expand17():
     """
     x = np.array([1, 2]).astype(np.int64)
     shape = [[1], [2], [3]]
-    obj.exception(x=x, shape=shape, mode="c", etype="InvalidArgument")
+    obj.exception(x=x, shape=shape, mode="c", etype="InvalidType")
 
 
 # def test_expand18():

framework/api/paddlebase/test_index_select.py

@@ -156,4 +156,4 @@ def test_index_select9():
     x = np.arange(6).reshape(2, 3).astype("int32")
     index = np.array([0, 2])
     axis = 1.3
-    obj1.exception(mode="c", etype="InvalidArgument", x=x, index=index, axis=axis)
+    obj1.exception(mode="c", etype="InvalidType", x=x, index=index, axis=axis)