eager: Rename in_eager_mode to executing_eagerly and get rid of in_graph_mode.

This is in preparation to introduce one public, stable symbol: tf.executing_eagerly()
(i.e., part of moving APIs related to eager execution from "contrib" to a namespace
where we provide API stability guarantees)

PiperOrigin-RevId: 188212646

1 files changed, 6 insertions, 6 deletions

diff --git a/tensorflow/contrib/summary/summary_ops.py b/tensorflow/contrib/summary/summary_ops.py
index b6249fc92f..a61ce04ca2 100644
--- a/tensorflow/contrib/summary/summary_ops.py
+++ b/tensorflow/contrib/summary/summary_ops.py
@@ -110,7 +110,7 @@ class SummaryWriter(object):
 
   def  __init__(self, resource):
     self._resource = resource
-    if context.in_eager_mode() and self._resource is not None:
+    if context.executing_eagerly() and self._resource is not None:
       self._resource_deleter = resource_variable_ops.EagerResourceDeleter(
           handle=self._resource, handle_device="cpu:0")
 
@@ -158,7 +158,7 @@ def initialize(
       @{tf.contrib.summary.SummaryWriter}.
     ValueError: If session wasn't passed and no default session.
   """
-  if context.in_eager_mode():
+  if context.executing_eagerly():
     return
   if context.context().summary_writer_resource is None:
     raise RuntimeError("No default tf.contrib.summary.SummaryWriter found")
@@ -269,7 +269,7 @@ def _make_summary_writer(name, factory, **kwargs):
   resource = gen_summary_ops.summary_writer(shared_name=name)
   # TODO(apassos): Consider doing this instead.
   # node = factory(resource, **kwargs)
-  # if not context.in_eager_mode():
+  # if not context.executing_eagerly():
   #   ops.get_default_session().run(node)
   ops.add_to_collection(_SUMMARY_WRITER_INIT_COLLECTION_NAME,
                         factory(resource, **kwargs))
@@ -295,7 +295,7 @@ def all_summary_ops():
   Returns:
     The summary ops.
   """
-  if context.in_eager_mode():
+  if context.executing_eagerly():
     return None
   return ops.get_collection(ops.GraphKeys._SUMMARY_COLLECTION)  # pylint: disable=protected-access
 
@@ -309,7 +309,7 @@ def summary_writer_initializer_op():
   Raises:
     RuntimeError: If in Eager mode.
   """
-  if context.in_eager_mode():
+  if context.executing_eagerly():
     raise RuntimeError(
         "tf.contrib.summary.summary_writer_initializer_op is only "
         "supported in graph mode.")
@@ -477,7 +477,7 @@ def graph(param, step=None, name=None):
   Raises:
     TypeError: If `param` isn't already a @{tf.Tensor} in graph mode.
   """
-  if not context.in_eager_mode() and not isinstance(param, ops.Tensor):
+  if not context.executing_eagerly() and not isinstance(param, ops.Tensor):
     raise TypeError("graph() needs a tf.Tensor (e.g. tf.placeholder) in graph "
                     "mode, but was: %s" % type(param))
   writer = context.context().summary_writer_resource