Merge branch 'windows/build' into windows/online

test=develop
6 years ago · 677687a6ac
parent abc2f8ee15 e768c370e8
commit 677687a6ac
1 changed files with 3 additions and 0 deletions
--- a/python/paddle/fluid/layers/nn.py
+++ b/python/paddle/fluid/layers/nn.py
@ -33,10 +33,12 @@ from .. import core
 __all__ = [
    'fc',
    'embedding',
+    'dynamic_lstm',
    'dynamic_lstmp',
    'dynamic_gru',
    'gru_unit',
    'linear_chain_crf',
+    'crf_decoding',
    'cos_sim',
    'cross_entropy',
    'square_error_cost',
@ -95,6 +97,7 @@ __all__ = [
    'pad',
    'pad_constant_like',
    'label_smooth',
+    'roi_pool',
    'roi_align',
    'dice_loss',
    'image_resize',