GraphicsCoder
diff --git a/‎tensorflow/python/debug/BUILD‎
Lines changed: 2 additions & 0 deletions b/‎tensorflow/python/debug/BUILD‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎tensorflow/python/debug/cli/command_parser.py‎
Lines changed: 26 additions & 2 deletions b/‎tensorflow/python/debug/cli/command_parser.py‎
Lines changed: 26 additions & 2 deletions
diff --git a/‎tensorflow/python/debug/cli/command_parser_test.py‎
Lines changed: 29 additions & 0 deletions b/‎tensorflow/python/debug/cli/command_parser_test.py‎
Lines changed: 29 additions & 0 deletions
@@ -89,6 +89,7 @@ py_library(
     deps = [
         ":command_parser",
         ":debugger_cli_common",
+        ":tensor_format",
     ],
 )
 
@@ -180,6 +181,7 @@ py_test(
     deps = [
         ":curses_ui",
         ":debugger_cli_common",
+        ":tensor_format",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_test_lib",
     ],
 
@@ -77,11 +77,11 @@ def parse_tensor_name_with_slicing(in_str):
   Args:
     in_str: (str) Input name of the tensor, potentially followed by a slicing
       string. E.g.: Without slicing string: "hidden/weights/Variable:0", with
-      slicing string: "hidden/weights/Varaible:0[1, :]"
+      slicing string: "hidden/weights/Variable:0[1, :]"
 
   Returns:
     (str) name of the tensor
-    (str) sliciing string, if any. If no slicing string is present, return "".
+    (str) slicing string, if any. If no slicing string is present, return "".
   """
 
   if in_str.count("[") == 1 and in_str.endswith("]"):
@@ -108,3 +108,27 @@ def validate_slicing_string(slicing_string):
   """
 
   return bool(re.search(r"^\[(\d|,|\s|:)+\]$", slicing_string))
+
+
+def parse_indices(indices_string):
+  """Parse a string representing indices.
+
+  For example, if the input is "[1, 2, 3]", the return value will be a list of
+  indices: [1, 2, 3]
+
+  Args:
+    indices_string: (str) a string representing indices. Can optionally be
+      surrounded by a pair of brackets.
+
+  Returns:
+    (list of int): Parsed indices.
+  """
+
+  # Strip whitespace.
+  indices_string = re.sub(r"\s+", "", indices_string)
+
+  # Strip any brackets at the two ends.
+  if indices_string.startswith("[") and indices_string.endswith("]"):
+    indices_string = indices_string[1:-1]
+
+  return [int(element) for element in indices_string.split(",")]
@@ -129,5 +129,34 @@ def testValidateInvalidSlicingStrings(self):
     self.assertFalse(command_parser.validate_slicing_string("[5, bar]"))
 
 
+class ParseIndicesTest(test_util.TensorFlowTestCase):
+
+  def testParseValidIndicesStringsWithBrackets(self):
+    self.assertEqual([0], command_parser.parse_indices("[0]"))
+    self.assertEqual([0], command_parser.parse_indices(" [0] "))
+    self.assertEqual([-1, 2], command_parser.parse_indices("[-1, 2]"))
+    self.assertEqual([3, 4, -5],
+                     command_parser.parse_indices("[3,4,-5]"))
+
+  def testParseValidIndicesStringsWithoutBrackets(self):
+    self.assertEqual([0], command_parser.parse_indices("0"))
+    self.assertEqual([0], command_parser.parse_indices(" 0 "))
+    self.assertEqual([-1, 2], command_parser.parse_indices("-1, 2"))
+    self.assertEqual([3, 4, -5], command_parser.parse_indices("3,4,-5"))
+
+  def testParseInvalidIndicesStringsWithoutBrackets(self):
+    with self.assertRaisesRegexp(
+        ValueError, r"invalid literal for int\(\) with base 10: 'a'"):
+      self.assertEqual([0], command_parser.parse_indices("0,a"))
+
+    with self.assertRaisesRegexp(
+        ValueError, r"invalid literal for int\(\) with base 10: '2\]'"):
+      self.assertEqual([0], command_parser.parse_indices("1, 2]"))
+
+    with self.assertRaisesRegexp(
+        ValueError, r"invalid literal for int\(\) with base 10: ''"):
+      self.assertEqual([0], command_parser.parse_indices("3, 4,"))
+
+
 if __name__ == "__main__":
   googletest.main()