Merge pull request #3206 from cclauss/from-six.moves-import-xrange

from six.moves import xrange (en masse)

research/differential_privacy/multiple_teachers/aggregation.py

@@ -19,6 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 import numpy as np
+from six.moves import xrange
 
 
 def labels_from_probs(probs):
@@ -127,5 +128,3 @@ def aggregation_most_frequent(logits):
     result[i] = np.argmax(label_counts)
 
   return np.asarray(result, dtype=np.int32)
-
-

research/differential_privacy/multiple_teachers/deep_cnn.py

@@ -20,6 +20,7 @@ from __future__ import print_function
 from datetime import datetime
 import math
 import numpy as np
+from six.moves import xrange
 import tensorflow as tf
 import time
 
@@ -600,5 +601,3 @@ def softmax_preds(images, ckpt_path, return_logits=False):
   tf.reset_default_graph()
 
   return preds
-
-

research/differential_privacy/multiple_teachers/input.py

@@ -24,6 +24,7 @@ import numpy as np
 import os
 from scipy.io import loadmat as loadmat
 from six.moves import urllib
+from six.moves import xrange
 import sys
 import tarfile
 

research/differential_privacy/multiple_teachers/train_student.py

@@ -19,6 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 import numpy as np
+from six.moves import xrange
 import tensorflow as tf
 
 from differential_privacy.multiple_teachers import aggregation

research/domain_adaptation/domain_separation/dsn_eval.py

@@ -19,6 +19,7 @@
 import math
 
 import numpy as np
+from six.moves import xrange
 import tensorflow as tf
 
 from domain_adaptation.datasets import dataset_factory

research/gan/cifar/util.py

@@ -18,6 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+from six.moves import xrange
 import tensorflow as tf
 tfgan = tf.contrib.gan
 

research/gan/image_compression/networks_test.py

@@ -19,6 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 import tensorflow as tf
+from six.moves import xrange
 import networks
 
 

research/gan/mnist/util.py

@@ -24,6 +24,7 @@ from __future__ import print_function
 
 
 import numpy as np
+from six.moves import xrange
 import tensorflow as tf
 
 ds = tf.contrib.distributions

research/gan/mnist_estimator/train.py

@@ -22,6 +22,7 @@ import os
 
 import numpy as np
 import scipy.misc
+from six.moves import xrange
 import tensorflow as tf
 
 from mnist import data_provider

research/im2txt/im2txt/data/build_mscoco_data.py

@@ -97,6 +97,7 @@ import threading
 
 import nltk.tokenize
 import numpy as np
+from six.moves import xrange
 import tensorflow as tf
 
 tf.flags.DEFINE_string("train_image_dir", "/tmp/train2014/",

research/learned_optimizer/metaopt.py

@@ -21,6 +21,7 @@ import sys
 import time
 
 import numpy as np
+from six.moves import xrange
 import tensorflow as tf
 
 from learned_optimizer.optimizer import trainable_optimizer

research/learning_to_remember_rare_events/data_utils.py

@@ -29,6 +29,7 @@ import numpy as np
 from scipy.misc import imresize
 from scipy.misc import imrotate
 from scipy.ndimage import imread
+from six.moves import xrange
 import tensorflow as tf
 
 

research/learning_to_remember_rare_events/memory.py

@@ -23,6 +23,7 @@ published as a conference paper at ICLR 2017.
 """
 
 import numpy as np
+from six.moves import xrange
 import tensorflow as tf
 
 

research/learning_to_remember_rare_events/train.py

@@ -26,6 +26,7 @@ import os
 import random
 
 import numpy as np
+from six.moves import xrange
 import tensorflow as tf
 
 import data_utils

research/lfads/synth_data/generate_itb_data.py

@@ -18,6 +18,7 @@ from __future__ import print_function
 import h5py
 import numpy as np
 import os
+from six.moves import xrange
 import tensorflow as tf
 
 from utils import write_datasets
@@ -47,12 +48,12 @@ flags.DEFINE_float("max_firing_rate", 30.0,
 flags.DEFINE_float("u_std", 0.25,
                    "Std dev of input to integration to bound model")
 flags.DEFINE_string("checkpoint_path", "SAMPLE_CHECKPOINT",
-                    """Path to directory with checkpoints of model 
+                    """Path to directory with checkpoints of model
                     trained on integration to bound task. Currently this
                     is a placeholder which tells the code to grab the
-                    checkpoint that is provided with the code 
-                    (in /trained_itb/..). If you have your own checkpoint 
-                    you would like to restore, you would point it to 
+                    checkpoint that is provided with the code
+                    (in /trained_itb/..). If you have your own checkpoint
+                    you would like to restore, you would point it to
                     that path.""")
 FLAGS = flags.FLAGS
 

research/lfads/synth_data/generate_labeled_rnn_data.py

@@ -18,6 +18,7 @@ from __future__ import print_function
 import os
 import h5py
 import numpy as np
+from six.moves import xrange
 
 from synthetic_data_utils import generate_data, generate_rnn
 from synthetic_data_utils import get_train_n_valid_inds

research/neural_gpu/data_utils.py

@@ -21,6 +21,7 @@ import sys
 import time
 
 import numpy as np
+from six.moves import xrange
 import tensorflow as tf
 
 import program_utils

research/next_frame_prediction/cross_conv/eval.py

@@ -20,6 +20,7 @@ import sys
 import time
 
 import numpy as np
+from six.moves import xrange
 import tensorflow as tf
 
 import model as cross_conv_model

research/next_frame_prediction/cross_conv/example_gen.py

@@ -18,6 +18,7 @@ import random
 import sys
 
 import numpy as np
+from six.moves import xrange
 import tensorflow as tf
 
 

research/next_frame_prediction/cross_conv/model.py

@@ -20,6 +20,7 @@ https://arxiv.org/pdf/1607.02586v1.pdf
 import math
 import sys
 
+from six.moves import xrange
 import tensorflow as tf
 
 slim = tf.contrib.slim