Skip to content

P
PaddleDetection

PaddlePaddle / PaddleDetection
大约 2 年 前同步成功

通知 708
Star 11112
Fork 2696
P
PaddleDetection
“506092146d05aa94d2430c5b3dfb63d699dca858”上不存在“paddle/phi/kernels/squeeze_kernel.h”
提交 fc6f2032 编写于 作者: Y Yancey1989
浏览文件
操作

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into develop

上级 047f3a76 299e959a
显示空白变更内容
内联 并排
Showing with 1068 addition and 325 deletion
.gitmodules
浏览文件 @ fc6f2032
[submodule "book"] [submodule "book"]
path = book path = book
url = https://github.com/PaddlePaddle/book.git url = https://github.com/PaddlePaddle/book.git
branch = develop
\ No newline at end of file
book @ 6e3875eb
比较 22ed2a01...6e3875eb
Subproject commit 22ed2a01aee872f055b5f5f212428f481cefc10d Subproject commit 6e3875eb62533de1f2c1088a477719eb57b9732c
demo/mnist/api_train_v2.py
浏览文件 @ fc6f2032
...@@ -122,13 +122,14 @@ def main(): ...@@ -122,13 +122,14 @@ def main():
test_creator = paddle.dataset.mnist.test() test_creator = paddle.dataset.mnist.test()
test_data = [] test_data = []
for item in test_creator(): for item in test_creator():
test_data.append(item[0]) test_data.append((item[0], ))
if len(test_data) == 100: if len(test_data) == 100:
break break
# output is a softmax layer. It returns probabilities. # output is a softmax layer. It returns probabilities.
# Shape should be (100, 10) # Shape should be (100, 10)
probs = paddle.infer(output=predict, parameters=parameters, input=test_data) probs = paddle.infer(
output_layer=predict, parameters=parameters, input=test_data)
print probs.shape print probs.shape
......
demo/sentiment/train_v2.py
浏览文件 @ fc6f2032
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
# limitations under the License. # limitations under the License.
import sys import sys
import paddle.trainer_config_helpers.attrs as attrs
from paddle.trainer_config_helpers.poolings import MaxPooling
import paddle.v2 as paddle import paddle.v2 as paddle
...@@ -51,16 +49,14 @@ def stacked_lstm_net(input_dim, ...@@ -51,16 +49,14 @@ def stacked_lstm_net(input_dim,
emb_dim: dimension of word embedding. emb_dim: dimension of word embedding.
hid_dim: dimension of hidden layer. hid_dim: dimension of hidden layer.
stacked_num: number of stacked lstm-hidden layer. stacked_num: number of stacked lstm-hidden layer.
is_predict: is predicting or not.
Some layers is not needed in network when predicting.
""" """
assert stacked_num % 2 == 1 assert stacked_num % 2 == 1
layer_attr = attrs.ExtraLayerAttribute(drop_rate=0.5) layer_attr = paddle.attr.Extra(drop_rate=0.5)
fc_para_attr = attrs.ParameterAttribute(learning_rate=1e-3) fc_para_attr = paddle.attr.Param(learning_rate=1e-3)
lstm_para_attr = attrs.ParameterAttribute(initial_std=0., learning_rate=1.) lstm_para_attr = paddle.attr.Param(initial_std=0., learning_rate=1.)
para_attr = [fc_para_attr, lstm_para_attr] para_attr = [fc_para_attr, lstm_para_attr]
bias_attr = attrs.ParameterAttribute(initial_std=0., l2_rate=0.) bias_attr = paddle.attr.Param(initial_std=0., l2_rate=0.)
relu = paddle.activation.Relu() relu = paddle.activation.Relu()
linear = paddle.activation.Linear() linear = paddle.activation.Linear()
...@@ -90,8 +86,10 @@ def stacked_lstm_net(input_dim, ...@@ -90,8 +86,10 @@ def stacked_lstm_net(input_dim,
layer_attr=layer_attr) layer_attr=layer_attr)
inputs = [fc, lstm] inputs = [fc, lstm]
fc_last = paddle.layer.pooling(input=inputs[0], pooling_type=MaxPooling()) fc_last = paddle.layer.pooling(
lstm_last = paddle.layer.pooling(input=inputs[1], pooling_type=MaxPooling()) input=inputs[0], pooling_type=paddle.pooling.Max())
lstm_last = paddle.layer.pooling(
input=inputs[1], pooling_type=paddle.pooling.Max())
output = paddle.layer.fc(input=[fc_last, lstm_last], output = paddle.layer.fc(input=[fc_last, lstm_last],
size=class_dim, size=class_dim,
act=paddle.activation.Softmax(), act=paddle.activation.Softmax(),
...@@ -105,14 +103,23 @@ def stacked_lstm_net(input_dim, ...@@ -105,14 +103,23 @@ def stacked_lstm_net(input_dim,
if __name__ == '__main__': if __name__ == '__main__':
# init # init
paddle.init(use_gpu=False, trainer_count=4) paddle.init(use_gpu=False)
# network config #data
print 'load dictionary...' print 'load dictionary...'
word_dict = paddle.dataset.imdb.word_dict() word_dict = paddle.dataset.imdb.word_dict()
dict_dim = len(word_dict) dict_dim = len(word_dict)
class_dim = 2 class_dim = 2
train_reader = paddle.batch(
paddle.reader.shuffle(
lambda: paddle.dataset.imdb.train(word_dict), buf_size=1000),
batch_size=100)
test_reader = paddle.batch(
lambda: paddle.dataset.imdb.test(word_dict), batch_size=100)
feeding = {'word': 0, 'label': 1}
# network config
# Please choose the way to build the network # Please choose the way to build the network
# by uncommenting the corresponding line. # by uncommenting the corresponding line.
cost = convolution_net(dict_dim, class_dim=class_dim) cost = convolution_net(dict_dim, class_dim=class_dim)
...@@ -137,12 +144,7 @@ if __name__ == '__main__': ...@@ -137,12 +144,7 @@ if __name__ == '__main__':
sys.stdout.write('.') sys.stdout.write('.')
sys.stdout.flush() sys.stdout.flush()
if isinstance(event, paddle.event.EndPass): if isinstance(event, paddle.event.EndPass):
result = trainer.test( result = trainer.test(reader=test_reader, feeding=feeding)
reader=paddle.batch(
lambda: paddle.dataset.imdb.test(word_dict),
batch_size=128),
feeding={'word': 0,
'label': 1})
print "\nTest with Pass %d, %s" % (event.pass_id, result.metrics) print "\nTest with Pass %d, %s" % (event.pass_id, result.metrics)
# create trainer # create trainer
...@@ -151,11 +153,7 @@ if __name__ == '__main__': ...@@ -151,11 +153,7 @@ if __name__ == '__main__':
update_equation=adam_optimizer) update_equation=adam_optimizer)
trainer.train( trainer.train(
reader=paddle.batch( reader=train_reader,
paddle.reader.shuffle(
lambda: paddle.dataset.imdb.train(word_dict), buf_size=1000),
batch_size=100),
event_handler=event_handler, event_handler=event_handler,
feeding={'word': 0, feeding=feeding,
'label': 1}, num_passes=2)
num_passes=10)
demo/seqToseq/api_train_v2.py
浏览文件 @ fc6f2032
import sys
import paddle.v2 as paddle import paddle.v2 as paddle
...@@ -104,7 +105,9 @@ def main(): ...@@ -104,7 +105,9 @@ def main():
parameters = paddle.parameters.create(cost) parameters = paddle.parameters.create(cost)
# define optimize method and trainer # define optimize method and trainer
optimizer = paddle.optimizer.Adam(learning_rate=1e-4) optimizer = paddle.optimizer.Adam(
learning_rate=5e-5,
regularization=paddle.optimizer.L2Regularization(rate=1e-3))
trainer = paddle.trainer.SGD(cost=cost, trainer = paddle.trainer.SGD(cost=cost,
parameters=parameters, parameters=parameters,
update_equation=optimizer) update_equation=optimizer)
...@@ -125,8 +128,11 @@ def main(): ...@@ -125,8 +128,11 @@ def main():
def event_handler(event): def event_handler(event):
if isinstance(event, paddle.event.EndIteration): if isinstance(event, paddle.event.EndIteration):
if event.batch_id % 10 == 0: if event.batch_id % 10 == 0:
print "Pass %d, Batch %d, Cost %f, %s" % ( print "\nPass %d, Batch %d, Cost %f, %s" % (
event.pass_id, event.batch_id, event.cost, event.metrics) event.pass_id, event.batch_id, event.cost, event.metrics)
else:
sys.stdout.write('.')
sys.stdout.flush()
# start to train # start to train
trainer.train( trainer.train(
......
doc/api/index_cn.rst
浏览文件 @ fc6f2032
API API
=== ===
模型配置 API
------------
.. toctree::
:maxdepth: 1
v2/model_configs.rst
数据 API
--------
.. toctree::
:maxdepth: 1
v2/data.rst
训练 API
--------
.. toctree:: .. toctree::
:maxdepth: 1 :maxdepth: 1
v2/run_logic.rst 模型配置 <v2/model_configs.rst>
\ No newline at end of file 数据访问 <v2/data.rst>
训练与应用 <v2/run_logic.rst>
doc/api/index_en.rst
浏览文件 @ fc6f2032
API API
=== ===
Model Config API
----------------
.. toctree:: .. toctree::
:maxdepth: 1 :maxdepth: 1
v2/model_configs.rst v2/model_configs.rst
Data API
--------
.. toctree::
:maxdepth: 1
v2/data.rst v2/data.rst
Train API
---------
.. toctree::
:maxdepth: 1
v2/run_logic.rst v2/run_logic.rst
doc/api/v2/config/activation.rst 0 → 100644
浏览文件 @ fc6f2032
===========
Activation
===========
Abs
===
.. automodule:: paddle.v2.activation
:members: Abs
:noindex:
Exp
===
.. automodule:: paddle.v2.activation
:members: Exp
:noindex:
Identity
========
.. automodule:: paddle.v2.activation
:members: Identity
:noindex:
Linear
======
.. automodule:: paddle.v2.activation
:members: Linear
:noindex:
Log
===
.. automodule:: paddle.v2.activation
:members: Log
:noindex:
Square
======
.. automodule:: paddle.v2.activation
:members: Square
:noindex:
Sigmoid
=======
.. automodule:: paddle.v2.activation
:members: Sigmoid
:noindex:
Softmax
=======
.. automodule:: paddle.v2.activation
:members: Softmax
:noindex:
SequenceSoftmax
===============
.. automodule:: paddle.v2.activation
:members: SequenceSoftmax
:noindex:
Relu
====
.. automodule:: paddle.v2.activation
:members: Relu
:noindex:
BRelu
=====
.. automodule:: paddle.v2.activation
:members: BRelu
:noindex:
SoftRelu
========
.. automodule:: paddle.v2.activation
:members: SoftRelu
:noindex:
Tanh
====
.. automodule:: paddle.v2.activation
:members: Tanh
:noindex:
STanh
=====
.. automodule:: paddle.v2.activation
:members: STanh
:noindex:
doc/api/v2/config/attr.rst 0 → 100644
浏览文件 @ fc6f2032
Parameter Attribute
===================
.. automodule:: paddle.v2.attr
:members:
:noindex:
doc/api/v2/config/layer.rst 0 → 100644
浏览文件 @ fc6f2032
.. _api_v2.layer:
======
Layers
======
Data layer
===========
.. _api_v2.layer_data:
data
----
.. automodule:: paddle.v2.layer
:members: data
:noindex:
Fully Connected Layers
======================
.. _api_v2.layer_fc:
fc
--
.. automodule:: paddle.v2.layer
:members: fc
:noindex:
selective_fc
------------
.. automodule:: paddle.v2.layer
:members: selective_fc
:noindex:
Conv Layers
===========
conv_operator
-------------
.. automodule:: paddle.v2.layer
:members: conv_operator
:noindex:
conv_projection
---------------
.. automodule:: paddle.v2.layer
:members: conv_projection
:noindex:
conv_shift
----------
.. automodule:: paddle.v2.layer
:members: conv_shift
:noindex:
img_conv
--------
.. automodule:: paddle.v2.layer
:members: img_conv
:noindex:
.. _api_v2.layer_context_projection:
context_projection
------------------
.. automodule:: paddle.v2.layer
:members: context_projection
:noindex:
Image Pooling Layer
===================
img_pool
--------
.. automodule:: paddle.v2.layer
:members: img_pool
:noindex:
spp
---
.. automodule:: paddle.v2.layer
:members: spp
:noindex:
maxout
------
.. automodule:: paddle.v2.layer
:members: maxout
:noindex:
Norm Layer
==========
img_cmrnorm
-----------
.. automodule:: paddle.v2.layer
:members: img_cmrnorm
:noindex:
batch_norm
----------
.. automodule:: paddle.v2.layer
:members: batch_norm
:noindex:
sum_to_one_norm
---------------
.. automodule:: paddle.v2.layer
:members: sum_to_one_norm
:noindex:
Recurrent Layers
================
recurrent
---------
.. automodule:: paddle.v2.layer
:members: recurrent
:noindex:
lstmemory
---------
.. automodule:: paddle.v2.layer
:members: lstmemory
:noindex:
grumemory
---------
.. automodule:: paddle.v2.layer
:members: grumemory
:noindex:
Recurrent Layer Group
=====================
memory
------
.. automodule:: paddle.v2.layer
:members: memory
:noindex:
recurrent_group
---------------
.. automodule:: paddle.v2.layer
:members: recurrent_group
:noindex:
lstm_step
---------
.. automodule:: paddle.v2.layer
:members: lstm_step
:noindex:
gru_step
--------
.. automodule:: paddle.v2.layer
:members: gru_step
:noindex:
beam_search
------------
.. automodule:: paddle.v2.layer
:members: beam_search
:noindex:
get_output
----------
.. automodule:: paddle.v2.layer
:members: get_output
:noindex:
Mixed Layer
===========
.. _api_v2.layer_mixed:
mixed
-----
.. automodule:: paddle.v2.layer
:members: mixed
:noindex:
.. _api_v2.layer_embedding:
embedding
---------
.. automodule:: paddle.v2.layer
:members: embedding
:noindex:
scaling_projection
------------------
.. automodule:: paddle.v2.layer
:members: scaling_projection
:noindex:
dotmul_projection
-----------------
.. automodule:: paddle.v2.layer
:members: dotmul_projection
:noindex:
dotmul_operator
---------------
.. automodule:: paddle.v2.layer
:members: dotmul_operator
:noindex:
full_matrix_projection
----------------------
.. automodule:: paddle.v2.layer
:members: full_matrix_projection
:noindex:
identity_projection
-------------------
.. automodule:: paddle.v2.layer
:members: identity_projection
:noindex:
table_projection
----------------
.. automodule:: paddle.v2.layer
:members: table_projection
:noindex:
trans_full_matrix_projection
----------------------------
.. automodule:: paddle.v2.layer
:members: trans_full_matrix_projection
:noindex:
Aggregate Layers
================
.. _api_v2.layer_pooling:
pooling
-------
.. automodule:: paddle.v2.layer
:members: pooling
:noindex:
.. _api_v2.layer_last_seq:
last_seq
--------
.. automodule:: paddle.v2.layer
:members: last_seq
:noindex:
.. _api_v2.layer_first_seq:
first_seq
---------
.. automodule:: paddle.v2.layer
:members: first_seq
:noindex:
concat
------
.. automodule:: paddle.v2.layer
:members: concat
:noindex:
seq_concat
----------
.. automodule:: paddle.v2.layer
:members: seq_concat
:noindex:
Reshaping Layers
================
block_expand
------------
.. automodule:: paddle.v2.layer
:members: block_expand
:noindex:
.. _api_v2.layer_expand:
expand
------
.. automodule:: paddle.v2.layer
:members: expand
:noindex:
repeat
------
.. automodule:: paddle.v2.layer
:members: repeat
:noindex:
rotate
------
.. automodule:: paddle.v2.layer
:members: rotate
:noindex:
seq_reshape
-----------
.. automodule:: paddle.v2.layer
:members: seq_reshape
:noindex:
Math Layers
===========
addto
-----
.. automodule:: paddle.v2.layer
:members: addto
:noindex:
linear_comb
-----------
.. automodule:: paddle.v2.layer
:members: linear_comb
:noindex:
interpolation
-------------
.. automodule:: paddle.v2.layer
:members: interpolation
:noindex:
bilinear_interp
---------------
.. automodule:: paddle.v2.layer
:members: bilinear_interp
:noindex:
power
-----
.. automodule:: paddle.v2.layer
:members: power
:noindex:
scaling
-------
.. automodule:: paddle.v2.layer
:members: scaling
:noindex:
slope_intercept
---------------
.. automodule:: paddle.v2.layer
:members: slope_intercept
:noindex:
tensor
------
.. automodule:: paddle.v2.layer
:members: tensor
:noindex:
.. _api_v2.layer_cos_sim:
cos_sim
-------
.. automodule:: paddle.v2.layer
:members: cos_sim
:noindex:
trans
-----
.. automodule:: paddle.v2.layer
:members: trans
:noindex:
Sampling Layers
===============
maxid
-----
.. automodule:: paddle.v2.layer
:members: maxid
:noindex:
sampling_id
-----------
.. automodule:: paddle.v2.layer
:members: sampling_id
:noindex:
Slicing and Joining Layers
==========================
pad
----
.. automodule:: paddle.v2.layer
:members: pad
:noindex:
.. _api_v2.layer_costs:
Cost Layers
===========
cross_entropy_cost
------------------
.. automodule:: paddle.v2.layer
:members: cross_entropy_cost
:noindex:
cross_entropy_with_selfnorm_cost
--------------------------------
.. automodule:: paddle.v2.layer
:members: cross_entropy_with_selfnorm_cost
:noindex:
multi_binary_label_cross_entropy_cost
-------------------------------------
.. automodule:: paddle.v2.layer
:members: multi_binary_label_cross_entropy_cost
:noindex:
huber_cost
----------
.. automodule:: paddle.v2.layer
:members: huber_cost
:noindex:
lambda_cost
-----------
.. automodule:: paddle.v2.layer
:members: lambda_cost
:noindex:
rank_cost
---------
.. automodule:: paddle.v2.layer
:members: rank_cost
:noindex:
sum_cost
---------
.. automodule:: paddle.v2.layer
:members: sum_cost
:noindex:
crf
---
.. automodule:: paddle.v2.layer
:members: crf
:noindex:
crf_decoding
------------
.. automodule:: paddle.v2.layer
:members: crf_decoding
:noindex:
ctc
---
.. automodule:: paddle.v2.layer
:members: ctc
:noindex:
warp_ctc
--------
.. automodule:: paddle.v2.layer
:members: warp_ctc
:noindex:
nce
---
.. automodule:: paddle.v2.layer
:members: nce
:noindex:
hsigmoid
---------
.. automodule:: paddle.v2.layer
:members: hsigmoid
:noindex:
Check Layer
============
eos
---
.. automodule:: paddle.v2.layer
:members: eos
:noindex:
doc/api/v2/config/networks.rst 0 → 100644
浏览文件 @ fc6f2032
========
Networks
========
The v2.networks module contains pieces of neural network that combine multiple layers.
NLP
===
sequence_conv_pool
------------------
.. automodule:: paddle.v2.networks
:members: sequence_conv_pool
:noindex:
.. _api_trainer_config_helpers_network_text_conv_pool:
text_conv_pool
--------------
.. automodule:: paddle.v2.networks
:members: text_conv_pool
:noindex:
Images
======
img_conv_bn_pool
----------------
.. automodule:: paddle.v2.networks
:members: img_conv_bn_pool
:noindex:
img_conv_group
--------------
.. automodule:: paddle.v2.networks
:members: img_conv_group
:noindex:
.. _api_trainer_config_helpers_network_simple_img_conv_pool:
simple_img_conv_pool
--------------------
.. automodule:: paddle.v2.networks
:members: simple_img_conv_pool
:noindex:
vgg_16_network
---------------
.. automodule:: paddle.v2.networks
:members: vgg_16_network
:noindex:
Recurrent
=========
LSTM
----
lstmemory_unit
``````````````
.. automodule:: paddle.v2.networks
:members: lstmemory_unit
:noindex:
lstmemory_group
```````````````
.. automodule:: paddle.v2.networks
:members: lstmemory_group
:noindex:
simple_lstm
```````````
.. automodule:: paddle.v2.networks
:members: simple_lstm
:noindex:
bidirectional_lstm
``````````````````
.. automodule:: paddle.v2.networks
:members: bidirectional_lstm
:noindex:
GRU
---
gru_unit
````````
.. automodule:: paddle.v2.networks
:members: gru_unit
:noindex:
gru_group
`````````
.. automodule:: paddle.v2.networks
:members: gru_group
:noindex:
simple_gru
``````````
.. automodule:: paddle.v2.networks
:members: simple_gru
:noindex:
simple_attention
----------------
.. automodule:: paddle.v2.networks
:members: simple_attention
:noindex:
Miscs
=====
dropout_layer
--------------
.. automodule:: paddle.v2.networks
:members: dropout_layer
:noindex:
doc/api/v2/config/optimizer.rst 0 → 100644
浏览文件 @ fc6f2032
.. _api_v2.optimizer:
==========
Optimizer
==========
Momentum
========
.. automodule:: paddle.v2.optimizer
:members: Momentum
:noindex:
Adam
====
.. automodule:: paddle.v2.optimizer
:members: Adam
:noindex:
Adamax
======
.. automodule:: paddle.v2.optimizer
:members: Adamax
:noindex:
AdaGrad
=======
.. automodule:: paddle.v2.optimizer
:members: AdaGrad
:noindex:
DecayedAdaGrad
==============
.. automodule:: paddle.v2.optimizer
:members: DecayedAdaGrad
:noindex:
AdaDelta
========
.. automodule:: paddle.v2.optimizer
:members: AdaDelta
:noindex:
RMSProp
=======
.. automodule:: paddle.v2.optimizer
:members: RMSProp
:noindex:
doc/api/v2/config/pooling.rst 0 → 100644
浏览文件 @ fc6f2032
=======
Pooling
=======
BasePool
========
.. automodule:: paddle.v2.pooling
:members: BasePool
:noindex:
Avg
===
.. automodule:: paddle.v2.pooling
:members: Avg
:noindex:
Max
===
.. automodule:: paddle.v2.pooling
:members: Max
:noindex:
Sum
===
.. automodule:: paddle.v2.pooling
:members: Sum
:noindex:
SquareRootN
===========
.. automodule:: paddle.v2.pooling
:members: SquareRootN
:noindex:
CudnnAvg
========
.. automodule:: paddle.v2.pooling
:members: CudnnAvg
:noindex:
CudnnMax
========
.. automodule:: paddle.v2.pooling
:members: CudnnMax
:noindex:
doc/api/v2/data.rst
浏览文件 @ fc6f2032
================ ========
Data Related API Datasets
================ ========
#########
DataTypes DataTypes
######### =========
.. automodule:: paddle.v2.data_type .. automodule:: paddle.v2.data_type
:members: :members:
:noindex:
##########
DataFeeder DataFeeder
########## ==========
.. automodule:: paddle.v2.data_feeder .. automodule:: paddle.v2.data_feeder
:members: :members:
:noindex:
######
Reader Reader
###### ======
.. automodule:: paddle.v2.reader .. automodule:: paddle.v2.reader
:members: :members:
:noindex:
.. automodule:: paddle.v2.reader.creator .. automodule:: paddle.v2.reader.creator
:members: :members:
:noindex:
#########
minibatch minibatch
######### =========
.. automodule:: paddle.v2.minibatch .. automodule:: paddle.v2.minibatch
:members: :members:
:noindex:
#######
Dataset Dataset
####### =======
.. automodule:: paddle.v2.dataset .. automodule:: paddle.v2.dataset
:members: :members:
:noindex:
mnist mnist
+++++ +++++
.. automodule:: paddle.v2.dataset.mnist .. automodule:: paddle.v2.dataset.mnist
:members: :members:
:noindex:
cifar cifar
...@@ -54,40 +55,54 @@ cifar ...@@ -54,40 +55,54 @@ cifar
.. automodule:: paddle.v2.dataset.cifar .. automodule:: paddle.v2.dataset.cifar
:members: :members:
:noindex:
conll05 conll05
+++++++ +++++++
.. automodule:: paddle.v2.dataset.conll05 .. automodule:: paddle.v2.dataset.conll05
:members: :members:
:noindex:
imdb imdb
++++ ++++
.. automodule:: paddle.v2.dataset.imdb .. automodule:: paddle.v2.dataset.imdb
:members: :members:
:noindex:
imikolov imikolov
++++++++ ++++++++
.. automodule:: paddle.v2.dataset.imikolov .. automodule:: paddle.v2.dataset.imikolov
:members: :members:
:noindex:
movielens movielens
+++++++++ +++++++++
.. automodule:: paddle.v2.dataset.movielens .. automodule:: paddle.v2.dataset.movielens
:members: :members:
:noindex:
sentiment sentiment
+++++++++ +++++++++
.. automodule:: paddle.v2.dataset.sentiment .. automodule:: paddle.v2.dataset.sentiment
:members: :members:
:noindex:
uci_housing uci_housing
+++++++++++ +++++++++++
.. automodule:: paddle.v2.dataset.uci_housing .. automodule:: paddle.v2.dataset.uci_housing
:members: :members:
:noindex:
wmt14
+++++
.. automodule:: paddle.v2.dataset.uci_housing
:members:
:noindex:
doc/api/v2/model_configs.rst
浏览文件 @ fc6f2032
######################### Model Configuration
Configuration Related API ===================
#########################
.. toctree::
====== :maxdepth: 1
Layers
====== config/activation.rst
config/layer.rst
.. automodule:: paddle.v2.layer config/optimizer.rst
:members: config/pooling.rst
config/networks.rst
config/attr.rst
==========
Attributes
==========
.. automodule:: paddle.v2.attr
:members:
===========
Activations
===========
.. automodule:: paddle.v2.activation
:members:
========
Poolings
========
.. automodule:: paddle.v2.pooling
:members:
========
Networks
========
.. automodule:: paddle.v2.networks
:members:
==========
Optimizers
==========
.. automodule:: paddle.v2.optimizer
:members:
doc/api/v2/run_logic.rst
浏览文件 @ fc6f2032
########### ======================
Trainer API Training and Inference
########### ======================
==========
Parameters Parameters
========== ==========
.. automodule:: paddle.v2.parameters .. automodule:: paddle.v2.parameters
:members: :noindex:
=======
Trainer Trainer
======= =======
.. automodule:: paddle.v2.trainer .. automodule:: paddle.v2.trainer
:members: :noindex:
=====
Event Event
===== =====
.. automodule:: paddle.v2.event .. automodule:: paddle.v2.event
:members: :noindex:
=========
Inference Inference
========= =========
.. autofunction:: paddle.v2.infer .. autofunction:: paddle.v2.infer
:noindex:
doc/getstarted/build_and_install/docker_install_cn.rst
浏览文件 @ fc6f2032
安装PaddlePaddle的Docker镜像 PaddlePaddle的Docker容器使用方式
============================ ================================
PaddlePaddle项目提供官方 `Docker <https://www.docker.com/>`_ 镜像。Docker镜像是我们目前唯一官方支持的部署和运行方式。 PaddlePaddle目前唯一官方支持的运行的方式是Docker容器。因为Docker能在所有主要操作系统（包括Linux，Mac OS X和Windows）上运行。 请注意，您需要更改 `Dockers设置 <https://github.com/PaddlePaddle/Paddle/issues/627>`_ 才能充分利用Mac OS X和Windows上的硬件资源。
下述内容将分为如下几个类别描述。
* PaddlePaddle提供的Docker镜像版本 通过Docker容器开发PaddlePaddle
* 下载和运行Docker镜像 ------------------------------
* 注意事项
PaddlePaddle提供的Docker镜像版本 开发人员可以在Docker中开发PaddlePaddle。这样开发人员可以以一致的方式在不同的平台上工作 - Linux，Mac OS X和Windows。
--------------------------------
我们提供了12个 `Docker image <https://hub.docker.com/r/paddledev/paddle/tags/>`_ ，他们的image name都是 :code:`paddledev/paddle` ，tag分别为 1. 将开发环境构建为Docker镜像
+-----------------+------------------+------------------------+-----------------------+ .. code-block:: bash
| | normal | devel | demo |
+=================+==================+========================+=======================+
| CPU | cpu-latest | cpu-devel-latest | cpu-demo-latest |
+-----------------+------------------+------------------------+-----------------------+
| GPU | gpu-latest | gpu-devel-latest | gpu-demo-latest |
+-----------------+------------------+------------------------+-----------------------+
| CPU WITHOUT AVX | cpu-noavx-latest | cpu-noavx-devel-latest | cpu-noavx-demo-latest |
+-----------------+------------------+------------------------+-----------------------+
| GPU WITHOUT AVX | gpu-noavx-latest | gpu-noavx-devel-latest | gpu-noavx-demo-latest |
+-----------------+------------------+------------------------+-----------------------+
其中，横向包括三个版本，normal，devel和demo。 git clone --recursive https://github.com/PaddlePaddle/Paddle
cd Paddle
docker build -t paddle:dev -f paddle/scripts/docker/Dockerfile .
* Normal: 正常的Docker image，只包括paddle的二进制
* Devel: 包括Paddle的二进制、编译环境和源代码
* Demo: 包括Paddle运行demo所需要的依赖
纵向包括四个版本，他们是。 请注意，默认情况下，:code:`docker build` 不会将源码导入到镜像中并编译它。如果我们想这样做，需要设置一个参数：
* CPU: CPU版本。需要支持AVX指令集的CPU .. code-block:: bash
* GPU: GPU版本。需要支持AVX指令集的CPU
* CPU WITHOUT AVX: CPU版本，不支持AVX指令集的CPU也可以运行
* GPU WITHOUT AVX: GPU版本，不需要AVX指令集的CPU也可以运行。
用户可以选择对应版本的docker image。使用如下脚本可以确定本机的CPU是否支持 :code:`AVX` 指令集\: docker build -t paddle:dev -f paddle/scripts/docker/Dockerfile --build-arg BUILD_AND_INSTALL=ON .
.. code-block:: bash
if cat /proc/cpuinfo | grep -q avx ; then echo "Support AVX"; else echo "Not support AVX"; fi 2. 运行开发环境
当我们编译好了 :code:`paddle:dev`， 我们可以在docker容器里做开发，源代码可以通过挂载本地文件来被载入Docker的开发环境里面：
.. code-block:: bash
docker run -d -p 2202:22 -v $PWD:/paddle paddle:dev
以上代码会启动一个带有PaddlePaddle开发环境的docker容器，源代码会被挂载到 :code:`/paddle` 。
请注意， :code:`paddle:dev` 的默认入口是 :code:`sshd` 。以上的 :code:`docker run` 命令其实会启动一个在2202端口监听的SSHD服务器。这样，我们就能SSH进入我们的开发容器了：
.. code-block:: bash
ssh root@localhost -p 2202
3. 在Docker开发环境中编译与安装PaddlPaddle代码
当在容器里面的时候，可以用脚本 :code:`paddle/scripts/docker/build.sh` 来编译、安装与测试PaddlePaddle：
.. code-block:: bash
/paddle/paddle/scripts/docker/build.sh
以上指令会在 :code:`/paddle/build` 中编译PaddlePaddle。通过以下指令可以运行单元测试：
如果输出 :code:`Support AVX`，则可以选择上表中的AVX版本PaddlePaddle。否则需要选择非AVX的PaddlePaddle。选择普通CPU版本的devel版本的image，则可以使用 :code:`paddledev/paddle:cpu-devel-latest` 来引用这个image。 .. code-block:: bash
PaddlePaddle提供的镜像并不包含任何命令运行，想要运行PaddlePaddle，您需要进入镜像运行PaddlePaddle cd /paddle/build
程序或者自定义一个含有启动脚本的image。具体请参考注意事项中的 :code:`使用ssh访问PaddlePaddle镜像` ctest
下载和运行Docker镜像 4. 在Docker容器中运行PaddlePaddle书籍
--------------------
为了运行PaddlePaddle的docker镜像，您需要在机器中安装好Docker。安装Docker需要您的机器 Jupyter Notebook是一个开源的web程序，大家可以通过它制作和分享带有代码、公式、图表、文字的交互式文档。用户可以通过网页浏览文档。
至少具有3.10以上的linux kernel。安装方法请参考
`Docker的官方文档 <https://docs.docker.com/engine/installation/>`_ 。如果您使用
mac osx或者是windows机器，请参考
`mac osx的安装文档 <https://docs.docker.com/engine/installation/mac/>`_ 和
`windows 的安装文档 <https://docs.docker.com/engine/installation/windows/>`_ 。
您可以使用 :code:`docker pull` 命令预先下载镜像，也可以直接执行 PaddlePaddle书籍是为用户和开发者制作的一个交互式的Jupyter Nodebook。
:code:`docker run` 命令运行镜像。执行方法如下: 如果您想要更深入了解deep learning，PaddlePaddle书籍一定是您最好的选择。
当您进入容器内之后，只用运行以下命令：
.. code-block:: bash
jupyter notebook
然后在浏览器中输入以下网址：
.. code-block:: text
http://localhost:8888/
就这么简单，享受您的旅程！
纯CPU和GPU的docker镜像
----------------------
对于每一个PaddlePaddle版本，我们都会发布两个Docker镜像：纯CPU的和GPU的。我们通过设置 `dockerhub.com <https://hub.docker.com/r/paddledev/paddle/>`_ 自动运行以下两个命令：
.. code-block:: bash .. code-block:: bash
$ docker run -it paddledev/paddle:cpu-latest docker build -t paddle:cpu -f paddle/scripts/docker/Dockerfile --build-arg BUILD_AND_INSTALL=ON .
docker build -t paddle:gpu -f paddle/scripts/docker/Dockerfile.gpu --build-arg BUILD_AND_INSTALL=ON .
即可启动和进入PaddlePaddle的container。如果运行GPU版本的PaddlePaddle，则需要先将 以交互容器方式运行纯CPU的镜像：
cuda相关的Driver和设备映射进container中，脚本类似于
.. code-block:: bash .. code-block:: bash
$ export CUDA_SO="$(\ls /usr/lib64/libcuda* | xargs -I{} echo '-v {}:{}') $(\ls /usr/lib64/libnvidia* | xargs -I{} echo '-v {}:{}')" docker run -it --rm paddledev/paddle:0.10.0rc1-cpu /bin/bash
$ export DEVICES=$(\ls /dev/nvidia* | xargs -I{} echo '--device {}:{}')
$ docker run ${CUDA_SO} ${DEVICES} -it paddledev/paddle:gpu-latest
进入Docker container后，运行 :code:`paddle version` 即可打印出PaddlePaddle的版本和构建 或者，可以以后台进程方式运行容器：
信息。安装完成的PaddlePaddle主体包括三个部分， :code:`paddle` 脚本， python的
:code:`paddle` 包和 :code:`py_paddle` 包。其中\:
* :code:`paddle` 脚本和 :code:`paddle` 的python包是PaddlePaddle的训练主要程序。使用 .. code-block:: bash
:code:`paddle` 脚本可以启动PaddlePaddle的训练进程和pserver。而 :code:`paddle` 脚本
中的二进制使用了 :code:`paddle` 的python包来做配置文件解析等工作。
* python包 :code:`py_paddle` 是一个swig封装的PaddlePaddle包，用来做预测和简单的定制化
训练。
注意事项 docker run -d -p 2202:22 paddledev/paddle:0.10.0rc1-cpu
--------
性能问题 然后用密码 :code:`root` SSH进入容器：
++++++++
由于Docker是基于容器的轻量化虚拟方案，所以在CPU的运算性能上并不会有严重的影响。 .. code-block:: bash
而GPU的驱动和设备全部映射到了容器内，所以GPU在运算性能上也不会有严重的影响。
但是如果使用了高性能的网卡，例如RDMA网卡(RoCE 40GbE 或者 IB 56GbE)，或者高性能的 ssh -p 2202 root@localhost
以太网卡 (10GbE)。推荐使用将本地网卡，即 "--net=host" 来进行训练。而不使用docker
的网桥来进行网络通信。
远程访问问题和二次开发 SSH方式的一个优点是我们可以从多个终端进入容器。比如，一个终端运行vi，另一个终端运行Python。另一个好处是我们可以把PaddlePaddle容器运行在远程服务器上，并在笔记本上通过SSH与其连接。
++++++++++++++++++++++
由于PaddlePaddle的Docker镜像并不包含任何预定义的运行命令。所以如果想要在后台启用ssh
远程访问，则需要进行一定的二次开发，将ssh装入系统内并开启远程访问。二次开发可以
使用Dockerfile构建一个全新的docker image。需要参考
`Dockerfile的文档 <https://docs.docker.com/engine/reference/builder/>`_ 和
`Dockerfile的最佳实践 <https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/>`_
两个文档。
简单的含有ssh的Dockerfile如下： 以上方法在GPU镜像里也能用－只是请不要忘记按装CUDA驱动，以及告诉Docker：
.. code-block:: bash .. code-block:: bash
FROM paddledev/paddle:cpu-latest export CUDA_SO="$(\ls /usr/lib64/libcuda* | xargs -I{} echo '-v {}:{}') $(\ls /usr/lib64/libnvidia* | xargs -I{} echo '-v {}:{}')"
export DEVICES=$(\ls /dev/nvidia* | xargs -I{} echo '--device {}:{}')
docker run ${CUDA_SO} ${DEVICES} -it paddledev/paddle:0.10.0rc1-gpu
MAINTAINER PaddlePaddle dev team <paddle-dev@baidu.com>
RUN apt-get update 非AVX镜像
RUN apt-get install -y openssh-server ---------
RUN mkdir /var/run/sshd
RUN echo 'root:root' | chpasswd
RUN sed -ri 's/^PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config 纯CPU镜像以及GPU镜像都会用到AVX指令集，但是2008年之前生产的旧电脑不支持AVX。以下指令能检查Linux电脑是否支持AVX：
RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"] .. code-block:: bash
if cat /proc/cpuinfo | grep -i avx; then echo Yes; else echo No; fi
使用该Dockerfile构建出镜像，然后运行这个container即可。相关命令为\: 如果输出是No，我们就需要手动编译一个非AVX版本的镜像：
.. code-block:: bash .. code-block:: bash
# cd到含有Dockerfile的路径中 cd ~
$ docker build . -t paddle_ssh git clone https://github.com/PaddlePaddle/Paddle.git
# 运行这个container，将宿主机的8022端口映射到container的22端口上 cd Paddle
$ docker run -d -p 8022:22 --name paddle_ssh_machine paddle_ssh docker build --build-arg WITH_AVX=OFF -t paddle:cpu-noavx -f paddle/scripts/docker/Dockerfile .
docker build --build-arg WITH_AVX=OFF -t paddle:gpu-noavx -f paddle/scripts/docker/Dockerfile.gpu .
执行如下命令即可以关闭这个container，并且删除container中的数据\:
.. code-block:: bash 文档
----
# 关闭container Paddle的Docker镜像带有一个通过 `woboq code browser
$ docker stop paddle_ssh_machine <https://github.com/woboq/woboq_codebrowser>`_ 生成的HTML版本的C++源代码，便于用户浏览C++源码。
# 删除container
$ docker rm paddle_ssh_machine
如果想要在外部机器访问这个container，即可以使用ssh访问宿主机的8022端口。用户名为 只要在Docker里启动PaddlePaddle的时候给它一个名字，就可以再运行另一个Nginx Docker镜像来服务HTML代码：
root，密码也是root。命令为\:
.. code-block:: bash .. code-block:: bash
$ ssh -p 8022 root@YOUR_HOST_MACHINE docker run -d --name paddle-cpu-doc paddle:0.10.0rc1-cpu
docker run -d --volumes-from paddle-cpu-doc -p 8088:80 nginx
至此，您就可以远程的使用PaddlePaddle啦。 接着我们就能够打开浏览器在 http://localhost:8088/paddle/ 浏览代码。
doc/getstarted/build_and_install/docker_install_en.rst
浏览文件 @ fc6f2032
...@@ -42,7 +42,7 @@ Windows -- in a consistent way. ...@@ -42,7 +42,7 @@ Windows -- in a consistent way.
.. code-block:: bash .. code-block:: bash
docker run -d -p 2202:22 -v $PWD:/paddle paddle:dev docker run -d -p 2202:22 -p 8888:8888 -v $PWD:/paddle paddle:dev
This runs a container of the development environment Docker image This runs a container of the development environment Docker image
with the local source tree mounted to :code:`/paddle` of the with the local source tree mounted to :code:`/paddle` of the
...@@ -82,6 +82,29 @@ Windows -- in a consistent way. ...@@ -82,6 +82,29 @@ Windows -- in a consistent way.
cd /paddle/build cd /paddle/build
ctest ctest
4. Run PaddlePaddle Book under Docker Container
The Jupyter Notebook is an open-source web application that allows
you to create and share documents that contain live code, equations,
visualizations and explanatory text in a single browser.
PaddlePaddle Book is an interactive Jupyter Notebook for users and developers.
We already exposed port 8888 for this book. If you want to
dig deeper into deep learning, PaddlePaddle Book definitely is your best choice.
Once you are inside the container, simply issue the command:
.. code-block:: bash
jupyter notebook
Then, you would back and paste the address into the local browser:
.. code-block:: text
http://localhost:8888/
That's all. Enjoy your journey!
CPU-only and GPU Images CPU-only and GPU Images
----------------------- -----------------------
...@@ -93,21 +116,21 @@ automatically runs the following commands: ...@@ -93,21 +116,21 @@ automatically runs the following commands:
.. code-block:: bash .. code-block:: bash
docker build -t paddle:cpu -f paddle/scripts/docker/Dockerfile . docker build -t paddle:cpu -f paddle/scripts/docker/Dockerfile --build-arg BUILD_AND_INSTALL=ON .
docker build -t paddle:gpu -f paddle/scripts/docker/Dockerfile.gpu . docker build -t paddle:gpu -f paddle/scripts/docker/Dockerfile.gpu --build-arg BUILD_AND_INSTALL=ON .
To run the CPU-only image as an interactive container: To run the CPU-only image as an interactive container:
.. code-block:: bash .. code-block:: bash
docker run -it --rm paddledev/paddle:cpu-latest /bin/bash docker run -it --rm paddledev/paddle:0.10.0rc1-cpu /bin/bash
or, we can run it as a daemon container or, we can run it as a daemon container
.. code-block:: bash .. code-block:: bash
docker run -d -p 2202:22 paddledev/paddle:cpu-latest docker run -d -p 2202:22 paddledev/paddle:0.10.0rc1-cpu
and SSH to this container using password :code:`root`: and SSH to this container using password :code:`root`:
...@@ -129,7 +152,7 @@ to install CUDA driver and let Docker knows about it: ...@@ -129,7 +152,7 @@ to install CUDA driver and let Docker knows about it:
export CUDA_SO="$(\ls /usr/lib64/libcuda* | xargs -I{} echo '-v {}:{}') $(\ls /usr/lib64/libnvidia* | xargs -I{} echo '-v {}:{}')" export CUDA_SO="$(\ls /usr/lib64/libcuda* | xargs -I{} echo '-v {}:{}') $(\ls /usr/lib64/libnvidia* | xargs -I{} echo '-v {}:{}')"
export DEVICES=$(\ls /dev/nvidia* | xargs -I{} echo '--device {}:{}') export DEVICES=$(\ls /dev/nvidia* | xargs -I{} echo '--device {}:{}')
docker run ${CUDA_SO} ${DEVICES} -it paddledev/paddle:gpu-latest docker run ${CUDA_SO} ${DEVICES} -it paddledev/paddle:0.10.0rc1-gpu
Non-AVX Images Non-AVX Images
...@@ -171,7 +194,7 @@ container: ...@@ -171,7 +194,7 @@ container:
.. code-block:: bash .. code-block:: bash
docker run -d --name paddle-cpu-doc paddle:cpu docker run -d --name paddle-cpu-doc paddle:0.10.0rc1-cpu
docker run -d --volumes-from paddle-cpu-doc -p 8088:80 nginx docker run -d --volumes-from paddle-cpu-doc -p 8088:80 nginx
......
doc_theme/static/css/override.css
浏览文件 @ fc6f2032
* {
font-family:"Roboto","Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;
}
body { body {
padding-top: 80px; padding-top: 80px;
background-image: none !important; background-image: none !important;
......
paddle/scripts/docker/Dockerfile
浏览文件 @ fc6f2032
...@@ -18,6 +18,7 @@ ENV WITH_GPU=OFF ...@@ -18,6 +18,7 @@ ENV WITH_GPU=OFF
ENV WITH_AVX=${WITH_AVX:-ON} ENV WITH_AVX=${WITH_AVX:-ON}
ENV WITH_DOC=${WITH_DOC:-OFF} ENV WITH_DOC=${WITH_DOC:-OFF}
ENV WITH_STYLE_CHECK=${WITH_STYLE_CHECK:-OFF} ENV WITH_STYLE_CHECK=${WITH_STYLE_CHECK:-OFF}
ENV DOCKER_BUILD=TRUE
ENV HOME /root ENV HOME /root
...@@ -50,7 +51,9 @@ RUN curl -sSL https://cmake.org/files/v3.4/cmake-3.4.1.tar.gz | tar -xz && \ ...@@ -50,7 +51,9 @@ RUN curl -sSL https://cmake.org/files/v3.4/cmake-3.4.1.tar.gz | tar -xz && \
cd .. && rm -rf cmake-3.4.1 cd .. && rm -rf cmake-3.4.1
COPY . /paddle/ COPY . /paddle/
RUN cd /paddle/ && git submodule update --init --recursive
RUN /paddle/paddle/scripts/docker/build.sh RUN /paddle/paddle/scripts/docker/build.sh
VOLUME ["/usr/share/nginx/html/data", "/usr/share/nginx/html/paddle"] VOLUME ["/usr/share/nginx/html/data", "/usr/share/nginx/html/paddle"]
# Configure OpenSSH server. c.f. https://docs.docker.com/engine/examples/running_ssh_service # Configure OpenSSH server. c.f. https://docs.docker.com/engine/examples/running_ssh_service
...@@ -60,9 +63,7 @@ RUN sed -ri 's/^PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config ...@@ -60,9 +63,7 @@ RUN sed -ri 's/^PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config
RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config
EXPOSE 22 EXPOSE 22
# Jupyter Notebook directory. # Jupyter Notebook: Paddle book
RUN mkdir /notes/
WORKDIR "/notes"
EXPOSE 8888 EXPOSE 8888
COPY ./paddle/scripts/docker/entrypoint /opt/bin/ COPY ./paddle/scripts/docker/entrypoint /opt/bin/
......
paddle/scripts/docker/Dockerfile.gpu
浏览文件 @ fc6f2032
...@@ -18,6 +18,7 @@ ENV WITH_GPU=ON ...@@ -18,6 +18,7 @@ ENV WITH_GPU=ON
ENV WITH_AVX=${WITH_AVX:-ON} ENV WITH_AVX=${WITH_AVX:-ON}
ENV WITH_DOC=${WITH_DOC:-OFF} ENV WITH_DOC=${WITH_DOC:-OFF}
ENV WITH_STYLE_CHECK=${WITH_STYLE_CHECK:-OFF} ENV WITH_STYLE_CHECK=${WITH_STYLE_CHECK:-OFF}
ENV DOCKER_BUILD=TRUE
ENV HOME /root ENV HOME /root
...@@ -50,7 +51,9 @@ RUN curl -sSL https://cmake.org/files/v3.4/cmake-3.4.1.tar.gz | tar -xz && \ ...@@ -50,7 +51,9 @@ RUN curl -sSL https://cmake.org/files/v3.4/cmake-3.4.1.tar.gz | tar -xz && \
cd .. && rm -rf cmake-3.4.1 cd .. && rm -rf cmake-3.4.1
COPY . /paddle/ COPY . /paddle/
RUN cd /paddle/ && git submodule update --init --recursive
RUN /paddle/paddle/scripts/docker/build.sh RUN /paddle/paddle/scripts/docker/build.sh
VOLUME ["/usr/share/nginx/html/data", "/usr/share/nginx/html/paddle"] VOLUME ["/usr/share/nginx/html/data", "/usr/share/nginx/html/paddle"]
# Configure OpenSSH server. c.f. https://docs.docker.com/engine/examples/running_ssh_service # Configure OpenSSH server. c.f. https://docs.docker.com/engine/examples/running_ssh_service
...@@ -60,9 +63,7 @@ RUN sed -ri 's/^PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config ...@@ -60,9 +63,7 @@ RUN sed -ri 's/^PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config
RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config
EXPOSE 22 EXPOSE 22
# Jupyter Notebook directory. # Jupyter Notebook: Paddle book
RUN mkdir /notes/
WORKDIR "/notes"
EXPOSE 8888 EXPOSE 8888
COPY ./paddle/scripts/docker/entrypoint /opt/bin/ COPY ./paddle/scripts/docker/entrypoint /opt/bin/
......
paddle/scripts/docker/build.sh
浏览文件 @ fc6f2032
...@@ -17,7 +17,8 @@ if [[ ${BUILD_AND_INSTALL:-OFF} == 'ON' ]]; then ...@@ -17,7 +17,8 @@ if [[ ${BUILD_AND_INSTALL:-OFF} == 'ON' ]]; then
fi fi
mkdir -p /paddle/build # -p means no error if exists mkdir -p /paddle/build # -p means no error if exists
cd /paddle/build # clean local cmake and third_party cache
cd /paddle/build && rm -rf * && rm -rf ../third_party
cmake .. \ cmake .. \
-DWITH_DOC=${WITH_DOC:-OFF} \ -DWITH_DOC=${WITH_DOC:-OFF} \
-DWITH_GPU=${WITH_GPU:-OFF} \ -DWITH_GPU=${WITH_GPU:-OFF} \
...@@ -56,6 +57,12 @@ if [[ ${BUILD_AND_INSTALL:-OFF} == 'ON' ]]; then ...@@ -56,6 +57,12 @@ if [[ ${BUILD_AND_INSTALL:-OFF} == 'ON' ]]; then
pip install /usr/local/opt/paddle/share/wheels/py_paddle*linux*.whl pip install /usr/local/opt/paddle/share/wheels/py_paddle*linux*.whl
pip install /usr/local/opt/paddle/share/wheels/paddle*.whl pip install /usr/local/opt/paddle/share/wheels/paddle*.whl
paddle version paddle version
if [[ ${DOCKER_BUILD:-FALSE} == 'TRUE' ]]; then
# reduce docker image size
rm -rf /paddle/build
rm -rf /usr/local/opt/paddle/share/wheels/
fi
fi fi
trap : 0 trap : 0
paddle/scripts/docker/entrypoint
浏览文件 @ fc6f2032
#!/bin/bash #!/bin/bash
LOG=/var/log/all
touch $LOG /usr/sbin/sshd -D &
jupyter notebook --ip=0.0.0.0 /paddle/book/
/usr/sbin/sshd -D >> $LOG &
jupyter notebook --ip=0.0.0.0 /notes/ >> $LOG &
tail -f $LOG
python/paddle/v2/inference.py
浏览文件 @ fc6f2032
...@@ -9,8 +9,8 @@ __all__ = ['infer'] ...@@ -9,8 +9,8 @@ __all__ = ['infer']
class Inference(object): class Inference(object):
def __init__(self, output, parameters): def __init__(self, output_layer, parameters):
topo = topology.Topology(output) topo = topology.Topology(output_layer)
gm = api.GradientMachine.createFromConfigProto( gm = api.GradientMachine.createFromConfigProto(
topo.proto(), api.CREATE_MODE_TESTING, [api.PARAMETER_VALUE]) topo.proto(), api.CREATE_MODE_TESTING, [api.PARAMETER_VALUE])
for param in gm.getParameters(): for param in gm.getParameters():
...@@ -21,33 +21,16 @@ class Inference(object): ...@@ -21,33 +21,16 @@ class Inference(object):
self.__gradient_machine__ = gm self.__gradient_machine__ = gm
self.__data_types__ = topo.data_type() self.__data_types__ = topo.data_type()
def iter_infer(self, input=None, batch_size=None, reader=None, def iter_infer(self, input, feeding=None):
feeding=None):
feeder = DataFeeder(self.__data_types__, feeding) feeder = DataFeeder(self.__data_types__, feeding)
if reader is None:
assert input is not None and isinstance(input, collections.Iterable)
if not isinstance(input, collections.Iterable):
raise TypeError("When reader is None, input should be whole "
"inference data and should be iterable")
if batch_size is None:
if not hasattr(input, '__len__'):
raise ValueError("Should set batch size when input data "
"don't contain length.")
batch_size = len(input) batch_size = len(input)
def __reader_impl__(): def __reader_impl__():
for each_sample in input: for each_sample in input:
if len(feeder) == 1:
yield [each_sample]
else:
yield each_sample yield each_sample
reader = minibatch.batch(__reader_impl__, batch_size=batch_size) reader = minibatch.batch(__reader_impl__, batch_size=batch_size)
else:
if input is not None:
raise ValueError("User should set either input or reader, "
"should not set them both.")
self.__gradient_machine__.start() self.__gradient_machine__.start()
for data_batch in reader(): for data_batch in reader():
yield self.__gradient_machine__.forwardTest(feeder(data_batch)) yield self.__gradient_machine__.forwardTest(feeder(data_batch))
...@@ -71,13 +54,7 @@ class Inference(object): ...@@ -71,13 +54,7 @@ class Inference(object):
return retv return retv
def infer(output, def infer(output_layer, parameters, input, feeding=None, field='value'):
parameters,
input=None,
batch_size=None,
reader=None,
feeding=None,
field='value'):
""" """
Infer a neural network by given neural network output and parameters. The Infer a neural network by given neural network output and parameters. The
user should pass either a batch of input data or reader method. user should pass either a batch of input data or reader method.
...@@ -90,19 +67,13 @@ def infer(output, ...@@ -90,19 +67,13 @@ def infer(output,
batch_size=32) batch_size=32)
print result print result
:param output: output of the neural network that would be inferred :param output_layer: output of the neural network that would be inferred
:type output: paddle.v2.config_base.Layer :type output_layer: paddle.v2.config_base.Layer
:param parameters: parameters of the neural network. :param parameters: parameters of the neural network.
:type parameters: paddle.v2.parameters.Parameters :type parameters: paddle.v2.parameters.Parameters
:param input: input data batch. Should be a python iterable object, and each :param input: input data batch. Should be a python iterable object, and each
element is the data batch. element is the data batch.
:type input: collections.Iterable :type input: collections.Iterable
:param batch_size: the batch size when perform inference. Default is the
length of input.
:type batch_size: int
:param reader: input data reader creator in batch. If this field is set, the
`input` and `batch_size` will be ignored.
:type reader: callable
:param feeding: Reader dictionary. Default could generate from input :param feeding: Reader dictionary. Default could generate from input
value. value.
:param field: The prediction field. It should in [`value`, `ids`]. `value` :param field: The prediction field. It should in [`value`, `ids`]. `value`
...@@ -113,10 +84,5 @@ def infer(output, ...@@ -113,10 +84,5 @@ def infer(output,
:rtype: numpy.ndarray :rtype: numpy.ndarray
""" """
inferer = Inference(output=output, parameters=parameters) inferer = Inference(output_layer=output_layer, parameters=parameters)
return inferer.infer( return inferer.infer(field=field, input=input, feeding=feeding)
field=field,
input=input,
batch_size=batch_size,
reader=reader,
feeding=feeding)
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或