From 540cc2c1c1a203758346cd2ce226d7564c0dad88 Mon Sep 17 00:00:00 2001 From: qijun Date: Fri, 29 Sep 2017 22:11:48 -0700 Subject: [PATCH] add executor class and interface --- paddle/framework/CMakeLists.txt | 2 + paddle/framework/executor.cc | 108 ++++++++++++++++++++++++++++++ paddle/framework/executor.h | 32 +++++++++ paddle/framework/executor_test.cc | 18 +++++ 4 files changed, 160 insertions(+) create mode 100644 paddle/framework/executor.cc create mode 100644 paddle/framework/executor.h create mode 100644 paddle/framework/executor_test.cc diff --git a/paddle/framework/CMakeLists.txt b/paddle/framework/CMakeLists.txt index 8a5d8532bb3..3ee721ac937 100644 --- a/paddle/framework/CMakeLists.txt +++ b/paddle/framework/CMakeLists.txt @@ -43,3 +43,5 @@ add_custom_command(TARGET framework_py_proto POST_BUILD cc_library(backward SRCS backward.cc DEPS net_op) cc_test(backward_test SRCS backward_test.cc DEPS backward recurrent_op device_context) + +cc_library(executor SRCS executor.cc DEPS device_context framework_proto) diff --git a/paddle/framework/executor.cc b/paddle/framework/executor.cc new file mode 100644 index 00000000000..ccf67169496 --- /dev/null +++ b/paddle/framework/executor.cc @@ -0,0 +1,108 @@ +/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +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/framework/executor.h" + +#include "paddle/platform/device_context.h" + +namespace paddle { +namespace framework { + +class LinearListView; +class GraphView; + +// Immutable view of a ProgramDesc organized for efficient execution. +class ProgramDescView { + public: + virtual ~ProgramDescView() {} + virtual void Initialize(const ProgramDesc*) = 0; + static ProgramDescView* Create(bool is_linear); +}; + +class LinearListView : public ProgramDescView { + public: + void Initialize(const ProgramDesc*) override; +}; + +class GraphView : public ProgramDescView { + public: + void Initialize(const ProgramDesc*) override; +}; + +static ProgramDescView* Create(bool is_linear) { + if (is_linear) { + return new LinearListView(); + } else { + return new GraphView(); + } +} + +void LinearListView::Initialize(const ProgramDesc*) { + // get a LinearView of ProgramDesc +} + +void GraphView::Initialize(const ProgramDesc*) { + // get a GraphView of ProgramDesc +} + +class ExecutorImpl : public Executor { + public: + ExecutorImpl(const platform::DeviceContext* ctx, const ProgramDesc* pdesc, + bool is_linear) + : device_context_(ctx), + program_desc_(pdesc), + view_(ProgramDescView::Create(is_linear)) {} + + virtual ~ExecutorImpl() { + if (view_) delete view_; + } + + void Run() override; + + void Initialize(); + + private: + const platform::DeviceContext* device_context_; + const ProgramDesc* program_desc_; + ProgramDescView* view_; +}; + +static Executor* NewLocalExecutor(const platform::Place& place, + const ProgramDesc& pdesc, bool is_linear) { + platform::DeviceContext* device_context = nullptr; + if (platform::is_cpu_place(place)) { + device_context = + new platform::CPUDeviceContext(boost::get(place)); + } +#ifndef PADDLE_ONLY_CPU + else if { + device_context = + new platform::CUDADeviceContext(boost::get(place)); + } +#endif + return new ExecutorImpl(device_context, &pdesc, is_linear); +} + +void ExecutorImpl::Run() { + // operators running + device_context_->Wait(); +} + +void ExecutorImpl::Initialize() { + // Initialize the ProgramDescView + view_->Initialize(program_desc_); +} + +} // namespace framework +} // namespace paddle diff --git a/paddle/framework/executor.h b/paddle/framework/executor.h new file mode 100644 index 00000000000..69f0e3f18fc --- /dev/null +++ b/paddle/framework/executor.h @@ -0,0 +1,32 @@ +/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +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. */ + +#pragma once + +#include "paddle/framework/framework.pb.h" +#include "paddle/platform/place.h" + +namespace paddle { +namespace framework { + +class Executor { + public: + virtual ~Executor() {} + virtual void Run() = 0; +}; + +static Executor* NewLocalExecutor(const platform::Place&, const ProgramDesc&); + +} // namespace framework +} // namespace paddle diff --git a/paddle/framework/executor_test.cc b/paddle/framework/executor_test.cc new file mode 100644 index 00000000000..f8a41b12ad2 --- /dev/null +++ b/paddle/framework/executor_test.cc @@ -0,0 +1,18 @@ +/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +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/framework/executor.h" +#include "gtest/gtest.h" + +TEST(Executor, Init) {} \ No newline at end of file -- GitLab