[PIR]fix test_householder_product in pir mode (#65885)

risemeup1 · web-flow · commit d4af59905167 · 2024-07-11T10:25:34.000+08:00
* fix_test_sigmoid_cross_entorpy_with_loss

* fix

* fix

* fix

* fix

* fix
diff --git a/paddle/fluid/pybind/eager_utils.cc b/paddle/fluid/pybind/eager_utils.cc
@@ -2339,6 +2339,9 @@ std::vector<phi::Scalar> CastPyArg2ScalarArray(PyObject* obj,
   VLOG(4) << "type_name: " << type_name;
   if (PyList_Check(obj)) {
     Py_ssize_t len = PyList_Size(obj);
+    if (len == 0) {
+      return std::vector<phi::Scalar>({});
+    }
     PyObject* item = nullptr;
     item = PyList_GetItem(obj, 0);
     if (PyObject_CheckFloat(item)) {
@@ -2363,6 +2366,13 @@ std::vector<phi::Scalar> CastPyArg2ScalarArray(PyObject* obj,
         value.emplace_back(phi::Scalar{std::complex<double>(v.real, v.imag)});
       }
       return value;
+    } else {
+      PADDLE_THROW(platform::errors::InvalidType(
+          "%s(): argument (position %d) must be "
+          "a list of int, float, complex, or bool, but got %s",
+          op_type,
+          arg_pos + 1,
+          ((PyTypeObject*)item->ob_type)->tp_name));  // NOLINT
     }
   } else {
     PADDLE_THROW(platform::errors::InvalidType(
@@ -2372,9 +2382,6 @@ std::vector<phi::Scalar> CastPyArg2ScalarArray(PyObject* obj,
         arg_pos + 1,
         ((PyTypeObject*)obj->ob_type)->tp_name));  // NOLINT
   }
-
-  // Fake a ScalarArray
-  return std::vector<phi::Scalar>({phi::Scalar(1.0)});
 }
 
 paddle::experimental::IntArray CastPyArg2IntArray(PyObject* obj,
diff --git a/paddle/fluid/pybind/pir.cc b/paddle/fluid/pybind/pir.cc
@@ -323,7 +323,7 @@ std::string GetValueName(Value value) {
 
   PADDLE_THROW(phi::errors::InvalidArgument(
       "Currently, we can only get name of Value from "
-      "DataOp/ParameterOp/BlockArgument and ShadowOutputOp/SetParameterOp."));
+      "DataOp/ParameterOp/BlockArgument and ShadowOutputOp."));
 }
 
 py::object Clone(const Program &self, IrMapping *p_mapper = nullptr) {
diff --git a/paddle/phi/kernels/cpu/auc_kernel.cc b/paddle/phi/kernels/cpu/auc_kernel.cc
@@ -24,7 +24,7 @@ inline static double trapezoidArea(double X1, double X2, double Y1, double Y2) {
 }
 
 inline static size_t compute_max_bytes(int64_t *dest,
-                                       const long *src,
+                                       const long *src,  // NOLINT
                                        const int num_thresholds,
                                        const int slide_steps) {
   return reinterpret_cast<const char *>(src + (num_thresholds + 1) *
@@ -180,11 +180,11 @@ void AucKernel(const Context &dev_ctx,
       ((1 + slide_steps) * (num_thresholds + 1) + (slide_steps > 0 ? 1 : 0)) *
       sizeof(int64_t);
   if (stat_pos_in_tensor != stat_pos_out) {
-    size_t max_bytes =
-        compute_max_bytes(origin_stat_pos,
-                          reinterpret_cast<const long *>(pos_in_data),
-                          num_thresholds,
-                          slide_steps);
+    size_t max_bytes = compute_max_bytes(
+        origin_stat_pos,
+        reinterpret_cast<const long *>(pos_in_data),  // NOLINT
+        num_thresholds,
+        slide_steps);
     PADDLE_ENFORCE_LE(required_bytes,
                       max_bytes,
                       phi::errors::PreconditionNotMet(
@@ -199,11 +199,11 @@ void AucKernel(const Context &dev_ctx,
             sizeof(int64_t));
   }
   if (stat_neg_in_tensor != stat_neg_out) {
-    size_t max_bytes =
-        compute_max_bytes(origin_stat_neg,
-                          reinterpret_cast<const long *>(neg_in_data),
-                          num_thresholds,
-                          slide_steps);
+    size_t max_bytes = compute_max_bytes(
+        origin_stat_neg,
+        reinterpret_cast<const long *>(neg_in_data),  // NOLINT
+        num_thresholds,
+        slide_steps);
     PADDLE_ENFORCE_LE(required_bytes,
                       max_bytes,
                       phi::errors::PreconditionNotMet(
diff --git a/test/legacy_test/test_householder_product.py b/test/legacy_test/test_householder_product.py

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ std::string GetValueName(Value value) {`
`323`	`323`
`324`	`324`	`PADDLE_THROW(phi::errors::InvalidArgument(`
`325`	`325`	`"Currently, we can only get name of Value from "`
`326`		`- "DataOp/ParameterOp/BlockArgument and ShadowOutputOp/SetParameterOp."));`
	`326`	`+ "DataOp/ParameterOp/BlockArgument and ShadowOutputOp."));`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`py::object Clone(const Program &self, IrMapping *p_mapper = nullptr) {`