Migrate platform/stream_callback_manager.cc to PHI [fluid_ops] (#68671)

co63oc · web-flow · commit fa5bb580d82e · 2024-10-21T09:48:39.000+08:00
* Fix

* ci

* ci

* ci

* Fix

* ci

* Fix
diff --git a/paddle/fluid/framework/garbage_collector.h b/paddle/fluid/framework/garbage_collector.h
@@ -21,8 +21,8 @@
 #include <utility>
 
 #include "paddle/common/flags.h"
-#include "paddle/fluid/platform/stream_callback_manager.h"
 #include "paddle/phi/core/platform/device_context.h"
+#include "paddle/phi/core/platform/stream_callback_manager.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/platform/CMakeLists.txt b/paddle/fluid/platform/CMakeLists.txt
@@ -1,41 +1,11 @@
-if(WITH_ONEDNN)
-  set(ONEDNN_CTX_DEPS onednn)
-else()
-  set(ONEDNN_CTX_DEPS)
-endif()
-
 add_subdirectory(device)
 
-set(dgc_deps "")
-if(WITH_DGC)
-  set(dgc_deps dgc)
-endif()
-
 if(WITH_IPU)
   set(IPU_CTX_DEPS ipu_info)
 else()
   set(IPU_CTX_DEPS)
 endif()
 
-if(WITH_GPU)
-  nv_library(
-    stream_callback_manager
-    SRCS stream_callback_manager.cc
-    DEPS simple_threadpool phi common)
-endif()
-if(WITH_ROCM)
-  hip_library(
-    stream_callback_manager
-    SRCS stream_callback_manager.cc
-    DEPS simple_threadpool phi common)
-endif()
-
-if(WITH_GPU OR WITH_ROCM)
-  set(STREAM_CALLBACK_DEPS stream_callback_manager)
-else()
-  set(STREAM_CALLBACK_DEPS)
-endif()
-
 if(WITH_GLOO)
   cc_library(
     gloo_context
@@ -57,11 +27,8 @@ cc_library(
   SRCS device_context.cc
   DEPS simple_threadpool
        xxhash
-       ${STREAM_CALLBACK_DEPS}
        eigen3
        ${IPU_CTX_DEPS}
-       ${ONEDNN_CTX_DEPS}
-       ${dgc_deps}
        dlpack
        phi
        common)
diff --git a/paddle/phi/core/platform/CMakeLists.txt b/paddle/phi/core/platform/CMakeLists.txt
@@ -5,6 +5,7 @@ list(APPEND DEVICE_SRCS collective_helper.cc profiler.cc)
 if(WITH_GPU OR WITH_ROCM)
   list(APPEND DEVICE_SRCS device/gpu/gpu_info.cc profiler.cu
        device/gpu/gpu_resource_pool.cc)
+  list(APPEND DEVICE_SRCS stream_callback_manager.cc)
 endif()
 
 if(WITH_GPU)
diff --git a/paddle/phi/core/platform/stream_callback_manager.cc b/paddle/phi/core/platform/stream_callback_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+// Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/platform/stream_callback_manager.h"
-
+#include "paddle/phi/core/platform/stream_callback_manager.h"
 #include "paddle/phi/core/platform/device/device_wrapper.h"
 
 namespace paddle {
diff --git a/paddle/phi/core/platform/stream_callback_manager.h b/paddle/phi/core/platform/stream_callback_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
+// Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -30,8 +30,8 @@
 #include <memory>
 #include <mutex>  // NOLINT
 
-#include "paddle/fluid/platform/enforce.h"
 #include "paddle/phi/backends/gpu/gpu_decls.h"
+#include "paddle/phi/core/enforce.h"
 
 namespace paddle {
 namespace platform {
