【Fix PIR Unittest No.276,342,395,377,435,445】Fix gather_nd/tree/histogramdd UT (#65799)

Aurelius84 · web-flow · commit 09f6b0b919af · 2024-07-11T09:17:32.000+08:00
* [PIR]Fix gather_nd/tree/hisgoram UT

* fix test_gru_rnn_op

* fix linalg

* fix import

* fix import

* fix CMakeList.txt

* fix cmake

* fix TypeError
diff --git a/python/paddle/nn/functional/extension.py b/python/paddle/nn/functional/extension.py
@@ -21,7 +21,11 @@
 from paddle import _C_ops, tensor
 from paddle.utils import deprecated
 
-from ...base.data_feeder import check_type, check_variable_and_dtype
+from ...base.data_feeder import (
+    check_dtype,
+    check_type,
+    check_variable_and_dtype,
+)
 from ...base.layer_helper import LayerHelper
 from ...common_ops_import import Variable
 from ...framework import (
@@ -221,6 +225,7 @@ def gather_tree(ids: Tensor, parents: Tensor) -> Tensor:
         raise ValueError("The ids's shape must be the same as parents' shape. ")
 
     if in_dynamic_or_pir_mode():
+        check_dtype(parents.dtype, "parents", ['int32', 'int64'], 'gather_tree')
         return _C_ops.gather_tree(ids, parents)
     else:
         helper = LayerHelper('gather_tree', **locals())
diff --git a/python/paddle/tensor/creation.py b/python/paddle/tensor/creation.py
@@ -983,7 +983,12 @@ def fill_constant(
             out = _C_ops.full(shape, value, dtype, place)
             out.stop_gradient = True
             return out
-        _C_ops.full_(out, shape, value, dtype, place)
+
+        if out.dtype != dtype:
+            raise TypeError(
+                "Required out.dtype == dtype if specifying out, but recevied f{out.dtype} != f{dtype}"
+            )
+        out = _C_ops.full_(out, shape, value, dtype, place)
         out.stop_gradient = True
         return out
 
diff --git a/python/paddle/tensor/linalg.py b/python/paddle/tensor/linalg.py
@@ -5372,6 +5372,7 @@ def __check_ranges(D, ranges):
             e = paddle.linspace(r[0], r[1], bins[idx] + 1, x.dtype)
             edges.append(e)
             dedges.append(e.diff())
+            hist_shape.append(bins[idx] + 2)
     elif isinstance(
         bins, tuple
     ):  # tuple with D tensors for each innermost dimension
@@ -5380,9 +5381,9 @@ def __check_ranges(D, ranges):
             bin = paddle.to_tensor(bin)
             edges.append(bin)
             dedges.append(bin.diff())
+            hist_shape.append(bin.shape[0] + 1)
     else:
         raise ValueError("Input bins must be Tensor[], int[], or int.")
-    hist_shape = [edge.shape[0] + 1 for edge in edges]
     index_list = []
     # edges shape: [D, linspaced]
     # index_list shape: [D, N]
diff --git a/python/paddle/tensor/manipulation.py b/python/paddle/tensor/manipulation.py
@@ -5279,6 +5279,7 @@ def gather_nd(x: Tensor, index: Tensor, name: str | None = None) -> Tensor:
 
     """
     if in_dynamic_or_pir_mode():
+        check_dtype(index.dtype, "index", ['int32', 'int64'], 'gather_nd')
         return _C_ops.gather_nd(x, index)
     else:
         check_variable_and_dtype(
@@ -5294,10 +5295,10 @@ def gather_nd(x: Tensor, index: Tensor, name: str | None = None) -> Tensor:
                 'int32',
                 'int64',
             ],
-            'gather_np',
+            'gather_nd',
         )
         check_variable_and_dtype(
-            index, 'index', ['int32', 'int64'], 'gather_np'
+            index, 'index', ['int32', 'int64'], 'gather_nd'
         )
         helper = LayerHelper('gather_nd', **locals())
         dtype = helper.input_dtype()
diff --git a/python/paddle/tensor/math.py b/python/paddle/tensor/math.py
@@ -6346,6 +6346,8 @@ def _diff_handler(x, n=1, axis=-1, prepend=None, append=None, name=None):
             attrs_2 = ()
 
             dim_len = new_input.shape[axis]
+            if dim_len < 0:
+                dim_len = paddle.shape(new_input)[axis]
 
             starts_1 = [0]
             attrs_1 += ('starts', starts_1)
diff --git a/test/deprecated/legacy_test/CMakeLists.txt b/test/deprecated/legacy_test/CMakeLists.txt
@@ -441,8 +441,7 @@ endif()
 
 # Some ops need to check results when gc is enabled
 # Currently, only ops that register NoNeedBufferVarsInference need to do this test
-set(TEST_OPS_WITH_GC test_gather_nd_op test_slice_op)
-set(TEST_OPS_WITH_GC test_gather_nd_op test_slice_op_deprecated)
+set(TEST_OPS_WITH_GC test_slice_op test_slice_op_deprecated)
 
 foreach(TEST_OP ${TEST_OPS_WITH_GC})
   list(REMOVE_ITEM TEST_OPS ${TEST_OP})
@@ -646,7 +645,6 @@ endif()
 set_tests_properties(test_imperative_selected_rows_to_lod_tensor
                      PROPERTIES TIMEOUT 200)
 set_tests_properties(test_argsort_op_deprecated PROPERTIES TIMEOUT 120)
-set_tests_properties(test_gather_nd_op PROPERTIES TIMEOUT 120)
 set_tests_properties(test_masked_select_op PROPERTIES TIMEOUT 120)
 set_tests_properties(test_sigmoid_cross_entropy_with_logits_op
                      PROPERTIES TIMEOUT 120)
@@ -686,7 +684,6 @@ set(TEST_CINN_OPS
     test_softmax_op
     test_slice_op
     test_slice_op_deprecated
-    test_gather_nd_op
     test_scale_op
     test_layer_norm_op_deprecated
     test_where_op
diff --git a/test/legacy_test/CMakeLists.txt b/test/legacy_test/CMakeLists.txt
@@ -497,6 +497,7 @@ set(TEST_OPS_WITH_GC
     test_elementwise_add_op
     test_elementwise_sub_op
     test_gather_op
+    test_gather_nd_op
     test_mean_op
     test_lod_reset_op)
 
@@ -772,6 +773,7 @@ set_tests_properties(test_isin PROPERTIES TIMEOUT 30)
 set_tests_properties(test_binomial_op PROPERTIES TIMEOUT 30)
 set_tests_properties(test_run PROPERTIES TIMEOUT 120)
 set_tests_properties(test_sync_batch_norm_op PROPERTIES TIMEOUT 180)
+set_tests_properties(test_gather_nd_op PROPERTIES TIMEOUT 120)
 
 set_tests_properties(test_profiler PROPERTIES TIMEOUT 120)
 set_tests_properties(test_cross_entropy_loss PROPERTIES TIMEOUT 180)
diff --git a/test/legacy_test/test_fill_constant_op.py b/test/legacy_test/test_fill_constant_op.py
diff --git a/test/legacy_test/test_gather_nd_op.py b/test/legacy_test/test_gather_nd_op.py
diff --git a/test/legacy_test/test_gather_tree_op.py b/test/legacy_test/test_gather_tree_op.py
diff --git a/test/legacy_test/test_gru_rnn_op.py b/test/legacy_test/test_gru_rnn_op.py
@@ -22,8 +22,10 @@
 import paddle
 from paddle.base import core
 
-sys.path.append("../../rnn")
+sys.path.append("../deprecated/rnn")
 from convert import get_params_for_net
+
+sys.path.append("../rnn")
 from rnn_numpy import GRU
 
 random.seed(2)
diff --git a/test/legacy_test/test_histogramdd_op.py b/test/legacy_test/test_histogramdd_op.py
