Fix

Author: co63oc

paddle/phi/infermeta/unary.cc

@@ -6263,6 +6263,29 @@ void StraightThroughEstimatorInferMeta(const MetaTensor& out_grad,
   x_grad->set_dtype(out_grad.dtype());
 }
 
+void SlogdetInferMeta(const MetaTensor& x, MetaTensor* out) {
+  out->set_dims(x.dims());
+  out->set_dtype(x.dtype());
+
+  auto input_dim = common::vectorize(x.dims());
+  // shape [*, M, M], check whether it contains 0 in '*'.
+  if (input_dim.size() > 2) {
+    bool size_0 = false;
+    std::vector<int> tmp_dim_vec(input_dim.begin(), input_dim.end() - 2);
+    for (size_t i = 0; i < tmp_dim_vec.size(); ++i) {
+      if (tmp_dim_vec[i] == 0) {
+        size_0 = true;
+        break;
+      }
+    }
+    if (size_0) {
+      tmp_dim_vec.insert(tmp_dim_vec.begin(),
+                         2);  // make the output dims as same as numpy
+      out->set_dims(common::make_ddim(tmp_dim_vec));
+    }
+  }
+}
+
 void NumberCountInferMeta(const MetaTensor& x,
                           int upper_range,
                           MetaTensor* out) {

paddle/phi/infermeta/unary.h

@@ -1007,6 +1007,8 @@ void StridedUnChangedInferMeta(const MetaTensor& x, MetaTensor* out);
 void StraightThroughEstimatorInferMeta(const MetaTensor& out_grad,
                                        MetaTensor* x_grad);
 
+void SlogdetInferMeta(const MetaTensor& x, MetaTensor* out);
+
 void LrnInferMeta(const MetaTensor& x,
                   int n,
                   MetaTensor* out,

paddle/phi/kernels/gpu/slogdeterminant_kernel.cu

@@ -25,10 +25,10 @@
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/core/tensor_utils.h"
 #include "paddle/phi/kernels/determinant_kernel.h"
+#include "paddle/phi/kernels/full_kernel.h"
 #include "paddle/phi/kernels/funcs/blas/blas.h"
 #include "paddle/phi/kernels/impl/determinant_kernel_impl.h"
 #include "paddle/phi/kernels/slogdeterminant_kernel.h"
-
 namespace phi {
 
 // T is not complex
@@ -215,23 +215,10 @@ void SlogDeterminantKernel(const Context& dev_ctx,
   auto input_dim = common::vectorize(x.dims());
   auto input_dim_size = input_dim.size();
 
-  // shape [*, M, M], check whether it contains 0 in '*'.
-  if (input_dim.size() > 2) {
-    bool size_0 = false;
-    std::vector<int> tmp_dim_vec(input_dim.begin(), input_dim.end() - 2);
-    for (size_t i = 0; i < tmp_dim_vec.size(); ++i) {
-      if (tmp_dim_vec[i] == 0) {
-        size_0 = true;
-        break;
-      }
-    }
-    if (size_0) {
-      tmp_dim_vec.insert(tmp_dim_vec.begin(),
-                         2);  // make the output dims as same as numpy
-      out->Resize(common::make_ddim(tmp_dim_vec));
-      dev_ctx.template Alloc<T>(out);
-      return;
-    }
+  if (x.numel() == 0) {
+    phi::Full<T, Context>(
+        dev_ctx, phi::IntArray(common::vectorize(out->dims())), 0, out);
+    return;
   }
 
   auto batch_count = detail::GetBatchCount(x.dims());

paddle/phi/kernels/impl/slogdeterminant_kernel_impl.h

@@ -22,6 +22,7 @@
 
 #include "paddle/phi/core/enforce.h"
 #include "paddle/phi/core/tensor_utils.h"
+#include "paddle/phi/kernels/full_kernel.h"
 #include "paddle/phi/kernels/impl/determinant_kernel_impl.h"
 #include "paddle/phi/kernels/slogdeterminant_kernel.h"
 
@@ -127,23 +128,10 @@ void SlogDeterminantKernel(const Context& dev_ctx,
   auto input_dim = common::vectorize(x.dims());
   auto input_dim_size = input_dim.size();
 
-  // shape [*, M, M], check whether it contains 0 in '*'.
-  if (input_dim.size() > 2) {
-    bool size_0 = false;
-    std::vector<int> tmp_dim_vec(input_dim.begin(), input_dim.end() - 2);
-    for (size_t i = 0; i < tmp_dim_vec.size(); ++i) {
-      if (tmp_dim_vec[i] == 0) {
-        size_0 = true;
-        break;
-      }
-    }
-    if (size_0) {
-      tmp_dim_vec.insert(tmp_dim_vec.begin(),
-                         2);  // make the output dims as same as numpy
-      out->Resize(common::make_ddim(tmp_dim_vec));
-      dev_ctx.template Alloc<T>(out);
-      return;
-    }
+  if (x.numel() == 0) {
+    phi::Full<T, Context>(
+        dev_ctx, phi::IntArray(common::vectorize(out->dims())), 0, out);
+    return;
   }
 
   auto batch_count = detail::GetBatchCount(x.dims());

paddle/phi/ops/yaml/ops.yaml

@@ -4893,7 +4893,7 @@
   args : (Tensor x)
   output : Tensor
   infer_meta :
-    func : UnchangedInferMeta
+    func : SlogdetInferMeta
   kernel :
     func : slogdet
   backward : slogdet_grad

test/legacy_test/test_determinant_op.py

@@ -144,6 +144,14 @@ def init_data(self):
         self.target = np.linalg.det(self.case)
 
 
+class TestDeterminantOp_ZeroSize2(TestDeterminantOp):
+    def init_data(self):
+        np.random.seed(0)
+        self.case = np.random.rand(0, 0, 0)
+        self.inputs = {'Input': self.case}
+        self.target = np.linalg.det(self.case)
+
+
 class TestDeterminantAPI(unittest.TestCase):
     def setUp(self):
         np.random.seed(0)
@@ -340,6 +348,14 @@ def init_data(self):
         self.target = np.array(np.linalg.slogdet(self.case))
 
 
+class TestSlogDeterminantOp_ZeroSize2(TestSlogDeterminantOp):
+    def init_data(self):
+        np.random.seed(0)
+        self.case = np.random.rand(0, 0, 0).astype('float64')
+        self.inputs = {'Input': self.case}
+        self.target = np.array(np.linalg.slogdet(self.case))
+
+
 class TestSlogDeterminantAPI(unittest.TestCase):
     def setUp(self):
         np.random.seed(0)