Refactor skflow

* Switching trainer to use layers/optimizers

* Updated documentation for optimizer argument and added support for instance of sub-class of optimizer if user wants to provide optimizer with custom parameters.

* Added support for passing learning_rate Tensor

* Make trainer work with layers/optimize_loss

* Move config_addong.py to estimators and rename ConfigAddon to RunConfig

* Added size=small to all tests

* Moved tf_master and tf_random_seed into RunConfig

* Removing need in Trainer class - replacing it with just a function and creating optimizer in the setup_training function.

* Moved saver params into RunConfig

* Moved creation of placeholders inside data feeder. Can be used for multi inputs/outputs.

* switch to use platform.default._gfile for file operations

* Adding a build rule for all skflow examples

* correcting build rule and import in neural translation example

* Replacing one_hot_matrix by tf.one_hot (speed + GPU)

* Fixing missing test and left over refactoring in montior.py

* Fixed iris custom config example. Also removed duplication of names in trainer.

* rename iris_config_addon to iris_run_config

* Fix keep_prob->dropout arg rename in dnn

* Removing .orig files

* Bump test_early_stopping test to medium

Author: ilblackdragon

tensorflow/contrib/layers/python/layers/optimizers.py

@@ -87,10 +87,16 @@ class should be sub-class of tf.Optimizer that implements
     loss = control_flow_ops.with_dependencies([loss_averages_op], loss)
 
   # Learning rate variable, with possible decay.
-  lr = vs.get_variable("learning_rate",
-                       [],
-                       trainable=False,
-                       initializer=init_ops.constant_initializer(learning_rate))
+  if isinstance(learning_rate, ops.Tensor) and len(learning_rate.get_shape()) == 0:
+    lr = learning_rate
+  elif isinstance(learning_rate, float):
+    lr = vs.get_variable("learning_rate",
+                         [],
+                         trainable=False,
+                         initializer=init_ops.constant_initializer(learning_rate))
+  else:
+    raise ValueError("Learning rate should be 0d Tensor or float. Got %s" %
+        str(learning_rate))
   if learning_rate_decay_fn is not None:
     lr = learning_rate_decay_fn(lr, global_step)
 
@@ -147,3 +153,4 @@ class should be sub-class of tf.Optimizer that implements
   train_tensor = control_flow_ops.with_dependencies([grad_updates], final_loss)
 
   return train_tensor
+

tensorflow/contrib/layers/python/layers/optimizers_test.py

@@ -80,3 +80,4 @@ def testGradientClip(self):
 
 if __name__ == "__main__":
   tf.test.main()
+

tensorflow/contrib/skflow/BUILD

@@ -18,6 +18,7 @@ py_library(
 
 py_test(
     name = "test_base",
+    size = "small",
     srcs = ["python/skflow/tests/test_base.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -29,6 +30,7 @@ py_test(
 
 py_test(
     name = "test_custom_decay",
+    size = "small",
     srcs = ["python/skflow/tests/test_custom_decay.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -40,6 +42,7 @@ py_test(
 
 py_test(
     name = "test_data_feeder",
+    size = "small",
     srcs = ["python/skflow/tests/test_data_feeder.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -49,8 +52,21 @@ py_test(
     ],
 )
 
+py_test(
+    name = "test_early_stopping",
+    size = "medium",
+    srcs = ["python/skflow/tests/test_early_stopping.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":skflow",
+        "//tensorflow:tensorflow_py",
+        "//tensorflow/python:framework_test_lib",
+    ],
+)
+
 py_test(
     name = "test_estimators",
+    size = "small",
     srcs = ["python/skflow/tests/test_estimators.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -62,6 +78,7 @@ py_test(
 
 py_test(
     name = "test_grid_search",
+    size = "small",
     srcs = ["python/skflow/tests/test_grid_search.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -73,6 +90,7 @@ py_test(
 
 py_test(
     name = "test_io",
+    size = "small",
     srcs = ["python/skflow/tests/test_io.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -84,6 +102,7 @@ py_test(
 
 py_test(
     name = "test_multioutput",
+    size = "small",
     srcs = ["python/skflow/tests/test_multioutput.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -95,6 +114,7 @@ py_test(
 
 py_test(
     name = "test_nonlinear",
+    size = "medium",
     srcs = ["python/skflow/tests/test_nonlinear.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -106,6 +126,7 @@ py_test(
 
 py_test(
     name = "test_regression",
+    size = "small",
     srcs = ["python/skflow/tests/test_regression.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -117,6 +138,7 @@ py_test(
 
 py_test(
     name = "test_saver",
+    size = "small",
     srcs = ["python/skflow/tests/test_saver.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -128,6 +150,7 @@ py_test(
 
 py_test(
     name = "test_ops",
+    size = "small",
     srcs = ["python/skflow/ops/tests/test_ops.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -139,6 +162,7 @@ py_test(
 
 py_test(
     name = "test_dropout_ops",
+    size = "small",
     srcs = ["python/skflow/ops/tests/test_dropout_ops.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -150,6 +174,7 @@ py_test(
 
 py_test(
     name = "test_seq2seq_ops",
+    size = "small",
     srcs = ["python/skflow/ops/tests/test_seq2seq_ops.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -161,6 +186,7 @@ py_test(
 
 py_test(
     name = "test_categorical",
+    size = "small",
     srcs = ["python/skflow/preprocessing/tests/test_categorical.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -172,6 +198,7 @@ py_test(
 
 py_test(
     name = "test_categorical_vocabulary",
+    size = "small",
     srcs = ["python/skflow/preprocessing/tests/test_categorical_vocabulary.py"],
     srcs_version = "PY2AND3",
     deps = [
@@ -183,6 +210,7 @@ py_test(
 
 py_test(
     name = "test_text",
+    size = "small",
     srcs = ["python/skflow/preprocessing/tests/test_text.py"],
     srcs_version = "PY2AND3",
     deps = [

tensorflow/contrib/skflow/__init__.py.orig

@@ -36,4 +36,3 @@
 from tensorflow.contrib.skflow.python.skflow import ops
 from tensorflow.contrib.skflow.python.skflow import preprocessing
 from tensorflow.contrib.skflow.python.skflow import models
-from tensorflow.contrib.skflow.python.skflow.trainer import TensorFlowTrainer

tensorflow/contrib/skflow/python/__init__.py.orig

@@ -25,3 +25,4 @@
 from tensorflow.contrib.skflow.python.skflow.estimators.dnn import TensorFlowDNNRegressor
 from tensorflow.contrib.skflow.python.skflow.estimators.rnn import TensorFlowRNNClassifier
 from tensorflow.contrib.skflow.python.skflow.estimators.rnn import TensorFlowRNNRegressor
+from tensorflow.contrib.skflow.python.skflow.estimators.run_config import RunConfig