Merge branch 'develop' of https://github.com/PaddlePaddle/paddle into add-weight-normalization
guosheng
7 years ago
commit
a422f34607
@ -0,0 +1,51 @@
|
||||
# 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(ExternalProject)
|
||||
|
||||
set(BOOST_PROJECT "extern_boost")
|
||||
set(BOOST_VER "1.41.0")
|
||||
set(BOOST_TAR "boost_1_41_0")
|
||||
set(BOOST_URL "http://sourceforge.net/projects/boost/files/boost/${BOOST_VER}/${BOOST_TAR}.tar.gz")
|
||||
set(BOOST_SOURCES_DIR ${THIRD_PARTY_PATH}/boost)
|
||||
set(BOOST_DOWNLOAD_DIR "${BOOST_SOURCES_DIR}/src/${BOOST_PROJECT}")
|
||||
set(BOOST_INCLUDE_DIR "${BOOST_DOWNLOAD_DIR}/${BOOST_TAR}" CACHE PATH "boost include directory." FORCE)
|
||||
|
||||
include_directories(${BOOST_INCLUDE_DIR})
|
||||
|
||||
ExternalProject_Add(
|
||||
${BOOST_PROJECT}
|
||||
${EXTERNAL_PROJECT_LOG_ARGS}
|
||||
DOWNLOAD_DIR ${BOOST_DOWNLOAD_DIR}
|
||||
DOWNLOAD_COMMAND wget --no-check-certificate ${BOOST_URL} -c -q -O ${BOOST_TAR}.tar.gz
|
||||
&& tar zxf ${BOOST_TAR}.tar.gz
|
||||
DOWNLOAD_NO_PROGRESS 1
|
||||
PREFIX ${BOOST_SOURCES_DIR}
|
||||
CONFIGURE_COMMAND ""
|
||||
BUILD_COMMAND ""
|
||||
INSTALL_COMMAND ""
|
||||
UPDATE_COMMAND ""
|
||||
)
|
||||
|
||||
if (${CMAKE_VERSION} VERSION_LESS "3.3.0")
|
||||
set(dummyfile ${CMAKE_CURRENT_BINARY_DIR}/boost_dummy.c)
|
||||
file(WRITE ${dummyfile} "const char *dummy = \"${dummyfile}\";")
|
||||
add_library(boost STATIC ${dummyfile})
|
||||
else()
|
||||
add_library(boost INTERFACE)
|
||||
endif()
|
||||
|
||||
add_dependencies(boost ${BOOST_PROJECT})
|
||||
list(APPEND external_project_dependencies boost)
|
||||
set(Boost_INCLUDE_DIR ${BOOST_INCLUDE_DIR})
|
||||
@ -0,0 +1,96 @@
|
||||
# Design Doc: CSP in PaddlePaddle Fluid
|
||||
|
||||
## Motivation
|
||||
|
||||
Concurrent programming is important for deep learning. Few example applications are:
|
||||
|
||||
1. The main thread keeps reading the next mini-batch while another thread uses the GPU for computing.
|
||||
2. The main thread performs the computation while another thread uploads the local gradients from each trainer to the parameter server.
|
||||
|
||||
Most DL systems, including TensorFlow, Caffe2, and MxNet, can asynchronously execute operators in a graph. However, Fluid doesn't have the concept of a graph at all, as the design goal of Fluid is that of a programming language.
|
||||
|
||||
## Concurrent Programming Models
|
||||
|
||||
There were many concurrent programming models, implemented in various forms:
|
||||
|
||||
| concurrent programming model | implementation |
|
||||
|-----|-----|
|
||||
| mutex | types and functions in standard libraries |
|
||||
| semaphore | types and functions in standard libraries |
|
||||
| communicating sequential processes (CSP) | Go programming language |
|
||||
| actor model | Erlang programming language |
|
||||
| message passing | MPI |
|
||||
| bulk synchronous parallel (BSP) | Pregel distributed programming framework |
|
||||
|
||||
Since Fluid was designed to be a programming language, we would like to implement CSP in Fluid.
|
||||
|
||||
### CSP v.s. Actor Model
|
||||
|
||||
A well-known implementation of Actor Model is the Erlang programming language. In Actor Model, *processes* could send messages to another process and receive messages from another process given the process IDs. We can find the three ingredients, process with ID, send, and recv, in MPI too. Indeed, we can rewrite Erlang programs in Python + MPI with possibly fewer lines of code. Our concern with Actor Model is that it doesn't seem reasonable to implement process management in a programming language's runtime library; instead, it should be the operating systems' responsibility to manage processes and libraries like MPI for send/recv.
|
||||
|
||||
## CSP in Fluid
|
||||
|
||||
Fluid has two fundamental control-flows: *if-else* and *while*. If we are to implement CSP, we need the following:
|
||||
|
||||
1. a new data type: *channel* and operators *send* and *recv*,
|
||||
1. *goroutine* or thread, and
|
||||
1. a new control-flow: select.
|
||||
|
||||
We also need Python wrappers for the above components.
|
||||
|
||||
The type *channel* is conceptually the blocking queue. In Go, its implemented is a [blocking circular queue](https://github.com/golang/go/blob/68ce117cf17b8debf5754bfd476345779b5b6616/src/runtime/chan.go#L31-L50), which supports send and recv.
|
||||
|
||||
The `select` operation has been in OS kernels long before Go language. All Unix kernels implement system calls *poll* and *select*. They monitor multiple file descriptors to see if I/O is possible on any of them. This takes O(N) time. Since Linux 2.6, a new system call, *epoll*, can do the same in O(1) time. In BSD systems, there is a similar system call *kqueue*. Go's Linux implementation uses epoll.
|
||||
|
||||
It might be a good idea to implement Fluid's select using epoll too. In this design doc, we start from the O(N) way, so we could focus on Python binding and the syntax.
|
||||
|
||||
### Type Channel
|
||||
|
||||
Fluid supports many data types:
|
||||
|
||||
1. Tensor,
|
||||
1. Row-sparse Tensor
|
||||
1. LoD Tensor,
|
||||
1. Tensor array, etc
|
||||
|
||||
Each data type is registered in the [`framework.proto`](https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/framework/framework.proto#L117-L127) as an enum value. To add a new type channel, we need to add a new type enum.
|
||||
|
||||
To expose a C++ type to Python, we need to edit the [`pybind.cc`](https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/pybind/pybind.cc) file. [Here](https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/pybind/pybind.cc#L120-L164) is an example how we expose C++ class LoDTensor.
|
||||
|
||||
## Syntax Design
|
||||
|
||||
### Create Channel
|
||||
|
||||
In Go, we create a channel by specifying the element type and buffer size:
|
||||
|
||||
```go
|
||||
ch := make(chan int) // a channel without buffer
|
||||
ch1 := make(chan int, 100) // a channel that can buffer 100 ints.
|
||||
```
|
||||
|
||||
In Fluid, we should be able to do the same:
|
||||
|
||||
```python
|
||||
ch = fluid.make_chan(dtype=INT)
|
||||
ch1 = fluid.make_chan(dtype=INT, 100)
|
||||
```
|
||||
|
||||
In addition to that, we want channels that can hold more complex element types, e.g., Tensors of float16:
|
||||
|
||||
```python
|
||||
ch = fluid.make_chan(dtype=Tensor, etype=float16)
|
||||
```
|
||||
|
||||
or Tensors of Tensors of float16 etc.
|
||||
|
||||
The point here is that we need a consistent way to compose types, like in C++ we can have `Tensor<Tensor<...<float16>...> >`.
|
||||
|
||||
### Send and Recv
|
||||
|
||||
### Select
|
||||
|
||||
## Example Programs
|
||||
|
||||
### 1. RPC between Trainers and Parameter Servers
|
||||
|
||||
### 2. Concurrent Minibatch Loading
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 134 KiB After Width: | Height: | Size: 118 KiB |
@ -0,0 +1,87 @@
|
||||
/* 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 <condition_variable>
|
||||
#include <mutex>
|
||||
#include <queue>
|
||||
|
||||
namespace paddle {
|
||||
namespace framework {
|
||||
|
||||
template <typename T>
|
||||
class Channel {
|
||||
public:
|
||||
explicit Channel(std::size_t capacity) : capacity_(capacity) {}
|
||||
|
||||
void Send(T* channel_element) {
|
||||
std::unique_lock<std::mutex> lock(mu_);
|
||||
|
||||
if (IsBounded()) {
|
||||
full_cond_var_.wait(lock, [this]() {
|
||||
bool capacity_valid = capacity_ > 0 ? !IsCapacityFull() : true;
|
||||
return capacity_valid;
|
||||
});
|
||||
}
|
||||
channel_.push_back(std::move(*channel_element));
|
||||
|
||||
lock.unlock();
|
||||
empty_cond_var_.notify_one();
|
||||
}
|
||||
|
||||
T* Receive() {
|
||||
std::unique_lock<std::mutex> lock(mu_);
|
||||
empty_cond_var_.wait(lock, [this]() { return !channel_.empty(); });
|
||||
|
||||
T* channel_element = std::move(channel_.front());
|
||||
channel_.pop_front();
|
||||
|
||||
NotifyAllSenders(&lock);
|
||||
return channel_element;
|
||||
}
|
||||
|
||||
size_t Size() {
|
||||
std::unique_lock<std::mutex> lock(mu_);
|
||||
return channel_.size();
|
||||
}
|
||||
|
||||
void Clear() {
|
||||
std::unique_lock<std::mutex> lock(mu_);
|
||||
channel_.clear();
|
||||
|
||||
NotifyAllSenders(&lock);
|
||||
}
|
||||
|
||||
private:
|
||||
std::size_t capacity_;
|
||||
std::mutex mu_;
|
||||
std::condition_variable empty_cond_var_;
|
||||
std::condition_variable full_cond_var_;
|
||||
std::deque<T> channel_;
|
||||
|
||||
private:
|
||||
void NotifyAllSenders(std::unique_lock<std::mutex>* lock) {
|
||||
if (IsBounded()) {
|
||||
lock->unlock();
|
||||
full_cond_var_.notify_one();
|
||||
}
|
||||
}
|
||||
|
||||
bool IsBounded() const { return capacity_ > 0; }
|
||||
|
||||
bool IsCapacityFull() const { return channel_.size() >= capacity_; }
|
||||
};
|
||||
|
||||
} // namespace operator
|
||||
} // namespace paddle
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue