[examples] avoid import tensorflow before cv2 (fix #173)

examples/A3C-Gym/run-atari.py

@@ -4,7 +4,6 @@
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
 import numpy as np
-import tensorflow as tf
 import os
 import sys
 import re
@@ -13,6 +12,7 @@ import random
 import argparse
 import six
 import cv2
+import tensorflow as tf
 
 from tensorpack import *
 from tensorpack.RL import *

examples/A3C-Gym/train-atari.py

@@ -4,7 +4,6 @@
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
 import numpy as np
-import tensorflow as tf
 import os
 import sys
 import re
@@ -18,6 +17,7 @@ import cv2
 from collections import deque
 import six
 from six.moves import queue
+import tensorflow as tf
 
 from tensorpack import *
 from tensorpack.utils.concurrency import *

examples/CTC-TIMIT/train-timit.py

@@ -3,7 +3,6 @@
 # File: train-timit.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
-import tensorflow as tf
 import numpy as np
 import os
 import sys
@@ -17,8 +16,11 @@ from tensorpack import *
 from tensorpack.tfutils.gradproc import SummaryGradient, GlobalNormClip
 from tensorpack.utils.globvars import globalns as param
 import tensorpack.tfutils.symbolic_functions as symbf
+import tensorflow as tf
+
 from timitdata import TIMITBatch
 
+
 BATCH = 64
 NLAYER = 2
 HIDDEN = 128

examples/Char-RNN/char-rnn.py

@@ -3,7 +3,6 @@
 # File: char-rnn.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
-import tensorflow as tf
 import numpy as np
 import os
 import sys
@@ -17,6 +16,8 @@ from tensorpack import *
 from tensorpack.tfutils.gradproc import GlobalNormClip
 from tensorpack.utils.lut import LookUpTable
 from tensorpack.utils.globvars import globalns as param
+
+import tensorflow as tf
 rnn = tf.contrib.rnn
 
 # some model hyperparams to set

examples/DeepQNetwork/DQN.py

@@ -4,7 +4,6 @@
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
 import numpy as np
-import tensorflow as tf
 
 import os
 import sys
@@ -21,6 +20,7 @@ from tensorpack import *
 from tensorpack.utils.concurrency import *
 from tensorpack.tfutils import symbolic_functions as symbf
 from tensorpack.RL import *
+import tensorflow as tf
 
 import common
 from common import play_model, Evaluator, eval_model_multithread

examples/DisturbLabel/mnist-disturb.py

@@ -4,12 +4,12 @@
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
 import numpy as np
-import tensorflow as tf
 import os
 import sys
 import argparse
 
 from tensorpack import *
+import tensorflow as tf
 from disturb import DisturbLabel
 
 import imp

examples/DisturbLabel/svhn-disturb.py

@@ -3,16 +3,17 @@
 # File: svhn-disturb.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
-import tensorflow as tf
 import argparse
 import numpy as np
 import os
+import imp
 
 from tensorpack import *
 from tensorpack.tfutils.symbolic_functions import *
 from tensorpack.tfutils.summary import *
+import tensorflow as tf
+
 from disturb import DisturbLabel
-import imp
 
 svhn_example = imp.load_source('svhn_example',
                                os.path.join(os.path.dirname(__file__), '..', 'svhn-digit-convnet.py'))

examples/DoReFa-Net/resnet-dorefa.py

@@ -2,10 +2,10 @@
 # -*- coding: UTF-8 -*-
 # File: resnet-dorefa.py
 
+import cv2
 import tensorflow as tf
 import argparse
 import numpy as np
-import cv2
 import os
 import sys
 

examples/DoReFa-Net/svhn-digit-dorefa.py

@@ -3,7 +3,6 @@
 # File: svhn-digit-dorefa.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
-import tensorflow as tf
 import argparse
 import numpy as np
 import os
@@ -12,6 +11,8 @@ from tensorpack import *
 from tensorpack.tfutils.symbolic_functions import *
 from tensorpack.tfutils.summary import *
 from tensorpack.tfutils.varreplace import remap_get_variable
+import tensorflow as tf
+
 from dorefa import get_dorefa
 
 """

examples/GAN/DCGAN-CelebA.py

@@ -3,7 +3,6 @@
 # File: DCGAN-CelebA.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
-import tensorflow as tf
 import glob
 import os, sys
 import argparse
@@ -11,6 +10,8 @@ import argparse
 from tensorpack import *
 from tensorpack.utils.viz import *
 from tensorpack.tfutils.summary import add_moving_summary
+import tensorflow as tf
+
 from GAN import GANTrainer, RandomZData, GANModelDesc
 
 """

examples/GAN/Image2Image.py

@@ -3,6 +3,7 @@
 # File: Image2Image.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
+import cv2
 import numpy as np
 import tensorflow as tf
 import glob
@@ -10,7 +11,6 @@ import pickle
 import os
 import sys
 import argparse
-import cv2
 
 from tensorpack import *
 from tensorpack.utils.viz import *

examples/GAN/InfoGAN-mnist.py

@@ -3,11 +3,11 @@
 # File: InfoGAN-mnist.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
+import cv2
 import numpy as np
 import tensorflow as tf
 import os
 import sys
-import cv2
 import argparse
 
 from tensorpack import *

examples/GAN/WGAN-CelebA.py

@@ -3,12 +3,12 @@
 # File: WGAN-CelebA.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
-import tensorflow as tf
 import os
 import argparse
 
 from tensorpack import *
 from tensorpack.tfutils.summary import add_moving_summary
+import tensorflow as tf
 from GAN import GANTrainer
 
 """

examples/PennTreebank/PTB-LSTM.py

@@ -3,7 +3,6 @@
 # File: PTB-LSTM.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
-import tensorflow as tf
 import numpy as np
 import os
 import argparse
@@ -16,6 +15,8 @@ from tensorpack.utils.argtools import memoized_ignoreargs
 
 import reader as tfreader
 from reader import ptb_producer
+
+import tensorflow as tf
 rnn = tf.contrib.rnn
 
 SEQ_LEN = 35

examples/ResNet/cifar10-resnet.py

@@ -4,7 +4,6 @@
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
 import numpy as np
-import tensorflow as tf
 import argparse
 import os
 
@@ -12,6 +11,7 @@ from tensorpack import *
 from tensorpack.tfutils.symbolic_functions import *
 from tensorpack.tfutils.summary import *
 
+import tensorflow as tf
 from tensorflow.contrib.layers import variance_scaling_initializer
 
 """

examples/ResNet/svhn-resnet.py

@@ -3,7 +3,6 @@
 # File: svhn-resnet.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
-import tensorflow as tf
 import argparse
 import numpy as np
 import os
@@ -11,6 +10,7 @@ import os
 from tensorpack import *
 from tensorpack.tfutils.symbolic_functions import *
 from tensorpack.tfutils.summary import *
+import tensorflow as tf
 
 """
 ResNet-110 for SVHN Digit Classification.

examples/SimilarityLearning/mnist-embeddings.py

@@ -3,11 +3,8 @@
 # File: mnist-embeddings.py
 # Author: PatWie <mail@patwie.com>
 
-import tensorflow as tf
-from tensorflow.python.platform import flags
-import tensorflow.contrib.slim as slim
-
 import numpy as np
+import os
 
 import matplotlib
 from matplotlib import offsetbox
@@ -16,6 +13,11 @@ import matplotlib.pyplot as plt
 from tensorpack import *
 import tensorpack.tfutils.symbolic_functions as symbf
 from tensorpack.tfutils.summary import add_moving_summary
+
+import tensorflow as tf
+from tensorflow.python.platform import flags
+import tensorflow.contrib.slim as slim
+
 from embedding_data import get_test_data, MnistPairs, MnistTriplets
 
 
@@ -135,7 +137,9 @@ class SoftTripletModel(TripletModel):
 
 
 def get_config(model, algorithm_name):
-    logger.auto_set_dir()
+    logger.set_logger_dir(
+        os.path.join('train_log',
+                     'mnist-embeddings-{}'.format(algorithm_name)))
 
     extra_display = ["cost"]
     if not algorithm_name == "cosine":

examples/SpatialTransformer/mnist-addition.py

@@ -3,11 +3,11 @@
 # File: mnist-addition.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
+import cv2
 import numpy as np
 import tensorflow as tf
 import os
 import sys
-import cv2
 import argparse
 
 from tensorpack import *

examples/cifar-convnet.py

@@ -2,12 +2,12 @@
 # -*- coding: UTF-8 -*-
 # File: cifar-convnet.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
+from tensorpack import *
 import tensorflow as tf
 import argparse
 import numpy as np
 import os
 
-from tensorpack import *
 import tensorpack.tfutils.symbolic_functions as symbf
 from tensorpack.tfutils.summary import *
 from tensorpack.utils.gpu import get_nr_gpu

examples/load-alexnet.py

@@ -4,7 +4,6 @@
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
 from __future__ import print_function
-import tensorflow as tf
 import numpy as np
 import os
 import cv2
@@ -14,6 +13,7 @@ from tensorpack import *
 from tensorpack.tfutils.symbolic_functions import *
 from tensorpack.tfutils.summary import *
 from tensorpack.dataflow.dataset import ILSVRCMeta
+import tensorflow as tf
 
 """
 Usage:

examples/mnist-convnet.py

@@ -4,8 +4,6 @@
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
 import numpy as np
-import tensorflow as tf
-import tensorflow.contrib.slim as slim
 import os
 import sys
 import argparse
@@ -17,6 +15,8 @@ about 0.6% validation error after 30 epochs.
 
 # Just import everything into current namespace
 from tensorpack import *
+import tensorflow as tf
+import tensorflow.contrib.slim as slim
 
 IMAGE_SIZE = 28
 USE_SLIM = False

examples/svhn-digit-convnet.py

@@ -3,7 +3,6 @@
 # File: svhn-digit-convnet.py
 # Author: Yuxin Wu <ppwwyyxxc@gmail.com>
 
-import tensorflow as tf
 import argparse
 import numpy as np
 import os
@@ -11,6 +10,7 @@ import os
 from tensorpack import *
 from tensorpack.tfutils.symbolic_functions import *
 from tensorpack.tfutils.summary import *
+import tensorflow as tf
 
 """
 A very small SVHN convnet model (only 0.8m parameters).

tensorpack/libinfo.py

 
-# issue#523 may happen on old systems
+# issue#1924 may happen on old systems
 import cv2  # noqa
 
 # issue#7378 may happen with custom opencv. It doesn't hurt to disable opencl

tensorpack/train/base.py

@@ -171,7 +171,7 @@ class Trainer(object):
                     self._trigger_epoch()
                     self._callbacks.trigger_epoch()
                     self.monitors.flush()
-            except StopTraining:
+            except (StopTraining, tf.errors.OutOfRangeError):
                 logger.info("Training was stopped.")
             except KeyboardInterrupt:
                 logger.info("Detected Ctrl-C and exiting main loop.")

tensorpack/train/input_data.py

@@ -113,14 +113,14 @@ class EnqueueThread(ShareSessionThread):
                         # print 'qsize:', self.sess.run([self.op, self.size_op], feed_dict=feed)[1]
                         self.op.run(feed_dict=feed)
             except (tf.errors.CancelledError, tf.errors.OutOfRangeError):
-                try:
-                    self.close_op.run()
-                except Exception:
                 pass
-                return
             except Exception:
                 logger.exception("Exception in EnqueueThread:")
             finally:
+                try:
+                    self.close_op.run()
+                except Exception:
+                    pass
                 logger.info("EnqueueThread Exited.")