Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add config_parser in trainer_config_helpers to seperate trainer config #1

Closed
wants to merge 102 commits into from
Closed

add config_parser in trainer_config_helpers to seperate trainer config #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
529f24c
cpu cmrnorm
hedaoyuan Dec 12, 2016
9503590
add CrossMapNormal
hedaoyuan Dec 13, 2016
e357f27
add GPU CrossMapNormal
hedaoyuan Dec 13, 2016
0eac399
priorbox layer for ssd
Dec 13, 2016
39d689e
Format the priorbox code
Dec 14, 2016
438a704
add rnn_cn.md
Dec 14, 2016
9600932
Add fake gpu support of the priorbox layer for the moment
Dec 14, 2016
c007608
Format the python file.
Dec 14, 2016
a1d2abc
add Function
hedaoyuan Dec 14, 2016
ce1d98e
Add a Tensor to use as a Function argument
hedaoyuan Dec 15, 2016
214343a
modify details
Dec 15, 2016
660b310
modify line183 beam search
Dec 15, 2016
4ebb3eb
imporve Function
hedaoyuan Dec 15, 2016
9171ab0
Merge branch 'develop' of https://github.com/baidu/Paddle into cmrnorm
hedaoyuan Dec 15, 2016
707a9c9
Fix variable name and add the annotation
Dec 15, 2016
520342e
Fix code format
Dec 15, 2016
d2d0010
add CrossMapNormalGradFunc
hedaoyuan Dec 15, 2016
22a5e47
move Function to function dir
hedaoyuan Dec 15, 2016
558e869
add CMakeLists
hedaoyuan Dec 15, 2016
d11e2b4
Remove some useless code
hedaoyuan Dec 15, 2016
f13aeb5
fix swig_api
hedaoyuan Dec 15, 2016
1048aee
Add input layer check
Dec 15, 2016
cee9346
add some comments
hedaoyuan Dec 15, 2016
5222b58
support UBUNTU MIRROR and modify doc
wen-bo-yang Dec 16, 2016
2b91bf1
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
wen-bo-yang Dec 16, 2016
5b746fb
modify doc doc/getstarted/build_and_install/docker_install_en.rst
wen-bo-yang Dec 16, 2016
36af605
modify doc
wen-bo-yang Dec 16, 2016
9f990d9
Add unittest of the priorbox layer
Dec 16, 2016
8d9f675
Add header files
Dec 16, 2016
d40bb72
modify rnn_config_cn.rst
Dec 16, 2016
cad325f
Add header file
Dec 16, 2016
38723e7
remove random flag
Dec 19, 2016
7dfe3bd
remove gpu memory alloc
Dec 19, 2016
148bd4d
add Layer::createFunction
hedaoyuan Dec 19, 2016
1a06697
travis for check broken links
luotao1 Dec 19, 2016
706c572
Matrix API refactor, when passing parameters, convert shared_ptr (Mat…
Dec 16, 2016
4fbf949
Refactor MUL functions, pass object reference instead of shared_ptr.
Dec 20, 2016
4855821
Merge branch 'develop' into checker
luotao1 Dec 20, 2016
204152c
set -e for docs.sh
luotao1 Dec 20, 2016
8f08fa1
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
wen-bo-yang Dec 20, 2016
bf26679
update docker_install_en.rst
wen-bo-yang Dec 20, 2016
6f8f468
Add priorbox layer gpu unit test.
Dec 20, 2016
5fddd99
move TEST from test_matrixCompare.cpp to cross_map_normal_op_test.cpp
hedaoyuan Dec 20, 2016
bf32411
Merge branch 'develop' of https://github.com/baidu/Paddle into cmrnorm
hedaoyuan Dec 20, 2016
f1a94e3
follow comments
hedaoyuan Dec 20, 2016
f4f0f2d
Fix bug in config_parse.py when batch_norm layer is used in Recurrent…
qingqing01 Dec 20, 2016
35bbb4f
change float to real in two test
Dec 20, 2016
dadd48a
Merge pull request #963 from reyoung/feature/add_const_in_parameter_u…
reyoung Dec 20, 2016
9049369
Merge pull request #934 from tianbingsz/paddle_function_mat
tianbingsz Dec 20, 2016
42e1217
Merge pull request #854 from hedaoyuan/cmrnorm
tianbingsz Dec 20, 2016
37f7595
Merge pull request #927 from wen-bo-yang/develop_test
wangkuiyi Dec 20, 2016
84ad724
Adding namespace in timing macros
Dec 21, 2016
5bb29ec
close log info in BN.
qingqing01 Dec 21, 2016
a6f772b
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
qingqing01 Dec 21, 2016
67fcd89
fix array style problem
Dec 21, 2016
5471e87
Merge branch 'develop' into checker
luotao1 Dec 21, 2016
de8927e
refine docs.sh
luotao1 Dec 21, 2016
f202929
Change type float to real.
Dec 21, 2016
1b8e151
Support user specified label input in tests
Dec 21, 2016
06ea2bf
Merge pull request #967 from pengli09/fix_test_type
pengli09 Dec 21, 2016
39a5477
refine docs.sh
luotao1 Dec 21, 2016
4e34220
Merge pull request #970 from reyoung/feature/clean_parameter_updater_…
reyoung Dec 21, 2016
e4c492d
change type to bool.
qingqing01 Dec 21, 2016
567871f
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
qingqing01 Dec 21, 2016
446e3c2
Merge pull request #946 from luotao1/checker
luotao1 Dec 21, 2016
8bd4752
Merge branch 'develop' into add_label_seq_pos_to_inputdef
Dec 21, 2016
1f4f044
A tiny fix in PyDataProvider2
reyoung Dec 21, 2016
bbf3b47
Merge pull request #966 from qingqing01/batch_norm
qingqing01 Dec 21, 2016
adc5839
Merge pull request #969 from reyoung/feature/clean_gradient_machine_s…
reyoung Dec 21, 2016
d09564b
change std::vector<int> to const reference
Dec 21, 2016
cf5bf5b
Merge branch 'feature/fix_param_hidden_in_pydp2' into feature/mnist_t…
reyoung Dec 21, 2016
28c5010
Merge pull request #976 from pengli09/add_label_seq_pos_to_inputdef
pengli09 Dec 21, 2016
22aacbf
Add const to GradientMachine::eval
reyoung Dec 21, 2016
4d81b36
A tiny fix in PyDataProvider2
reyoung Dec 21, 2016
4d5a0b0
Also add const to makeEvaluator
reyoung Dec 21, 2016
1e6c87b
Merge branch 'feature/add_const_in_gradient_machine_eval' into featur…
reyoung Dec 21, 2016
e8e58fb
add config_parser in trainer_config_helpers to seperate trainer config
jacquesqiao Dec 21, 2016
8d24931
Change member variables from public to protected
Dec 21, 2016
eaba2e2
Expose Evaluator API
reyoung Dec 21, 2016
409a577
Complete a very simple mnist demo.
reyoung Dec 21, 2016
06dc66b
Merge branch 'feature/fix_param_hidden_in_pydp2' into feature/mnist_t…
reyoung Dec 21, 2016
b53bdcd
Merge pull request #867 from Noplz/ssd
qingqing01 Dec 22, 2016
e031f0c
Fix typo in PyDataProvider2.py
Dec 22, 2016
9baf7fc
Fix data provider bug in srl demo
Dec 22, 2016
c1b294a
Merge pull request #974 from emailweixu/timer_namespace
backyes Dec 22, 2016
db82a0e
Merge pull request #980 from reyoung/feature/add_const_in_gradient_ma…
gangliao Dec 22, 2016
89bf2e4
Change float to real in NormLayer.h
Dec 22, 2016
680dd92
Add AverageOptimizer, Add save parameter
reyoung Dec 22, 2016
c6b2bfe
Merge pull request #986 from pengli09/fix-pydata-provider-doc-typo
pengli09 Dec 22, 2016
a7b5d94
Merge pull request #987 from pengli09/fix-srl-demo-data-provider-bug
pengli09 Dec 22, 2016
4f70880
Merge pull request #881 from livc/rnn
Zrachel Dec 22, 2016
5bca268
Add gitignore
reyoung Dec 22, 2016
4490bf9
Merge pull request #990 from pengli09/norm-layer
qingqing01 Dec 22, 2016
59009ba
Always use copy method for numpy.
reyoung Dec 22, 2016
a31ef0c
Merge branch 'feature/mnist_train_api' of github.com:reyoung/Paddle i…
reyoung Dec 22, 2016
f06b64f
Test GPU
reyoung Dec 22, 2016
65e957c
Merge branch 'feature/mnist_train_api' of github.com:reyoung/Paddle i…
reyoung Dec 22, 2016
5a68584
Test on GPU
reyoung Dec 22, 2016
16ea66e
Merge branch 'develop' of github.com:baidu/Paddle into feature/mnist_…
reyoung Dec 22, 2016
3a80272
Add comments.
reyoung Dec 22, 2016
87d4e60
add config_parser_utils
jacquesqiao Dec 22, 2016
7029247
add config_parser_utils
jacquesqiao Dec 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix swig_api
  • Loading branch information
@hedaoyuan
hedaoyuan committed Dec 15, 2016
commit f13aeb52e9fc666ac1e24acf5315cbdccf108402
1 change: 1 addition & 0 deletions paddle/api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ add_custom_command(OUTPUT ${PROJ_ROOT}/paddle/dist/.timestamp
WORKING_DIRECTORY ${PROJ_ROOT}/paddle
DEPENDS python_swig_sources
paddle_parameter
paddle_function
paddle_math
paddle_utils
paddle_gserver
Expand Down
5 changes: 3 additions & 2 deletions paddle/api/paddle_ld_flags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
whole_end = ""

LIB_DIRS = [
"math", 'utils', 'parameter', "gserver", "api", "cuda", "pserver",
"trainer"
"math", 'function', 'utils', 'parameter', "gserver", "api", "cuda",
"pserver", "trainer"
]
PARENT_LIB_DIRS = ['proto']

Expand Down Expand Up @@ -75,6 +75,7 @@ def libs_str(self):
libs = [
whole_start,
"-lpaddle_gserver",
"-lpaddle_function",
whole_end,
"-lpaddle_pserver",
"-lpaddle_trainer_lib",
Expand Down