[XPU] stride_slice and stride_slice_grad support strides < 0 for xpu (#62749)

zhangyk0314 · web-flow · commit d57a8697b951 · 2024-03-18T11:11:47.000+08:00
diff --git a/cmake/external/xpu.cmake b/cmake/external/xpu.cmake
@@ -29,7 +29,7 @@ if(NOT DEFINED XPU_BASE_DATE)
   set(XPU_BASE_DATE "20240104")
 endif()
 if(NOT DEFINED XPU_XHPC_BASE_DATE)
-  set(XPU_XHPC_BASE_DATE "20240312")
+  set(XPU_XHPC_BASE_DATE "20240315")
 endif()
 set(XPU_XCCL_BASE_VERSION "1.1.8.1")
 if(NOT DEFINED XPU_XFT_BASE_VERSION)
diff --git a/paddle/phi/kernels/xpu/stride_slice_grad_kernel.cc b/paddle/phi/kernels/xpu/stride_slice_grad_kernel.cc
@@ -51,11 +51,6 @@ void StridedSliceRawGradKernel(const Context& dev_ctx,
   int num = axes.size();
 
   for (int i = 0; i < num; ++i) {
-    PADDLE_ENFORCE_EQ(
-        strides_[i] > 0,
-        true,
-        errors::InvalidArgument("Currently, XPU strided slice kernel does not",
-                                "support reverse strided slice"));
     int cur_axe = axes[i];
     int st = starts_[i];
     if (st > xshape[cur_axe]) {
diff --git a/paddle/phi/kernels/xpu/stride_slice_kernel.cc b/paddle/phi/kernels/xpu/stride_slice_kernel.cc
@@ -81,9 +81,7 @@ void StridedSliceRawKernel(const Context& dev_ctx,
       end = xshape[cur_axe];
     }
     if (end < 0) {
-      if (strides_[i] > 0) {
-        end += xshape[cur_axe];
-      }
+      end += xshape[cur_axe];
     }
 
     ends_in[cur_axe] = end;
diff --git a/test/xpu/test_strided_slice_op_xpu.py b/test/xpu/test_strided_slice_op_xpu.py
@@ -147,6 +147,15 @@ def initTestCase(self):
             self.strides = [1, 1, 1, 2, 2]
             self.infer_flags = [1, 1, 1, 1, 1]
 
+    class XPUTestStrideSliceOp4(XPUTestStrideSliceOp):
+        def initTestCase(self):
+            self.inshape = (3, 4, 10)
+            self.axes = [0, 1, 2]
+            self.starts = [0, -1, 0]
+            self.ends = [2, -3, 5]
+            self.strides = [1, -1, 1]
+            self.infer_flags = [1, 1, 1]
+
     class XPUTestStrideSliceOp5(XPUTestStrideSliceOp):
         def initTestCase(self):
             self.inshape = (5, 5, 5)
@@ -156,6 +165,15 @@ def initTestCase(self):
             self.strides = [1, 1, 1]
             self.infer_flags = [1, 1, 1]
 
+    class XPUTestStrideSliceOp6(XPUTestStrideSliceOp):
+        def initTestCase(self):
+            self.inshape = (5, 5, 5)
+            self.axes = [0, 1, 2]
+            self.starts = [1, -1, 0]
+            self.ends = [2, -3, 3]
+            self.strides = [1, -1, 1]
+            self.infer_flags = [1, 1, 1]
+
     class XPUTestStrideSliceOp7(XPUTestStrideSliceOp):
         def initTestCase(self):
             self.inshape = (5, 5, 5)

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,7 @@ void StridedSliceRawKernel(const Context& dev_ctx,`
`81`	`81`	`end = xshape[cur_axe];`
`82`	`82`	`}`
`83`	`83`	`if (end < 0) {`
`84`		`- if (strides_[i] > 0) {`
`85`		`- end += xshape[cur_axe];`
`86`		`- }`
	`84`	`+ end += xshape[cur_axe];`
`87`	`85`	`}`
`88`	`86`
`89`	`87`	`ends_in[cur_axe] = end;`