fix bugs

Author: huangjiyi

paddle/fluid/platform/device_context.cc

@@ -145,19 +145,6 @@ void IPUDeviceContext::Wait() const {
 
 IPUDeviceContext::~IPUDeviceContext() {}
 
-#endif
-#ifdef PADDLE_WITH_XPU
-XPUDeviceContext::XPUDeviceContext() : phi::XPUContext() {
-  phi::XPUContext::Init();
-}
-
-XPUDeviceContext::~XPUDeviceContext() {}
-
-XPUDeviceContext::XPUDeviceContext(XPUPlace place) : phi::XPUContext(place) {
-  phi::XPUContext::Init();
-  LOG_FIRST_N(WARNING, 1) << "Please NOTE: xpu device: "
-                          << static_cast<int>(place.device);
-}
 #endif
 
 #ifdef PADDLE_WITH_ASCEND_CL

paddle/fluid/platform/device_context.h

@@ -151,15 +151,7 @@ class MLUDeviceContext;
 
 #ifdef PADDLE_WITH_XPU
 namespace xpu = baidu::xpu::api;
-class XPUDeviceContext : public phi::XPUContext {
- public:
-  XPUDeviceContext();
-  explicit XPUDeviceContext(XPUPlace place);
-  virtual ~XPUDeviceContext();
-  Eigen::DefaultDevice* eigen_device() const { return nullptr; }
-  xpuStream stream() const { return XPUContext::x_context()->xpu_stream; }
-  void CreateStream() { XPUContext::CreateStream(); }
-};
+using XPUDeviceContext = phi::XPUContext;
 #endif
 
 #ifdef PADDLE_WITH_ASCEND_CL
@@ -264,23 +256,7 @@ class CUDAPinnedDeviceContext
 #endif
 
 #ifdef PADDLE_WITH_CUSTOM_DEVICE
-class CustomDeviceContext : public phi::CustomContext {
- public:
-  explicit CustomDeviceContext(CustomPlace place);
-  virtual ~CustomDeviceContext();
-
-  Eigen::DefaultDevice* eigen_device() const { return nullptr; }
-
-  template <typename Callback>
-  void AddStreamCallback(Callback&& callback) const {
-    return stream_->AddCallback(callback);
-  }
-
-  void WaitStreamCallback() const { return stream_->WaitCallback(); }
-
- private:
-  std::shared_ptr<phi::stream::Stream> stream_;
-};
+using CustomDeviceContext = phi::CustomContext;
 #endif
 
 void EmplaceExternalContext(

paddle/phi/backends/custom/custom_device.cc

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include "paddle/fluid/platform/profiler/trace_event_collector.h"
-
 #include "paddle/phi/backends/all_context.h"
 #include "paddle/phi/backends/callback_manager.h"
 #include "paddle/phi/backends/custom/enforce_custom.h"

paddle/phi/core/CMakeLists.txt

@@ -135,24 +135,20 @@ if(WITH_GPU)
   nv_library(
     phi_tensor_utils
     SRCS tensor_utils.cc
-    DEPS phi_backends dense_tensor selected_rows memcpy phi_backends
-         memory_utils)
+    DEPS phi_backends dense_tensor selected_rows memcpy memory_utils)
 elseif(WITH_ROCM)
   hip_library(
     phi_tensor_utils
     SRCS tensor_utils.cc
-    DEPS phi_backends dense_tensor selected_rows memcpy phi_backends
-         memory_utils)
+    DEPS phi_backends dense_tensor selected_rows memcpy memory_utils)
 elseif(WITH_XPU_KP)
   xpu_library(
     phi_tensor_utils
     SRCS tensor_utils.cc
-    DEPS phi_backends dense_tensor selected_rows memcpy phi_backends
-         memory_utils)
+    DEPS phi_backends dense_tensor selected_rows memcpy memory_utils)
 else()
   cc_library(
     phi_tensor_utils
     SRCS tensor_utils.cc
-    DEPS dense_tensor selected_rows memcpy phi_backends phi_backends
-         memory_utils)
+    DEPS dense_tensor selected_rows memcpy phi_backends memory_utils)
 endif()

paddle/phi/kernels/funcs/gru_compute.cu

@@ -9,12 +9,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include <paddle/phi/backends/all_context.h>
-
+#include "paddle/phi/kernels/funcs/gru_compute.h"
+#include "paddle/phi/backends/all_context.h"
 #include "paddle/phi/kernels/funcs/blas/blas.h"
 #include "paddle/phi/kernels/funcs/detail/gru_gpu_kernel.h"
 #include "paddle/phi/kernels/funcs/detail/gru_kernel.h"
-#include "paddle/phi/kernels/funcs/gru_compute.h"
 
 namespace phi {
 namespace funcs {