Merge remote-tracking branch 'upstream/master'

research/astronet/astronet/astro_cnn_model/astro_cnn_model_test.py

@@ -25,7 +25,7 @@ from astronet.astro_cnn_model import astro_cnn_model
 from astronet.astro_cnn_model import configurations
 from astronet.ops import input_ops
 from astronet.ops import testing
-from astronet.util import configdict
+from tf_util import configdict
 
 
 class AstroCNNModelTest(tf.test.TestCase):

research/astronet/astronet/astro_fc_model/BUILD

@@ -32,6 +32,6 @@ py_test(
         ":configurations",
         "//astronet/ops:input_ops",
         "//astronet/ops:testing",
-        "//astronet/util:configdict",
+        "//tf_util:configdict",
     ],
 )

research/astronet/astronet/astro_fc_model/astro_fc_model_test.py

@@ -25,7 +25,7 @@ from astronet.astro_fc_model import astro_fc_model
 from astronet.astro_fc_model import configurations
 from astronet.ops import input_ops
 from astronet.ops import testing
-from astronet.util import configdict
+from tf_util import configdict
 
 
 class AstroFCModelTest(tf.test.TestCase):

research/astronet/astronet/astro_model/BUILD

@@ -28,6 +28,6 @@ py_test(
         ":configurations",
         "//astronet/ops:input_ops",
         "//astronet/ops:testing",
-        "//astronet/util:configdict",
+        "//tf_util:configdict",
     ],
 )

research/astronet/astronet/astro_model/astro_model_test.py

@@ -25,7 +25,7 @@ from astronet.astro_model import astro_model
 from astronet.astro_model import configurations
 from astronet.ops import input_ops
 from astronet.ops import testing
-from astronet.util import configdict
+from tf_util import configdict
 
 
 class AstroModelTest(tf.test.TestCase):

research/astronet/astronet/data/BUILD

@@ -12,10 +12,10 @@ py_library(
     name = "preprocess",
     srcs = ["preprocess.py"],
     deps = [
-        "//astronet/util:example_util",
-        "//light_curve_util:kepler_io",
-        "//light_curve_util:median_filter",
-        "//light_curve_util:util",
+        "//light_curve:kepler_io",
+        "//light_curve:median_filter",
+        "//light_curve:util",
+        "//tf_util:example_util",
         "//third_party/kepler_spline",
     ],
 )

research/astronet/astronet/data/preprocess.py

@@ -21,10 +21,10 @@ from __future__ import print_function
 import numpy as np
 import tensorflow as tf
 
-from astronet.util import example_util
-from light_curve_util import kepler_io
-from light_curve_util import median_filter
-from light_curve_util import util
+from light_curve import kepler_io
+from light_curve import median_filter
+from light_curve import util
+from tf_util import example_util
 from third_party.kepler_spline import kepler_spline
 
 

research/astronet/astronet/evaluate.py

@@ -24,10 +24,10 @@ import sys
 import tensorflow as tf
 
 from astronet import models
-from astronet.util import config_util
-from astronet.util import configdict
-from astronet.util import estimator_runner
 from astronet.util import estimator_util
+from tf_util import config_util
+from tf_util import configdict
+from tf_util import estimator_runner
 
 parser = argparse.ArgumentParser()
 

research/astronet/astronet/ops/BUILD

@@ -15,7 +15,7 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":input_ops",
-        "//astronet/util:configdict",
+        "//tf_util:configdict",
     ],
 )
 
@@ -33,7 +33,7 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":dataset_ops",
-        "//astronet/util:configdict",
+        "//tf_util:configdict",
     ],
 )
 

research/astronet/astronet/ops/dataset_ops_test.py

@@ -25,7 +25,7 @@ import numpy as np
 import tensorflow as tf
 
 from astronet.ops import dataset_ops
-from astronet.util import configdict
+from tf_util import configdict
 
 FLAGS = flags.FLAGS