Merge pull request #15355 from krishrustagi:changes

PiperOrigin-RevId: 398506469

Author: tensorflower-gardener

keras/utils/layer_utils.py

@@ -207,13 +207,15 @@ def print_row(fields, positions, nested_level=0):
           cutoff = min(candidate_cutoffs)
           fit_into_line = fit_into_line[:cutoff]
 
+        if col == 0:
+          line += '|' * nested_level + ' '
         line += fit_into_line
         line += ' ' * space if space else ''
         left_to_print[col] = left_to_print[col][cutoff:]
 
         # Pad out to the next position
         if nested_level:
-          line += ' ' * (positions[col] - len(line) - (2 * nested_level) - 1)
+          line += ' ' * (positions[col] - len(line) - nested_level)
         else:
           line += ' ' * (positions[col] - len(line))
       line += '|' * nested_level
@@ -294,14 +296,13 @@ def print_layer(layer, nested_level=0, is_nested_last=False):
       for i in range(len(nested_layer)):
         if i == len(nested_layer) - 1:
           is_nested_last = True
-        print_fn('|' * (nested_level + 1), end=' ')
         print_layer(nested_layer[i], nested_level + 1, is_nested_last)
 
       print_fn('|' * nested_level + '¯' * (line_length - 2 * nested_level) +
                '|' * nested_level)
 
     if not is_nested_last:
-      print_fn('|' * nested_level + '_' * (line_length - 2 * nested_level) +
+      print_fn('|' * nested_level + ' ' * (line_length - 2 * nested_level) +
                '|' * nested_level)
 
   layers = model.layers

keras/utils/layer_utils_test.py

@@ -63,8 +63,8 @@ def test_print_summary(self):
     fpath = os.path.join(temp_dir, file_name)
     writer = open(fpath, 'w')
 
-    def print_to_file(text, end='\n'):
-      print(text, end=end, file=writer)
+    def print_to_file(text):
+      print(text, file=writer)
 
     try:
       layer_utils.print_summary(model, print_fn=print_to_file)
@@ -88,7 +88,6 @@ def make_model():
 
     x = inner_inputs = keras.Input(shape)
     x = make_model()(x)
-    x = make_model()(x)
     inner_model = keras.Model(inner_inputs, x)
 
     inputs = keras.Input(shape)
@@ -100,8 +99,8 @@ def make_model():
     fpath = os.path.join(temp_dir, file_name)
     writer = open(fpath, 'w')
 
-    def print_to_file(text, end='\n'):
-      print(text, end=end, file=writer)
+    def print_to_file(text):
+      print(text, file=writer)
 
     try:
       layer_utils.print_summary(
@@ -111,7 +110,39 @@ def print_to_file(text, end='\n'):
       reader = open(fpath, 'r')
       lines = reader.readlines()
       reader.close()
-      self.assertEqual(len(lines), 34)
+      check_str = (
+          'Model: "model_2"\n'
+          '_________________________________________________________________\n'
+          ' Layer (type)                Output Shape              Param #   \n'
+          '=================================================================\n'
+          ' input_3 (InputLayer)        [(None, None, None, 3)]   0         \n'
+          '                                                                 \n'
+          ' model_1 (Functional)        (None, None, None, 3)     24        \n'
+          '|¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯|\n'
+          '| input_1 (InputLayer)      [(None, None, None, 3)]   0         |\n'
+          '|                                                               |\n'
+          '| model (Functional)        (None, None, None, 3)     24        |\n'
+          '||¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯||\n'
+          '|| input_2 (InputLayer)    [(None, None, None, 3)]   0         ||\n'
+          '||                                                             ||\n'
+          '|| conv2d (Conv2D)         (None, None, None, 3)     12        ||\n'
+          '||                                                             ||\n'
+          '|| batch_normalization (BatchN  (None, None, None, 3)  12      ||\n'
+          '|| ormalization)                                               ||\n'
+          '|¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯|\n'
+          '¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯\n'
+          '=================================================================\n'
+          'Total params: 24\n'
+          'Trainable params: 18\n'
+          'Non-trainable params: 6\n'
+          '_________________________________________________________________\n')
+
+      fin_str = ''
+      for line in lines:
+        fin_str += line
+
+      self.assertIn(fin_str, check_str)
+      self.assertEqual(len(lines), 25)
     except ImportError:
       pass
 
@@ -172,8 +203,8 @@ def call(self, inputs):
     fpath = os.path.join(temp_dir, file_name)
     writer = open(fpath, 'w')
 
-    def print_to_file(text, end='\n'):
-      print(text, end=end, file=writer)
+    def print_to_file(text):
+      print(text, file=writer)
 
     try:
       layer_utils.print_summary(