Merge branch 'b68' into b69

Author: co63oc

paddle/phi/kernels/gpu/slogdeterminant_kernel.cu

@@ -215,6 +215,25 @@ 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;
+    }
+  }
+
   auto batch_count = detail::GetBatchCount(x.dims());
   VLOG(2) << "input dim:" << x.dims();
   PADDLE_ENFORCE_GE(

paddle/phi/kernels/impl/slogdeterminant_grad_kernel_impl.h

@@ -35,6 +35,10 @@ void SlogDeterminantGradKernel(const Context& dev_ctx,
                                const DenseTensor& out,
                                const DenseTensor& out_grad,
                                DenseTensor* x_grad) {
+  if (x_grad && x_grad->numel() == 0) {
+    dev_ctx.template Alloc<T>(x_grad);
+    return;
+  }
   PADDLE_ENFORCE_EQ(
       out_grad.dims()[0],
       2,

paddle/phi/kernels/impl/slogdeterminant_kernel_impl.h

@@ -127,6 +127,25 @@ 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;
+    }
+  }
+
   auto batch_count = detail::GetBatchCount(x.dims());
   VLOG(2) << "input dim:" << x.dims();
   PADDLE_ENFORCE_GE(

test/legacy_test/test_determinant_op.py

@@ -332,6 +332,14 @@ def init_data(self):
         self.target = np.array(np.linalg.slogdet(self.case))
 
 
+class TestSlogDeterminantOp_ZeroSize(TestSlogDeterminantOp):
+    def init_data(self):
+        np.random.seed(0)
+        self.case = np.random.rand(0, 5, 5).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)