diff --git a/paddle/fluid/operators/ascend_trigger_op.h b/paddle/fluid/operators/ascend_trigger_op.h index 09e160d8f6aac36cc8aa75b0a2dc1cbef378747e..8cdc2ea9b8b7f177f60265a48ce453171703b29a 100644 --- a/paddle/fluid/operators/ascend_trigger_op.h +++ b/paddle/fluid/operators/ascend_trigger_op.h @@ -17,10 +17,6 @@ #include #include "paddle/fluid/framework/op_registry.h" -#ifdef PADDLE_WITH_ASCEND -#include "paddle/fluid/framework/fleet/ascend_wrapper.h" -#include "paddle/fluid/framework/tensor.h" -#endif namespace paddle { namespace operators { @@ -29,17 +25,8 @@ template class AscendTriggerCPUKernel : public framework::OpKernel { public: void Compute(const framework::ExecutionContext &ctx) const override { -#ifdef PADDLE_WITH_ASCEND - auto ascend_ptr = paddle::framework::AscendInstance::GetInstance(); - auto graph_idx = ctx.Attr("graph_idx"); - VLOG(4) << "AscendTrigger Kernel, begin to run graph: " << graph_idx; - auto inputs = ctx.MultiInput("FeedList"); - auto outputs = ctx.MultiOutput("FetchList"); - ascend_ptr->RunAscendSubgraph(graph_idx, inputs, &outputs); -#else PADDLE_THROW(platform::errors::PreconditionNotMet( "Please compile WITH_ASCEND option to enable ascend_trigger op")); -#endif } }; diff --git a/paddle/fluid/pybind/parallel_executor.cc b/paddle/fluid/pybind/parallel_executor.cc index a871b6f6b9aa02af383bc05df1038611d2f8f6f6..2ceef819e75d9958841149e3addb80111263f576 100644 --- a/paddle/fluid/pybind/parallel_executor.cc +++ b/paddle/fluid/pybind/parallel_executor.cc @@ -87,25 +87,16 @@ limitations under the License. */ #include "paddle/fluid/platform/profiler/event_python.h" #include "paddle/fluid/platform/profiler/event_tracing.h" #include "paddle/fluid/platform/profiler/profiler.h" -#include "paddle/fluid/pybind/cuda_streams_py.h" -#include "paddle/fluid/pybind/distributed_py.h" -#include "paddle/fluid/pybind/eager.h" -#include "paddle/fluid/pybind/imperative.h" -#include "paddle/fluid/pybind/io.h" -#include "paddle/phi/backends/cpu/cpu_info.h" -#include "paddle/phi/core/compat/convert_utils.h" -#include "paddle/phi/core/lod_utils.h" -#include "paddle/utils/none.h" -#ifdef PADDLE_WITH_ASCEND -#include "paddle/fluid/pybind/ascend_wrapper_py.h" -#endif #include "paddle/fluid/pybind/bind_cost_model.h" #include "paddle/fluid/pybind/bind_fleet_executor.h" #include "paddle/fluid/pybind/box_helper_py.h" #include "paddle/fluid/pybind/communication.h" #include "paddle/fluid/pybind/compatible.h" #include "paddle/fluid/pybind/const_value.h" +#include "paddle/fluid/pybind/cuda_streams_py.h" #include "paddle/fluid/pybind/data_set_py.h" +#include "paddle/fluid/pybind/distributed_py.h" +#include "paddle/fluid/pybind/eager.h" #include "paddle/fluid/pybind/exception.h" #include "paddle/fluid/pybind/fleet_wrapper_py.h" #include "paddle/fluid/pybind/generator_py.h" @@ -113,12 +104,18 @@ limitations under the License. */ #include "paddle/fluid/pybind/gloo_context_py.h" #include "paddle/fluid/pybind/gloo_wrapper_py.h" #include "paddle/fluid/pybind/heter_wrapper_py.h" +#include "paddle/fluid/pybind/imperative.h" #include "paddle/fluid/pybind/inference_api.h" +#include "paddle/fluid/pybind/io.h" #include "paddle/fluid/pybind/ir.h" #include "paddle/fluid/pybind/metrics_py.h" #include "paddle/fluid/pybind/ps_gpu_wrapper_py.h" #include "paddle/fluid/pybind/pybind_variant_caster.h" +#include "paddle/phi/backends/cpu/cpu_info.h" #include "paddle/phi/backends/device_manager.h" +#include "paddle/phi/core/compat/convert_utils.h" +#include "paddle/phi/core/lod_utils.h" +#include "paddle/utils/none.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) #include "paddle/fluid/pybind/nccl_wrapper_py.h" diff --git a/paddle/fluid/pybind/place.cc b/paddle/fluid/pybind/place.cc index 79dfa27e6dd406b08bb34e89b4c2dbcc0dc5a1b2..145f3822abe0363cad6638db92c769664a5281b3 100644 --- a/paddle/fluid/pybind/place.cc +++ b/paddle/fluid/pybind/place.cc @@ -87,25 +87,16 @@ limitations under the License. */ #include "paddle/fluid/platform/profiler/event_python.h" #include "paddle/fluid/platform/profiler/event_tracing.h" #include "paddle/fluid/platform/profiler/profiler.h" -#include "paddle/fluid/pybind/cuda_streams_py.h" -#include "paddle/fluid/pybind/distributed_py.h" -#include "paddle/fluid/pybind/eager.h" -#include "paddle/fluid/pybind/imperative.h" -#include "paddle/fluid/pybind/io.h" -#include "paddle/phi/backends/cpu/cpu_info.h" -#include "paddle/phi/core/compat/convert_utils.h" -#include "paddle/phi/core/lod_utils.h" -#include "paddle/utils/none.h" -#ifdef PADDLE_WITH_ASCEND -#include "paddle/fluid/pybind/ascend_wrapper_py.h" -#endif #include "paddle/fluid/pybind/bind_cost_model.h" #include "paddle/fluid/pybind/bind_fleet_executor.h" #include "paddle/fluid/pybind/box_helper_py.h" #include "paddle/fluid/pybind/communication.h" #include "paddle/fluid/pybind/compatible.h" #include "paddle/fluid/pybind/const_value.h" +#include "paddle/fluid/pybind/cuda_streams_py.h" #include "paddle/fluid/pybind/data_set_py.h" +#include "paddle/fluid/pybind/distributed_py.h" +#include "paddle/fluid/pybind/eager.h" #include "paddle/fluid/pybind/exception.h" #include "paddle/fluid/pybind/fleet_wrapper_py.h" #include "paddle/fluid/pybind/generator_py.h" @@ -113,12 +104,18 @@ limitations under the License. */ #include "paddle/fluid/pybind/gloo_context_py.h" #include "paddle/fluid/pybind/gloo_wrapper_py.h" #include "paddle/fluid/pybind/heter_wrapper_py.h" +#include "paddle/fluid/pybind/imperative.h" #include "paddle/fluid/pybind/inference_api.h" +#include "paddle/fluid/pybind/io.h" #include "paddle/fluid/pybind/ir.h" #include "paddle/fluid/pybind/metrics_py.h" #include "paddle/fluid/pybind/ps_gpu_wrapper_py.h" #include "paddle/fluid/pybind/pybind_variant_caster.h" +#include "paddle/phi/backends/cpu/cpu_info.h" #include "paddle/phi/backends/device_manager.h" +#include "paddle/phi/core/compat/convert_utils.h" +#include "paddle/phi/core/lod_utils.h" +#include "paddle/utils/none.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) #include "paddle/fluid/pybind/nccl_wrapper_py.h" diff --git a/paddle/fluid/pybind/pybind.cc b/paddle/fluid/pybind/pybind.cc index 88a984244498b58d7b8d0a99eac54052ff5ce740..1583102865fc69a51e93e1068a46d8bd0779208a 100644 --- a/paddle/fluid/pybind/pybind.cc +++ b/paddle/fluid/pybind/pybind.cc @@ -95,21 +95,6 @@ limitations under the License. */ #include "paddle/fluid/platform/profiler/event_python.h" #include "paddle/fluid/platform/profiler/event_tracing.h" #include "paddle/fluid/platform/profiler/profiler.h" -#include "paddle/fluid/pybind/cuda_streams_py.h" -#include "paddle/fluid/pybind/custom_device_py.h" -#include "paddle/fluid/pybind/distributed_py.h" -#include "paddle/fluid/pybind/eager.h" -#include "paddle/fluid/pybind/imperative.h" -#include "paddle/fluid/pybind/io.h" -#include "paddle/fluid/pybind/jit.h" -#include "paddle/fluid/pybind/xpu_streams_py.h" -#include "paddle/phi/backends/cpu/cpu_info.h" -#include "paddle/phi/core/compat/convert_utils.h" -#include "paddle/phi/core/lod_utils.h" -#include "paddle/utils/none.h" -#ifdef PADDLE_WITH_ASCEND -#include "paddle/fluid/pybind/ascend_wrapper_py.h" -#endif #include "paddle/fluid/pybind/auto_parallel_py.h" #include "paddle/fluid/pybind/bind_cost_model.h" #include "paddle/fluid/pybind/bind_fleet_executor.h" @@ -117,7 +102,11 @@ limitations under the License. */ #include "paddle/fluid/pybind/communication.h" #include "paddle/fluid/pybind/compatible.h" #include "paddle/fluid/pybind/const_value.h" +#include "paddle/fluid/pybind/cuda_streams_py.h" +#include "paddle/fluid/pybind/custom_device_py.h" #include "paddle/fluid/pybind/data_set_py.h" +#include "paddle/fluid/pybind/distributed_py.h" +#include "paddle/fluid/pybind/eager.h" #include "paddle/fluid/pybind/exception.h" #include "paddle/fluid/pybind/fleet_wrapper_py.h" #include "paddle/fluid/pybind/generator_py.h" @@ -125,12 +114,20 @@ limitations under the License. */ #include "paddle/fluid/pybind/gloo_context_py.h" #include "paddle/fluid/pybind/gloo_wrapper_py.h" #include "paddle/fluid/pybind/heter_wrapper_py.h" +#include "paddle/fluid/pybind/imperative.h" #include "paddle/fluid/pybind/inference_api.h" +#include "paddle/fluid/pybind/io.h" #include "paddle/fluid/pybind/ir.h" +#include "paddle/fluid/pybind/jit.h" #include "paddle/fluid/pybind/metrics_py.h" #include "paddle/fluid/pybind/ps_gpu_wrapper_py.h" #include "paddle/fluid/pybind/pybind_variant_caster.h" +#include "paddle/fluid/pybind/xpu_streams_py.h" +#include "paddle/phi/backends/cpu/cpu_info.h" #include "paddle/phi/backends/device_manager.h" +#include "paddle/phi/core/compat/convert_utils.h" +#include "paddle/phi/core/lod_utils.h" +#include "paddle/utils/none.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) #include "paddle/fluid/pybind/nccl_wrapper_py.h" @@ -2794,11 +2791,6 @@ All parameter, weight, gradient are variables in Paddle. #ifndef PADDLE_NO_PYTHON BindDistributed(&m); #endif -#ifdef PADDLE_WITH_ASCEND - BindAscendWrapper(&m); - BindAscendGraph(&m); - BindAscendDevice(&m); -#endif #ifdef PADDLE_WITH_CRYPTO BindCrypto(&m); #endif diff --git a/paddle/fluid/pybind/tensor.cc b/paddle/fluid/pybind/tensor.cc index b854fa37ac0bafaf846c80b4eea9390a260b2d7a..f7f4d2585d74583ee66c996be259b60bd4b725d4 100644 --- a/paddle/fluid/pybind/tensor.cc +++ b/paddle/fluid/pybind/tensor.cc @@ -87,25 +87,16 @@ limitations under the License. */ #include "paddle/fluid/platform/profiler/event_python.h" #include "paddle/fluid/platform/profiler/event_tracing.h" #include "paddle/fluid/platform/profiler/profiler.h" -#include "paddle/fluid/pybind/cuda_streams_py.h" -#include "paddle/fluid/pybind/distributed_py.h" -#include "paddle/fluid/pybind/eager.h" -#include "paddle/fluid/pybind/imperative.h" -#include "paddle/fluid/pybind/io.h" -#include "paddle/phi/backends/cpu/cpu_info.h" -#include "paddle/phi/core/compat/convert_utils.h" -#include "paddle/phi/core/lod_utils.h" -#include "paddle/utils/none.h" -#ifdef PADDLE_WITH_ASCEND -#include "paddle/fluid/pybind/ascend_wrapper_py.h" -#endif #include "paddle/fluid/pybind/bind_cost_model.h" #include "paddle/fluid/pybind/bind_fleet_executor.h" #include "paddle/fluid/pybind/box_helper_py.h" #include "paddle/fluid/pybind/communication.h" #include "paddle/fluid/pybind/compatible.h" #include "paddle/fluid/pybind/const_value.h" +#include "paddle/fluid/pybind/cuda_streams_py.h" #include "paddle/fluid/pybind/data_set_py.h" +#include "paddle/fluid/pybind/distributed_py.h" +#include "paddle/fluid/pybind/eager.h" #include "paddle/fluid/pybind/exception.h" #include "paddle/fluid/pybind/fleet_wrapper_py.h" #include "paddle/fluid/pybind/generator_py.h" @@ -113,12 +104,18 @@ limitations under the License. */ #include "paddle/fluid/pybind/gloo_context_py.h" #include "paddle/fluid/pybind/gloo_wrapper_py.h" #include "paddle/fluid/pybind/heter_wrapper_py.h" +#include "paddle/fluid/pybind/imperative.h" #include "paddle/fluid/pybind/inference_api.h" +#include "paddle/fluid/pybind/io.h" #include "paddle/fluid/pybind/ir.h" #include "paddle/fluid/pybind/metrics_py.h" #include "paddle/fluid/pybind/ps_gpu_wrapper_py.h" #include "paddle/fluid/pybind/pybind_variant_caster.h" +#include "paddle/phi/backends/cpu/cpu_info.h" #include "paddle/phi/backends/device_manager.h" +#include "paddle/phi/core/compat/convert_utils.h" +#include "paddle/phi/core/lod_utils.h" +#include "paddle/utils/none.h" #if defined(PADDLE_WITH_NCCL) || defined(PADDLE_WITH_RCCL) #include "paddle/fluid/pybind/nccl_wrapper_py.h"