Merge pull request #2649 from t13m/issue2606

theano/gof/link.py

@@ -172,27 +172,69 @@ def raise_with_op(node, thunk=None, exc_info=None, storage_map=None):
         # Prints output_map
         if storage_map is not None:
             detailed_err_msg += "\nStorage map footprint:\n"
+            shared_input_list = [
+                item for item in node.fgraph.inputs
+                if isinstance(item, theano.compile.SharedVariable)]
+            nonshared_input_list = [
+                item for item in node.fgraph.inputs
+                if not isinstance(item, theano.compile.SharedVariable)]
+            storage_map_list = []
             for k in storage_map.keys():
-                if storage_map[k][0] is not None:
-                    detailed_err_msg += " - " + str(k) + ", "
-                    shapeinfo = None
-                    if hasattr(storage_map[k][0], 'shape'):
-                        shapeinfo = storage_map[k][0].shape
-                        if len(shapeinfo) != 0:
-                            detailed_err_msg += "Shape: %s, " % str(shapeinfo)
-                        else:
-                            detailed_err_msg += "Shape: (1,), "
-                    if hasattr(storage_map[k][0], 'dtype'):
-                        dtype = storage_map[k][0].dtype
-                        detailed_err_msg += "ElemSize: %s Byte(s)" % numpy.dtype(dtype).itemsize
-                        if shapeinfo is None:
-                            detailed_err_msg += "\n"
-                        else:
-                            detailed_err_msg += ", TotalSize: %s Byte(s)\n" % (numpy.dtype(dtype).itemsize * numpy.prod(shapeinfo))
-                    else:
-                        bytes = getsizeof(storage_map[k][0])
-                        detailed_err_msg += "ElemSize: %s Byte(s)\n" % str(bytes)
+                storage_map_item = []
 
+                # storage_map_item[0]
+                storage_map_item.append(str(k))
+
+                # storage_map_item[1]
+                shapeinfo = None
+                if hasattr(storage_map[k][0], 'shape'):
+                    shapeinfo = storage_map[k][0].shape
+                    if len(shapeinfo) != 0:
+                        storage_map_item.append(shapeinfo)
+                    else:
+                        storage_map_item.append(tuple())
+                else:
+                    storage_map_item.append(None)
+
+                # storage_map_item[2]
+                # storage_map_item[3]
+                if hasattr(storage_map[k][0], 'dtype'):
+                    dtype = storage_map[k][0].dtype
+                    storage_map_item.append(numpy.dtype(dtype).itemsize)
+                    if shapeinfo is None:
+                        storage_map_item.append(None)
+                    else:
+                        storage_map_item.append(numpy.dtype(dtype).itemsize * numpy.prod(shapeinfo))
+                else:
+                    bytes = getsizeof(storage_map[k][0])
+                    storage_map_item.append(bytes)
+                    storage_map_item.append(None)
+
+                # Flag of shared val
+                # storage_map_item[4]
+                if k in shared_input_list:
+                    storage_map_item.append(True)
+                elif k in nonshared_input_list:
+                    storage_map_item.append(False)
+                else:
+                    storage_map_item.append(None)
+                storage_map_list.append(storage_map_item)
+
+            from operator import itemgetter
+            storage_map_list.sort(key=itemgetter(3), reverse=True)
+            for storage_map_item in storage_map_list:
+                detailed_err_msg += " - " + storage_map_item[0] + ", "
+                if storage_map_item[4] is True:
+                    detailed_err_msg += "Shared Input, "
+                elif storage_map_item[4] is False:
+                    detailed_err_msg += "Input, "
+                if storage_map_item[1] is not None:
+                    detailed_err_msg += "Shape: %s, " % str(storage_map_item[1])
+                detailed_err_msg += "ElemSize: %s Byte(s)" % storage_map_item[2]
+                if storage_map_item[3] is not None:
+                    detailed_err_msg += ", TotalSize: %s Byte(s)\n" % storage_map_item[3]
+                else:
+                    detailed_err_msg += "\n"
 
     else:
         hints.append(
@@ -200,7 +242,6 @@ def raise_with_op(node, thunk=None, exc_info=None, storage_map=None):
             " for a debugprint and storage map footprint of this apply node.")
 
 
-
     exc_value = exc_type(str(exc_value) + detailed_err_msg +
                          '\n' + '\n'.join(hints))
     raise exc_type, exc_value, exc_trace