Luo Tao
8 years ago
commit
5513f92755
@ -1 +1,157 @@
|
||||
./doc/howto/dev/contribute_to_paddle_en.md
|
||||
# Contribute Code
|
||||
|
||||
We sincerely appreciate your contribution. This document explains our workflow and work style.
|
||||
|
||||
## Workflow
|
||||
|
||||
PaddlePaddle uses this [Git branching model](http://nvie.com/posts/a-successful-git-branching-model/). The following steps guide usual contributions.
|
||||
|
||||
1. Fork
|
||||
|
||||
Our development community has been growing fastly; it doesn't make sense for everyone to write into the official repo. So, please file Pull Requests from your fork. To make a fork, just head over to the GitHub page and click the ["Fork" button](https://help.github.com/articles/fork-a-repo/).
|
||||
|
||||
1. Clone
|
||||
|
||||
To make a copy of your fork to your local computers, please run
|
||||
|
||||
```bash
|
||||
git clone https://github.com/your-github-account/paddle
|
||||
cd paddle
|
||||
```
|
||||
|
||||
1. Create the local feature branch
|
||||
|
||||
For daily works like adding a new feature or fixing a bug, please open your feature branch before coding:
|
||||
|
||||
```bash
|
||||
git checkout -b my-cool-stuff
|
||||
```
|
||||
|
||||
1. Commit
|
||||
|
||||
Before issuing your first `git commit` command, please install [`pre-commit`](http://pre-commit.com/) by running the following commands:
|
||||
|
||||
```bash
|
||||
pip install pre-commit
|
||||
pre-commit install
|
||||
```
|
||||
|
||||
Our pre-commit configuration requires clang-format 3.8 for auto-formating C/C++ code and yapf for Python.
|
||||
|
||||
Once installed, `pre-commit` checks the style of code and documentation in every commit. We will see something like the following when you run `git commit`:
|
||||
|
||||
```
|
||||
➜ git commit
|
||||
CRLF end-lines remover...............................(no files to check)Skipped
|
||||
yapf.................................................(no files to check)Skipped
|
||||
Check for added large files..............................................Passed
|
||||
Check for merge conflicts................................................Passed
|
||||
Check for broken symlinks................................................Passed
|
||||
Detect Private Key...................................(no files to check)Skipped
|
||||
Fix End of Files.....................................(no files to check)Skipped
|
||||
clang-formater.......................................(no files to check)Skipped
|
||||
[my-cool-stuff c703c041] add test file
|
||||
1 file changed, 0 insertions(+), 0 deletions(-)
|
||||
create mode 100644 233
|
||||
```
|
||||
|
||||
1. Build and test
|
||||
|
||||
Users can build PaddlePaddle natively on Linux and Mac OS X. But to unify the building environment and to make it easy for debugging, the recommended way is [using Docker](https://github.com/PaddlePaddle/Paddle/blob/develop/doc/howto/dev/build_en.md).
|
||||
|
||||
1. Keep pulling
|
||||
|
||||
An experienced Git user pulls from the official repo often -- daily or even hourly, so they notice conflicts with others work early, and it's easier to resolve smaller conflicts.
|
||||
|
||||
```bash
|
||||
git remote add upstream https://github.com/PaddlePaddle/Paddle
|
||||
git pull upstream develop
|
||||
```
|
||||
|
||||
1. Push and file a pull request
|
||||
|
||||
You can "push" your local work into your forked repo:
|
||||
|
||||
```bash
|
||||
git push origin my-cool-stuff
|
||||
```
|
||||
|
||||
The push allows you to create a pull request, requesting owners of this [official repo](https://github.com/PaddlePaddle/Paddle) to pull your change into the official one.
|
||||
|
||||
To create a pull request, please follow [these steps](https://help.github.com/articles/creating-a-pull-request/).
|
||||
|
||||
If your change is for fixing an issue, please write ["Fixes <issue-URL>"](https://help.github.com/articles/closing-issues-using-keywords/) in the description section of your pull request. Github would close the issue when the owners merge your pull request.
|
||||
|
||||
Please remember to specify some reviewers for your pull request. If you don't know who are the right ones, please follow Github's recommendation.
|
||||
|
||||
|
||||
1. Delete local and remote branches
|
||||
|
||||
To keep your local workspace and your fork clean, you might want to remove merged branches:
|
||||
|
||||
```bash
|
||||
git push origin :my-cool-stuff
|
||||
git checkout develop
|
||||
git pull upstream develop
|
||||
git branch -d my-cool-stuff
|
||||
```
|
||||
|
||||
### Code Review
|
||||
|
||||
- Please feel free to ping your reviewers by sending them the URL of your pull request via IM or email. Please do this after your pull request passes the CI.
|
||||
|
||||
- Please answer reviewers' every comment. If you are to follow the comment, please write "Done"; please give a reason otherwise.
|
||||
|
||||
- If you don't want your reviewers to get overwhelmed by email notifications, you might reply their comments by [in a batch](https://help.github.com/articles/reviewing-proposed-changes-in-a-pull-request/).
|
||||
|
||||
- Reduce the unnecessary commits. Some developers commit often. It is recommended to append a sequence of small changes into one commit by running `git commit --amend` instead of `git commit`.
|
||||
|
||||
|
||||
## Coding Standard
|
||||
|
||||
### Code Style
|
||||
|
||||
Our C/C++ code follows the [Google style guide](http://google.github.io/styleguide/cppguide.html).
|
||||
|
||||
Our Python code follows the [PEP8 style guide](https://www.python.org/dev/peps/pep-0008/).
|
||||
|
||||
Our build process helps to check the code style. In [`build.sh`](https://github.com/PaddlePaddle/Paddle/blob/b84e8226514b8bb4405c3c28e54aa5077193d179/paddle/scripts/docker/build.sh#L42), the entry point of our [builder Docker image](https://github.com/PaddlePaddle/Paddle/blob/b84e8226514b8bb4405c3c28e54aa5077193d179/Dockerfile#L88), the CMake argument `WITH_STYLE_CHECK` is set to `ON` by default. This flag is on
|
||||
|
||||
Please install pre-commit, which automatically reformat the changes to C/C++ and Python code whenever we run `git commit`. To check the whole codebase, we can run the command `pre-commit run -a`, as in the [`check_style.sh` file](https://github.com/PaddlePaddle/Paddle/blob/b84e8226514b8bb4405c3c28e54aa5077193d179/paddle/scripts/travis/check_style.sh#L30), which is invoked by [our Travis CI configuration](https://github.com/PaddlePaddle/Paddle/blob/b84e8226514b8bb4405c3c28e54aa5077193d179/.travis.yml#L43).
|
||||
|
||||
### Unit Tests
|
||||
|
||||
Please remember to add related unit tests.
|
||||
|
||||
- For C/C++ code, please follow [`google-test` Primer](https://github.com/google/googletest/blob/master/googletest/docs/Primer.md).
|
||||
|
||||
- For Python code, please use [Python's standard `unittest` package](http://pythontesting.net/framework/unittest/unittest-introduction/).
|
||||
|
||||
|
||||
### Writing Logs
|
||||
|
||||
We use [glog](https://github.com/google/glog) for logging in our C/C++ code.
|
||||
|
||||
For general information, please use `LOG`. For debug information, please use [`VLOG`](http://htmlpreview.github.io/?https://github.com/google/glog/blob/master/doc/glog.html#verbose). The reason is at [here](https://groups.google.com/a/chromium.org/d/msg/chromium-dev/3NDNd1KzXeY/AZKMMx37fdQJ).
|
||||
|
||||
`VLOG` requires a *verbose level* parameter. For example:
|
||||
|
||||
```c++
|
||||
VLOG(3) << "Operator FC is taking " << num_inputs << "inputs."
|
||||
```
|
||||
|
||||
When we run a PaddlePaddle application or test, we can specify a verbose threshold. For example:
|
||||
|
||||
```bash
|
||||
GLOG_vmodule=buddy_allocator=2 \
|
||||
GLOG_v=10 \
|
||||
python \
|
||||
../python/paddle/v2/framework/tests/test_recurrent_op.py
|
||||
```
|
||||
|
||||
This will enable VLOG messages generated by `buddy_allocator.{h,cc}` and in the verbose range of 0 to 3, so you will see above example VLOG message, which is in level 3. This suggests that we output overall messages in lower verbose levels, so they display with higher probability. When coding C++, please follow the verbose level convention as follows:
|
||||
|
||||
- verbose level 1: [framework](https://github.com/PaddlePaddle/Paddle/tree/develop/paddle/framework)
|
||||
- verbose level 3: [operators](https://github.com/PaddlePaddle/Paddle/tree/develop/paddle/operators)
|
||||
- verbose level 5: [memory](https://github.com/PaddlePaddle/Paddle/tree/develop/paddle/memory), [platform](https://github.com/PaddlePaddle/Paddle/tree/develop/paddle/platform)
|
||||
- verbose level 7: [math](https://github.com/PaddlePaddle/Paddle/tree/develop/paddle/math)
|
||||
|
||||
@ -1,219 +0,0 @@
|
||||
# Contribute Code
|
||||
|
||||
We sincerely appreciate your contributions. You can use fork and pull request
|
||||
workflow to merge your code.
|
||||
|
||||
## Code Requirements
|
||||
- Your code comments must be fully documented by
|
||||
[Doxygen](http://www.stack.nl/~dimitri/doxygen/) style.
|
||||
- Make sure the compiler option `WITH_STYLE_CHECK` is on and the compiler
|
||||
passes the code style check.
|
||||
- All code must have unit test.
|
||||
- Pass all unit tests.
|
||||
|
||||
The following tutorial guides you into submitting your contibution.
|
||||
|
||||
## [Creating a Fork](https://help.github.com/articles/fork-a-repo/)
|
||||
|
||||
Just head over to the GitHub page and click the "Fork" button.
|
||||
It's just that simple.
|
||||
|
||||
## Clone
|
||||
|
||||
Clone remote repository.
|
||||
|
||||
```bash
|
||||
➜ git clone https://github.com/USERNAME/Paddle
|
||||
➜ cd Paddle
|
||||
```
|
||||
|
||||
## Create a local branch
|
||||
|
||||
Paddle is currently using [Git-flow branching model](http://nvie.com/posts/a-successful-git-branching-model/).
|
||||
|
||||
All feature and bug fix development work should be done on a new branch, generally create new branch from `develop` branch .
|
||||
|
||||
```bash
|
||||
➜ git checkout -b my-cool-stuff
|
||||
```
|
||||
|
||||
Before the checkout, you need to keep the current branch directory clean, otherwise the untracked file will be brought to the new branch, which can be inspected by `git status`.
|
||||
|
||||
## Using `pre-commit` hook
|
||||
|
||||
Paddle developers use [pre-commit](http://pre-commit.com/) tool to manage git
|
||||
pre-commit hooks. It can help us format source codes (cpp, python), check some
|
||||
basic thing before commit (only one EOL for each file, do not add a huge file
|
||||
in git). `pre-commit` tests is a part of unit tests in Travis-CI now, every
|
||||
PR doesn't fit hook can not be merged into Paddle.
|
||||
|
||||
To use [pre-commit](http://pre-commit.com/), you should install it by
|
||||
`pip install pre-commit`, and currently, Paddle uses `clang-format` to format
|
||||
c/cpp sources. Please make sure clang-format 3.8+ installed.
|
||||
|
||||
Install and run it as follow:
|
||||
|
||||
```bash
|
||||
➜ pip install pre-commit
|
||||
➜ pre-commit install
|
||||
```
|
||||
|
||||
When you commit your code, the pre-commit hook will check the local code if there is
|
||||
anything not suitable to commit, and so on.
|
||||
|
||||
## Start to develop
|
||||
|
||||
In this tutorial, I delete a line in README.md and created a new file.
|
||||
|
||||
We can use `git status` to inspect the changes of current directory, `git diff` to see difference.
|
||||
|
||||
```bash
|
||||
➜ git status
|
||||
On branch test
|
||||
Changes not staged for commit:
|
||||
(use "git add <file>..." to update what will be committed)
|
||||
(use "git checkout -- <file>..." to discard changes in working directory)
|
||||
|
||||
modified: README.md
|
||||
|
||||
Untracked files:
|
||||
(use "git add <file>..." to include in what will be committed)
|
||||
|
||||
test
|
||||
|
||||
no changes added to commit (use "git add" and/or "git commit -a")
|
||||
```
|
||||
## Build and Test
|
||||
|
||||
We package PaddlePaddle's compile environment into a Docker image, called the develop image named `paddle:dev`, it contains all compiling tools that PaddlePaddle needs.
|
||||
|
||||
If you want to build the develop image, just run:
|
||||
|
||||
```bash
|
||||
➜ docker build -t paddle:dev .
|
||||
```
|
||||
|
||||
Then we can use the develop image to build PaddlePaddle source. For example:
|
||||
|
||||
```bash
|
||||
➜ docker run -v $(pwd):/paddle -e "WITH_GPU=OFF" -e "WITH_AVX=ON" -e "WITH_TEST=ON" paddle:dev
|
||||
```
|
||||
|
||||
The above command will compile PaddlePaddle and create a Dockerfile for building production image. All the generated files are in the build directory. "WITH_GPU" controls if the generated production image supports GPU. "WITH_AVX" controls if the generated production image supports AVX. "WITH_TEST" controls if the unit test will be generated.
|
||||
|
||||
Then we can generate the production image by copying the compiled PaddlePaddle program into the image by
|
||||
|
||||
```bash
|
||||
➜ docker build -t paddle:prod -f build/Dockerfile .
|
||||
```
|
||||
|
||||
Run unit test finally:
|
||||
|
||||
```bash
|
||||
➜ docker run -it -v $(pwd):/paddle paddle:dev bash -c "cd /paddle/build && ctest"
|
||||
```
|
||||
|
||||
For more details, you can read [this doc](https://github.com/PaddlePaddle/Paddle/blob/develop/doc/getstarted/build_and_install/docker_install_en.rst).
|
||||
|
||||
## Commit
|
||||
|
||||
Next we cancel the changes to the README.md file and then commit our changes by following command lines:
|
||||
|
||||
```bash
|
||||
➜ git checkout -- README.md
|
||||
➜ git status
|
||||
On branch test
|
||||
Untracked files:
|
||||
(use "git add <file>..." to include in what will be committed)
|
||||
|
||||
test
|
||||
|
||||
nothing added to commit but untracked files present (use "git add" to track)
|
||||
➜ git add test
|
||||
```
|
||||
|
||||
We should write a description of each commit by `git commit` to allow others to know
|
||||
the changes in these files.
|
||||
|
||||
```bash
|
||||
➜ git commit
|
||||
CRLF end-lines remover...............................(no files to check)Skipped
|
||||
yapf.................................................(no files to check)Skipped
|
||||
Check for added large files..............................................Passed
|
||||
Check for merge conflicts................................................Passed
|
||||
Check for broken symlinks................................................Passed
|
||||
Detect Private Key...................................(no files to check)Skipped
|
||||
Fix End of Files.....................................(no files to check)Skipped
|
||||
clang-formater.......................................(no files to check)Skipped
|
||||
[my-cool-stuff c703c041] add test file
|
||||
1 file changed, 0 insertions(+), 0 deletions(-)
|
||||
create mode 100644 233
|
||||
```
|
||||
|
||||
## Keeping Fork Up to Date
|
||||
|
||||
Before pull your request, you should sync your code from the latest PaddlePaddle.
|
||||
To do this, you'll need to add a remote at first:
|
||||
|
||||
```bash
|
||||
➜ git remote add upstream https://github.com/PaddlePaddle/Paddle
|
||||
➜ git remote
|
||||
origin
|
||||
upstream
|
||||
```
|
||||
|
||||
Update your fork with the latest upstream changes:
|
||||
|
||||
```bash
|
||||
➜ git fetch upstream
|
||||
➜ git pull upstream develop
|
||||
```
|
||||
|
||||
Now, your local master branch is up-to-date with everything modified upstream.
|
||||
|
||||
## Push to GitHub
|
||||
|
||||
```bash
|
||||
# push to your repository in Github
|
||||
➜ git push origin my-cool-stuff
|
||||
```
|
||||
|
||||
## Create an issue and a Pull Request
|
||||
|
||||
Create an Issue to describe the problem and record its number.
|
||||
|
||||
Go to the page for your fork on GitHub, select your development branch,
|
||||
and click the `New pull request`.
|
||||
|
||||
<img width="295" alt="screen shot 2017-04-26 at 9 09 28 pm" src="https://cloud.githubusercontent.com/assets/11692045/25436054/a6d98c66-2ac4-11e7-9cb1-18dd13150230.png">
|
||||
|
||||
Then select the target branch:
|
||||
|
||||
<img width="750" alt="screen shot 2017-04-26 at 9 11 52 pm" src="https://cloud.githubusercontent.com/assets/11692045/25436139/f83b1e6c-2ac4-11e7-8c0e-add499023c46.png">
|
||||
|
||||
We can add `resolve #Issue number` in PR description to close the issue automatically after the PR is merge. More details in <https://help.github.com/articles/closing-issues-via-commit-messages/>.
|
||||
|
||||
Then wait for review, if there need to modify, refer to the above steps to update the corresponding origin branch.
|
||||
|
||||
## Delete origin branch
|
||||
|
||||
After the PR is merge into the main repository, we can delete the remote branch on the PR page.
|
||||
|
||||
<img width="775" alt="screen shot 2017-04-26 at 9 18 24 pm" src="https://cloud.githubusercontent.com/assets/11692045/25436457/e4cdd472-2ac5-11e7-9272-badc76c4a23e.png">
|
||||
|
||||
Or just run:
|
||||
|
||||
```bash
|
||||
➜ git push origin :my-cool-stuff
|
||||
```
|
||||
|
||||
## Delete local branch
|
||||
|
||||
Finally, we delete local branch:
|
||||
|
||||
```bash
|
||||
➜ git checkout develop
|
||||
|
||||
# delete my-cool-stuff branch
|
||||
➜ git branch -D my-cool-stuff
|
||||
```
|
||||
@ -0,0 +1 @@
|
||||
../../../CONTRIBUTING.md
|
||||
@ -1,2 +1,3 @@
|
||||
vendor/
|
||||
.glide/
|
||||
proto/*.go
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
# Ignore everything in this directory
|
||||
*
|
||||
# Except this file
|
||||
!.gitignore
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,86 @@
|
||||
package pserver
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/binary"
|
||||
"fmt"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
const testDir = "./test_data"
|
||||
|
||||
type myKV struct {
|
||||
m map[string][]byte
|
||||
}
|
||||
|
||||
func (m *myKV) GetKey(key string, timeout time.Duration) ([]byte, error) {
|
||||
if m.m == nil {
|
||||
m.m = make(map[string][]byte)
|
||||
}
|
||||
return m.m[key], nil
|
||||
}
|
||||
|
||||
func (m *myKV) PutKey(key string, value []byte, timeout time.Duration, withLease bool) error {
|
||||
if m.m == nil {
|
||||
m.m = make(map[string][]byte)
|
||||
}
|
||||
m.m[key] = value
|
||||
return nil
|
||||
}
|
||||
|
||||
func TestCheckpoint(t *testing.T) {
|
||||
kv := &myKV{}
|
||||
s, err := NewService(0, time.Hour, testDir, kv, nil)
|
||||
assert.Nil(t, err)
|
||||
err = s.checkpoint()
|
||||
assert.Nil(t, err)
|
||||
_, err = LoadCheckpoint(kv, 0)
|
||||
assert.Nil(t, err)
|
||||
}
|
||||
|
||||
func float32ToByte(f float32) []byte {
|
||||
var buf bytes.Buffer
|
||||
err := binary.Write(&buf, binary.LittleEndian, f)
|
||||
if err != nil {
|
||||
fmt.Println("binary.Write failed:", err)
|
||||
}
|
||||
return buf.Bytes()
|
||||
}
|
||||
|
||||
func TestCheckpointWithData(t *testing.T) {
|
||||
kv := &myKV{}
|
||||
s, err := NewService(0, time.Hour, testDir, kv, nil)
|
||||
assert.Nil(t, err)
|
||||
|
||||
var content []byte
|
||||
for i := 0; i < 50000; i++ {
|
||||
content = append(content, float32ToByte(float32(i))...)
|
||||
}
|
||||
|
||||
p1 := Parameter{Name: "p1", ElementType: 1, Content: content}
|
||||
err = s.InitParam(ParameterWithConfig{Param: p1}, nil)
|
||||
assert.Nil(t, err)
|
||||
|
||||
err = s.FinishInitParams(0, nil)
|
||||
assert.Nil(t, err)
|
||||
|
||||
var p2 Parameter
|
||||
err = s.GetParam(p1.Name, &p2)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, p1, p2)
|
||||
|
||||
err = s.checkpoint()
|
||||
assert.Nil(t, err)
|
||||
cp, err := LoadCheckpoint(kv, 0)
|
||||
assert.Nil(t, err)
|
||||
s1, err := NewService(0, time.Hour, testDir, kv, cp)
|
||||
assert.Nil(t, err)
|
||||
|
||||
var p3 Parameter
|
||||
err = s1.GetParam(p1.Name, &p3)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, p1, p3)
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue