tensorpack.tfv1

docs/modules/index.rst

@@ -4,7 +4,6 @@ API Documentation
 .. toctree::
   :maxdepth: 1
 
-
   dataflow
   dataflow.dataset
   dataflow.imgaug
@@ -17,3 +16,4 @@ API Documentation
   tfutils
   utils
   contrib
+  tfv1

examples/FasterRCNN/modeling/generalized_rcnn.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # File:
 
-from tensorpack.compat import tfv1 as tf
+from tensorpack import tfv1 as tf
 from tensorpack import ModelDesc
 from tensorpack.models import GlobalAvgPooling, l2_regularizer, regularize_cost
 from tensorpack.tfutils import optimizer

examples/ImageNetModels/alexnet.py

@@ -1,13 +1,12 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 # File: alexnet.py
 
 import argparse
 import numpy as np
 import os
 import cv2
-import tensorflow as tf
 
+from tensorpack import tfv1 as tf
 from tensorpack import *
 from tensorpack.dataflow import imgaug
 from tensorpack.tfutils import argscope

examples/ImageNetModels/imagenet_utils.py

@@ -1,15 +1,13 @@
-# -*- coding: utf-8 -*-
 # File: imagenet_utils.py
 
-
 import multiprocessing
 import numpy as np
 import os
 from abc import abstractmethod
 import cv2
-import tensorflow as tf
 import tqdm
 
+from tensorpack import tfv1 as tf
 from tensorpack import ModelDesc
 from tensorpack.dataflow import (
     AugmentImageComponent, BatchData, MultiThreadMapData,

examples/ImageNetModels/inception-bn.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 # File: inception-bn.py
 # Author: Yuxin Wu
 
 import argparse
 import os
-import tensorflow as tf
+from tensorpack import tfv1 as tf
 
 from tensorpack import *
 from tensorpack.dataflow import dataset

examples/ImageNetModels/shufflenet.py

@@ -7,7 +7,7 @@
 import numpy as np
 import os
 import cv2
-import tensorflow as tf
+from tensorpack import tfv1 as tf
 
 from tensorpack import *
 from tensorpack.dataflow import imgaug

examples/ImageNetModels/vgg16.py

@@ -4,7 +4,7 @@
 
 import argparse
 import os
-import tensorflow as tf
+from tensorpack import tfv1 as tf
 
 from tensorpack import *
 from tensorpack.tfutils import argscope

examples/SpatialTransformer/mnist-addition.py

@@ -1,13 +1,12 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 # File: mnist-addition.py
 # Author: Yuxin Wu
 
 import argparse
 import numpy as np
 import os
 import cv2
-import tensorflow as tf
+from tensorpack import tfv1 as tf
 
 from tensorpack import *
 from tensorpack.dataflow import dataset
@@ -194,7 +193,10 @@ def get_data(isTrain):
 
     ds = JoinData([ds, ds])
     # stack the two digits into two channels, and label it with the sum
-    ds = MapData(ds, lambda dp: [np.stack([dp[0], dp[2]], axis=2), dp[1] + dp[3]])
+
+    def mapper(dp):
+        return [np.stack([dp[0], dp[2]], axis=2), dp[1] + dp[3]]
+    ds = MapData(ds, dp)
     ds = BatchData(ds, 128)
     return ds
 

examples/basics/cifar-convnet.py

@@ -3,7 +3,7 @@
 # Author: Yuxin Wu
 import argparse
 import os
-from tensorpack.compat import tfv1 as tf
+from tensorpack import tfv1 as tf
 
 from tensorpack import *
 from tensorpack.dataflow import dataset

examples/basics/export-model.py

@@ -3,7 +3,7 @@
 
 import argparse
 import cv2
-from tensorpack.compat import tfv1 as tf
+from tensorpack import tfv1 as tf
 from tensorpack import *
 from tensorpack.tfutils.export import ModelExporter
 

examples/basics/mnist-convnet.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # File: mnist-convnet.py
 
-from tensorpack.compat import tfv1 as tf
+from tensorpack import tfv1 as tf
 from tensorpack import *
 from tensorpack.dataflow import dataset
 from tensorpack.tfutils import summary

examples/basics/mnist-tflayers.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # File: mnist-tflayers.py
 
-from tensorpack.compat import tfv1 as tf
+from tensorpack import tfv1 as tf
 from tensorpack import *
 from tensorpack.dataflow import dataset
 from tensorpack.tfutils import summary

examples/basics/mnist-visualizations.py

@@ -6,7 +6,7 @@
 The same MNIST ConvNet example, but with weights/activations visualization.
 """
 
-from tensorpack.compat import tfv1 as tf
+from tensorpack import tfv1 as tf
 from tensorpack import *
 from tensorpack.dataflow import dataset
 

examples/basics/svhn-digit-convnet.py

@@ -3,7 +3,7 @@
 
 import argparse
 import os
-from tensorpack.compat import tfv1 as tf
+from tensorpack import tfv1 as tf
 from tensorpack import *
 from tensorpack.dataflow import dataset
 from tensorpack.tfutils.summary import *

tensorpack/__init__.py

@@ -21,3 +21,5 @@
     from tensorpack.train import *
     from tensorpack.input_source import *
     from tensorpack.predict import *
+
+from tensorpack.compat import tfv1

tensorpack/compat/__init__.py

@@ -1,7 +1,7 @@
 import tensorflow as tf
 
 
-def backport_tensor_spec():
+def _backport_tensor_spec():
     if hasattr(tf, 'TensorSpec'):
         return tf.TensorSpec
     try:
@@ -19,6 +19,9 @@ def backport_tensor_spec():
 
 
 def is_tfv2():
+    """
+    Returns whether tensorflow is operating in V2 mode.
+    """
     try:
         from tensorflow.python import tf2
         return tf2.enabled()

tensorpack/dataflow/imgaug/geometry.py

@@ -80,7 +80,7 @@ def get_transform(self, img):
             arr = cv2.warpAffine(arr, mat, arr.shape)
         assert np.all(arr == orig)
         """
-        mat = cv2.getRotationMatrix2D(tuple(center - 0.5), deg, 1)
+        mat = cv2.getRotationMatrix2D(tuple(center - 0.5), float(deg), 1)
         return WarpAffineTransform(
             mat, img.shape[1::-1], interp=self.interp,
             borderMode=self.border, borderValue=self.border_value)
@@ -104,7 +104,7 @@ def _get_deg(self, img):
         deg = self._rand_range(-self.max_deg, self.max_deg)
         if self.step_deg:
             deg = deg // self.step_deg * self.step_deg
-        return deg
+        return float(deg)
 
     def get_transform(self, img):
         deg = self._get_deg(img)