Merged commit includes the following changes: (#7797)

279978375  by Sergio Guadarrama:

    Pass s=2 to the expanded_conv block so it can apply residual correctly in case of fused convolutions.  (Before it was relying on channel mismatch only)

--
279788358  by Sergio Guadarrama:

    Update README to add mobilenet-edgetpu details

--
279774392  by Sergio Guadarrama:

    Adds MobilenetV3-EdgeTpu definition.

--
278917344  by Sergio Guadarrama:

    Create visualwakewords dataset using slim scripts instead of custom scripts.

--
277940048  by Sergio Guadarrama:

    Internal changes to tf.contrib symbols

--

PiperOrigin-RevId: 279978375

research/slim/nets/resnet_v1_test.py

@@ -20,11 +20,12 @@ from __future__ import print_function
 
 import numpy as np
 import tensorflow as tf
+from tensorflow.contrib import slim as contrib_slim
 
 from nets import resnet_utils
 from nets import resnet_v1
 
-slim = tf.contrib.slim
+slim = contrib_slim
 
 
 def create_test_input(batch_size, height, width, channels):

research/slim/nets/resnet_v2.py

@@ -51,10 +51,11 @@ from __future__ import division
 from __future__ import print_function
 
 import tensorflow as tf
+from tensorflow.contrib import slim as contrib_slim
 
 from nets import resnet_utils
 
-slim = tf.contrib.slim
+slim = contrib_slim
 resnet_arg_scope = resnet_utils.resnet_arg_scope
 
 

research/slim/nets/resnet_v2_test.py

@@ -20,11 +20,12 @@ from __future__ import print_function
 
 import numpy as np
 import tensorflow as tf
+from tensorflow.contrib import slim as contrib_slim
 
 from nets import resnet_utils
 from nets import resnet_v2
 
-slim = tf.contrib.slim
+slim = contrib_slim
 
 
 def create_test_input(batch_size, height, width, channels):

research/slim/nets/s3dg.py

@@ -25,6 +25,8 @@ from __future__ import division
 from __future__ import print_function
 
 import tensorflow as tf
+from tensorflow.contrib import framework as contrib_framework
+from tensorflow.contrib import layers as contrib_layers
 
 from nets import i3d_utils
 
@@ -34,8 +36,8 @@ inception_block_v1_3d = i3d_utils.inception_block_v1_3d
 
 # Orignaly, arg_scope = slim.arg_scope and layers = slim, now switch to more
 # update-to-date tf.contrib.* API.
-arg_scope = tf.contrib.framework.arg_scope
-layers = tf.contrib.layers
+arg_scope = contrib_framework.arg_scope
+layers = contrib_layers
 
 
 def s3dg_arg_scope(weight_decay=1e-7,

research/slim/nets/vgg.py

@@ -42,8 +42,9 @@ from __future__ import division
 from __future__ import print_function
 
 import tensorflow as tf
+from tensorflow.contrib import slim as contrib_slim
 
-slim = tf.contrib.slim
+slim = contrib_slim
 
 
 def vgg_arg_scope(weight_decay=0.0005):

research/slim/nets/vgg_test.py

@@ -18,10 +18,11 @@ from __future__ import division
 from __future__ import print_function
 
 import tensorflow as tf
+from tensorflow.contrib import slim as contrib_slim
 
 from nets import vgg
 
-slim = tf.contrib.slim
+slim = contrib_slim
 
 
 class VGGATest(tf.test.TestCase):

research/slim/preprocessing/cifarnet_preprocessing.py

@@ -21,10 +21,11 @@ from __future__ import division
 from __future__ import print_function
 
 import tensorflow as tf
+from tensorflow.contrib import slim as contrib_slim
 
 _PADDING = 4
 
-slim = tf.contrib.slim
+slim = contrib_slim
 
 
 def preprocess_for_train(image,

research/slim/preprocessing/lenet_preprocessing.py

@@ -19,8 +19,9 @@ from __future__ import division
 from __future__ import print_function
 
 import tensorflow as tf
+from tensorflow.contrib import slim as contrib_slim
 
-slim = tf.contrib.slim
+slim = contrib_slim
 
 
 def preprocess_image(image,

research/slim/preprocessing/preprocessing_factory.py

@@ -17,15 +17,14 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-
-import tensorflow as tf
+from tensorflow.contrib import slim as contrib_slim
 
 from preprocessing import cifarnet_preprocessing
 from preprocessing import inception_preprocessing
 from preprocessing import lenet_preprocessing
 from preprocessing import vgg_preprocessing
 
-slim = tf.contrib.slim
+slim = contrib_slim
 
 
 def get_preprocessing(name, is_training=False, use_grayscale=False):

research/slim/preprocessing/vgg_preprocessing.py

@@ -33,8 +33,9 @@ from __future__ import division
 from __future__ import print_function
 
 import tensorflow as tf
+from tensorflow.contrib import slim as contrib_slim
 
-slim = tf.contrib.slim
+slim = contrib_slim
 
 _R_MEAN = 123.68
 _G_MEAN = 116.78

research/slim/train_image_classifier.py

@@ -19,13 +19,15 @@ from __future__ import division
 from __future__ import print_function
 
 import tensorflow as tf
+from tensorflow.contrib import quantize as contrib_quantize
+from tensorflow.contrib import slim as contrib_slim
 
 from datasets import dataset_factory
 from deployment import model_deploy
 from nets import nets_factory
 from preprocessing import preprocessing_factory
 
-slim = tf.contrib.slim
+slim = contrib_slim
 
 tf.app.flags.DEFINE_string(
     'master', '', 'The address of the TensorFlow master to use.')
@@ -521,8 +523,7 @@ def main(_):
       moving_average_variables, variable_averages = None, None
 
     if FLAGS.quantize_delay >= 0:
-      tf.contrib.quantize.create_training_graph(
-          quant_delay=FLAGS.quantize_delay)
+      contrib_quantize.create_training_graph(quant_delay=FLAGS.quantize_delay)
 
     #########################################
     # Configure the optimization procedure. #