Merge branch 'master' into 'master'

Use T to determine output type first

See merge request !820

mace/python/tools/memory_optimizer.py

@@ -154,6 +154,9 @@ class MemoryOptimizer(object):
                     mem_id = self.op_mem.get(op.input[0], -1)
                 else:
                     output_type = mace_pb2.DT_FLOAT
+                    for arg in op.arg:
+                        if arg.name == 'T':
+                            output_type = arg.i
                     if len(op.output_type) > i:
                         output_type = op.output_type[i]
                     op_mem_block = self.get_op_mem_block(