Merged commit includes the following changes:

165233164  by andrewharp:

    internal change

--
165227502  by saeta:

    Add dataset.shard() for parallel (distributed) training.

    When running across multiple shards (i.e. multiple hosts), in order to avoid
    reading the same data redundantly and potentially overfitting during early
    training steps, it is important to split a dataset into non-overlapping
    subsets. The `.shard()` operator makes this very easy to do.

--
165227077  by A. Unique TensorFlower:

    Maybe export after each round of evaluation in `continuous_train_and_eval`.

--
165226561  by A. Unique TensorFlower:

    Adding an option to also update the tensorflow package name to tf-nightly for
    the nightly releases.

--
165224405  by tanmingxing:

    Add while_loop op benchmark for further performance study.

--
165223476  by andrewharp:

    Android demo: correct SSD detector url and handle model archives stored in sub-directories during Gradle build. Resolves #12265

    Also remove deprecated mobile multibox model from Gradle build to bring parity with Bazel build.

--

PiperOrigin-RevId: 165233164

1 files changed, 5 insertions, 4 deletions

diff --git a/tensorflow/examples/android/download-models.gradle b/tensorflow/examples/android/download-models.gradle
index f1750ffddb..a19ca36d7f 100644
--- a/tensorflow/examples/android/download-models.gradle
+++ b/tensorflow/examples/android/download-models.gradle
@@ -10,8 +10,7 @@
 // hard coded model files
 // LINT.IfChange
 def models = ['inception5h.zip',
-              'ssd_mobilenet_v1_android_export.zip',
-              'mobile_multibox_v1a.zip',
+              'object_detection/ssd_mobilenet_v1_android_export.zip',
               'stylize_v1.zip']
 // LINT.ThenChange(//tensorflow/examples/android/BUILD)
 
@@ -38,7 +37,8 @@ task downloadFile(type: Download){
 
 task extractModels(type: Copy) {
     for (f in models) {
-        from zipTree(project.ext.TMP_DIR + '/' + f)
+        def localFile = f.split("/")[-1]
+        from zipTree(project.ext.TMP_DIR + '/' + localFile)
     }
 
     into file(project.ext.ASSET_DIR)
@@ -47,7 +47,8 @@ task extractModels(type: Copy) {
 
     def needDownload = false
     for (f in models) {
-        if (!(new File(project.ext.TMP_DIR + '/' + f)).exists()) {
+        def localFile = f.split("/")[-1]
+        if (!(new File(project.ext.TMP_DIR + '/' + localFile)).exists()) {
             needDownload = true
         }
     }