fix ModuleList ModuleDict and paddle dtype

Author: hanjr92

tensorlayerx/backend/ops/paddle_backend.py

@@ -2,33 +2,49 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import absolute_import, division, print_function
+
+import paddle
 import paddle as pd
 import paddle.nn as nn
 import numpy as np
 import paddle.nn.functional as F
 from .paddle_nn import nchw_to_nhwc, nhwc_to_nchw, preprocess_2d_format, preprocess_1d_format, preprocess_3d_format
 import random
 
-_dtypeDict = [
-    "float16", "float32", "float64", "int8", "int16", "int32", "int64", "uint8", "uint16", "uint32", "uint64", "bool",
-    "complex64", "complex128"
-]
+
+_dtypeDict = {
+    'DType': paddle.dtype,
+    'float16': paddle.float16,
+    'float32': paddle.float32,
+    'float64': paddle.float64,
+    'int8': paddle.int8,
+    'int16': paddle.int16,
+    'int32': paddle.int32,
+    'int64': paddle.int64,
+    'uint8': paddle.uint8,
+    'uint16': None,
+    'uint32': None,
+    'uint64': None,
+    'bool': paddle.bool,
+    'complex64': paddle.complex64,
+    'complex128': paddle.complex128
+}
 # TODO NotImplemented
-DType = None
-float16 = "float16"
-float32 = "float32"
-float64 = "float64"
-int8 = "int8"
-int16 = "int16"
-int32 = "int32"
-int64 = "int64"
-uint8 = "uint8"
-uint16 = "uint16"
-uint32 = "uint32"
-uint64 = "uint64"
-bool = "bool"
-complex64 = "complex64"
-complex128 = "complex128"
+DType = paddle.dtype
+float16 = paddle.float16
+float32 = paddle.float32
+float64 = paddle.float64
+int8 = paddle.int8
+int16 = paddle.int16
+int32 = paddle.int32
+int64 = paddle.int64
+uint8 = paddle.uint8
+uint16 = None
+uint32 = None
+uint64 = None
+bool = paddle.bool
+complex64 = paddle.complex64
+complex128 = paddle.complex128
 
 
 def _getter(init_fn, **kwargs):

tensorlayerx/nn/core/core_mindspore.py

@@ -477,9 +477,10 @@ class ModuleList(Module):
     >>> layer_list.append(d3)
     """
 
-    def __init__(self, args):
-        Module.__init__(self)
-        self.extend(args)
+    def __init__(self, modules = None):
+        super(ModuleList, self).__init__()
+        if modules is not None:
+            self.extend(modules)
 
     def __getitem__(self, index):
         if isinstance(index, slice):
@@ -554,9 +555,10 @@ def forward(self, *inputs):
 
 class ModuleDict(Module):
 
-    def __init__(self, modules):
+    def __init__(self, modules = None):
         super(ModuleDict, self).__init__()
-        self.update(modules)
+        if modules is not None:
+            self.update(modules)
 
     def __getitem__(self, key):
 

tensorlayerx/nn/core/core_paddle.py

@@ -416,10 +416,10 @@ def forward(self, input_data):
 
 class ModuleList(Module):
 
-    def __init__(self, args):
+    def __init__(self, modules = None):
         super(ModuleList, self).__init__()
-        if args is not None:
-            self.extend(args)
+        if modules is not None:
+            self.extend(modules)
 
     def __getitem__(self, index):
         if isinstance(index, slice):
@@ -501,9 +501,10 @@ def forward(self, *inputs):
 
 class ModuleDict(Module):
 
-    def __init__(self, modules):
+    def __init__(self, modules = None):
         super(ModuleDict, self).__init__()
-        self.update(modules)
+        if modules is not None:
+            self.update(modules)
 
     def __getitem__(self, key):
 

tensorlayerx/nn/core/core_tensorflow.py

@@ -759,9 +759,10 @@ class ModuleList(Module):
     >>> layer_list.append(d3)
     """
 
-    def __init__(self, args):
+    def __init__(self, modules = None):
         super(ModuleList, self).__init__()
-        self.extend(args)
+        if modules is not None:
+            self.extend(modules)
 
     def __getitem__(self, index):
         if isinstance(index, slice):
@@ -890,9 +891,10 @@ class ModuleDict(Module):
 
     """
 
-    def __init__(self, modules):
+    def __init__(self, modules = None):
         super(ModuleDict, self).__init__()
-        self.update(modules)
+        if modules is not None:
+            self.update(modules)
 
     def __getitem__(self, key):
 

tensorlayerx/nn/core/core_torch.py

@@ -375,9 +375,10 @@ class ModuleList(Module):
     >>> layer_list.append(d3)
     """
 
-    def __init__(self, args):
+    def __init__(self, modules = None):
         super(ModuleList, self).__init__()
-        self.extend(args)
+        if modules is not None:
+            self.extend(modules)
 
     def __getitem__(self, index):
         if isinstance(index, slice):
@@ -459,9 +460,10 @@ def forward(self, *inputs):
 
 class ModuleDict(Module):
 
-    def __init__(self, modules):
+    def __init__(self, modules = None):
         super(ModuleDict, self).__init__()
-        self.update(modules)
+        if modules is not None:
+            self.update(modules)
 
     def __getitem__(self, key):