message: Remove run_deprecated_v1 qualifier from saved_model:simple_save_test.
diff: @@ -21,7 +21,6 @@ from __future__ import print_function
  import os
  from tensorflow.python.framework import ops
  -from tensorflow.python.framework import test_util
  from tensorflow.python.ops import variables
  from tensorflow.python.platform import test
  from tensorflow.python.saved_model import loader
  @@ -32,7 +31,7 @@ from tensorflow.python.saved_model import tag_constants
  class SimpleSaveTest(test.TestCase):
  - def _init_and_validate_variable(self, sess, variable_name, variable_value):
  + def _init_and_validate_variable(self, variable_name, variable_value):
  v = variables.Variable(variable_value, name=variable_name)
  self.evaluate(variables.global_variables_initializer())
  self.assertEqual(variable_value, self.evaluate(v))
  @@ -54,17 +53,21 @@ class SimpleSaveTest(test.TestCase):
  self.assertEqual(actual_tensor_info.tensor_shape.dim[i].size,
  expected_tensor.shape[i])
  - @test_util.run_deprecated_v1
  def testSimpleSave(self):
  """Test simple_save that uses the default parameters."""
  export_dir = os.path.join(test.get_temp_dir(),
  "test_simple_save")
  + # Force the test to run in graph mode.
  + # This tests a deprecated v1 API that both requires a session and uses
  + # functionality that does not work with eager tensors (such as
  + # build_tensor_info as called by predict_signature_def).
  + with ops.Graph().as_default():
  # Initialize input and output variables and save a prediction graph using
  # the default parameters.
  with self.session(graph=ops.Graph()) as sess:
  - var_x = self._init_and_validate_variable(sess, "var_x", 1)
  - var_y = self._init_and_validate_variable(sess, "var_y", 2)
  + var_x = self._init_and_validate_variable("var_x", 1)
  + var_y = self._init_and_validate_variable("var_y", 2)
  inputs = {"x": var_x}
  outputs = {"y": var_y}
  simple_save.simple_save(sess, export_dir, inputs, outputs)
  