Add pooling deprecated (#7)

Author: Laicheng0830

examples/model_zoo/resnet.py

@@ -14,7 +14,7 @@
 
 from tensorlayerx import logging
 from tensorlayerx.files import (maybe_download_and_extract)
-from tensorlayerx.nn import (BatchNorm, Conv2d, Linear, Elementwise, GlobalMeanPool2d, MaxPool2d)
+from tensorlayerx.nn import (BatchNorm, Conv2d, Linear, Elementwise, GlobalAvgPool2d, MaxPool2d)
 from tensorlayerx.nn import Module, Sequential
 
 __all__ = [
@@ -159,7 +159,7 @@ def make_layer(self):
                 else:
                     layer_list.append(identity_block(3, block_filters[stage - 2], stage=stage, block=block))
             elif block_name == 'avg_pool':
-                layer_list.append(GlobalMeanPool2d(name='avg_pool'))
+                layer_list.append(GlobalAvgPool2d(name='avg_pool'))
             elif block_name == 'fc1000':
                 layer_list.append(Linear(self.n_classes, name='fc1000', in_features=2048))
 

tensorlayerx/nn/layers/deprecated.py

@@ -477,3 +477,34 @@ def DeConv2d(*args, **kwargs):
 
 def DeConv3d(*args, **kwargs):
     raise NonExistingLayerError("DeConv3d --> ConvTranspose3d" + __log__)
+
+
+def MeanPool1d(*args, **kwargs):
+    raise NonExistingLayerError("MeanPool1d --> AvgPool1d" + __log__)
+
+def MeanPool2d(*args, **kwargs):
+    raise NonExistingLayerError("MeanPool2d --> AvgPool2d" + __log__)
+
+def MeanPool3d(*args, **kwargs):
+    raise NonExistingLayerError("MeanPool3d --> AvgPool3d" + __log__)
+
+def GlobalMeanPool1d(*args, **kwargs):
+    raise NonExistingLayerError("GlobalMeanPool1d --> GlobalAvgPool1d" + __log__)
+
+def GlobalMeanPool2d(*args, **kwargs):
+    raise NonExistingLayerError("GlobalMeanPool2d --> GlobalAvgPool2d" + __log__)
+
+def GlobalMeanPool3d(*args, **kwargs):
+    raise NonExistingLayerError("GlobalMeanPool3d --> GlobalAvgPool3d" + __log__)
+
+def AdaptiveMeanPool1d(*args, **kwargs):
+    raise NonExistingLayerError("AdaptiveMeanPool1d --> AdaptiveAvgPool1d" + __log__)
+
+def AdaptiveMeanPool2d(*args, **kwargs):
+    raise NonExistingLayerError("AdaptiveMeanPool2d --> AdaptiveAvgPool2d" + __log__)
+
+def AdaptiveMeanPool3d(*args, **kwargs):
+    raise NonExistingLayerError("AdaptiveMeanPool3d --> AdaptiveAvgPool3d" + __log__)
+
+__all__ += ['MeanPool1d', 'MeanPool2d', 'MeanPool3d', 'GlobalMeanPool1d', 'GlobalMeanPool2d', 'GlobalMeanPool3d',
+            'AdaptiveMeanPool1d', 'AdaptiveMeanPool2d', 'AdaptiveMeanPool3d']