Move shared TensorFlow utilities from astronet/util to tf_util/.

PiperOrigin-RevId: 223433850

research/astronet/astrowavenet/data/synthetic_transits.py

@@ -21,7 +21,7 @@ from __future__ import print_function
 import numpy as np
 import tensorflow as tf
 
-from astronet.util import configdict
+from tf_util import configdict
 from astrowavenet.data import base
 from astrowavenet.data import synthetic_transit_maker
 

research/astronet/astrowavenet/trainer.py

@@ -24,15 +24,14 @@ import os.path
 from absl import flags
 import tensorflow as tf
 
-from astronet.util import config_util
-from astronet.util import configdict
-from astronet.util import estimator_runner
 from astrowavenet import astrowavenet_model
 from astrowavenet import configurations
 from astrowavenet.data import kepler_light_curves
 from astrowavenet.data import synthetic_transits
 from astrowavenet.util import estimator_util
-
+from tf_util import config_util
+from tf_util import configdict
+from tf_util import estimator_runner
 
 FLAGS = flags.FLAGS
 

research/astronet/tf_util/BUILD

+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])  # Apache 2.0
+
+py_library(
+    name = "configdict",
+    srcs = ["configdict.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+    ],
+)
+
+py_test(
+    name = "configdict_test",
+    size = "small",
+    srcs = ["configdict_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [":configdict"],
+)
+
+py_library(
+    name = "config_util",
+    srcs = ["config_util.py"],
+    srcs_version = "PY2AND3",
+)
+
+py_test(
+    name = "config_util_test",
+    size = "small",
+    srcs = ["config_util_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [":config_util"],
+)
+
+py_library(
+    name = "estimator_runner",
+    srcs = ["estimator_runner.py"],
+    srcs_version = "PY2AND3",
+)
+
+py_library(
+    name = "example_util",
+    srcs = ["example_util.py"],
+    srcs_version = "PY2AND3",
+    visibility = ["//visibility:public"],
+)
+
+py_test(
+    name = "example_util_test",
+    size = "small",
+    srcs = ["example_util_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [":example_util"],
+)

research/astronet/tf_util/__init__.py

+# Copyright 2018 The TensorFlow Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+

research/astronet/astronet/util/config_util_test.py → research/astronet/tf_util/config_util_test.py

@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import tensorflow as tf
 
-from astronet.util import config_util
+from tf_util import config_util
 
 
 class ConfigUtilTest(tf.test.TestCase):

research/astronet/astronet/util/configdict_test.py → research/astronet/tf_util/configdict_test.py

@@ -20,7 +20,7 @@ from __future__ import print_function
 
 from absl.testing import absltest
 
-from astronet.util import configdict
+from tf_util import configdict
 
 
 class ConfigDictTest(absltest.TestCase):

research/astronet/astronet/util/estimator_runner.py → research/astronet/tf_util/estimator_runner.py

@@ -45,6 +45,8 @@ def evaluate(estimator, eval_args):
   latest_checkpoint = estimator.latest_checkpoint()
   if not latest_checkpoint:
     # This is expected if the training job has not yet saved a checkpoint.
+    tf.logging.info("No checkpoint in %s, skipping evaluation.",
+                    estimator.model_dir)
     return global_step, values
 
   tf.logging.info("Starting evaluation on checkpoint %s", latest_checkpoint)
@@ -54,7 +56,7 @@ def evaluate(estimator, eval_args):
           input_fn, steps=eval_steps, name=eval_name)
       if global_step is None:
         global_step = values[eval_name].get("global_step")
-  except (tf.errors.NotFoundError, ValueError):
+  except tf.errors.NotFoundError:
     # Expected under some conditions, e.g. checkpoint is already deleted by the
     # trainer process. Increasing RunConfig.keep_checkpoint_max may prevent this
     # in some cases.

research/astronet/astronet/util/example_util_test.py → research/astronet/tf_util/example_util_test.py

@@ -21,7 +21,7 @@ from __future__ import print_function
 import numpy as np
 import tensorflow as tf
 
-from astronet.util import example_util
+from tf_util import example_util
 
 
 class ExampleUtilTest(tf.test.TestCase):