Adding compatibility for TF 2.2

capslayer/core/routing.py

@@ -19,7 +19,11 @@
 
 import numpy as np
 import capslayer as cl
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 
 def routing(votes,

capslayer/core/transformation.py

@@ -17,7 +17,11 @@
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 import capslayer as cl
 
 

capslayer/data/datasets/cifar10/reader.py

@@ -25,7 +25,11 @@
 from __future__ import print_function
 
 import os
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 from capslayer.data.datasets.cifar10.writer import tfrecord_runner
 

capslayer/data/datasets/cifar10/writer.py

@@ -20,7 +20,11 @@
 
 import os
 import numpy as np
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 from tensorflow.python.keras.utils.data_utils import get_file
 from tensorflow.python.keras.datasets.cifar import load_batch
 

capslayer/data/datasets/cifar100/reader.py

@@ -25,7 +25,11 @@
 from __future__ import print_function
 
 import os
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 from capslayer.data.datasets.cifar100.writer import tfrecord_runner
 

capslayer/data/datasets/cifar100/writer.py

@@ -20,7 +20,11 @@
 
 import os
 import numpy as np
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 from tensorflow.python.keras.utils.data_utils import get_file
 from tensorflow.python.keras.datasets.cifar import load_batch
 

capslayer/data/datasets/fashion_mnist/reader.py

@@ -18,7 +18,11 @@
 from __future__ import print_function
 
 import os
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 from capslayer.data.utils.download_utils import maybe_download_and_extract
 from capslayer.data.datasets.fashion_mnist.writer import tfrecord_runner
 

capslayer/data/datasets/fashion_mnist/writer.py

@@ -19,7 +19,11 @@
 
 import os
 import numpy as np
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 from capslayer.data.utils.TFRecordHelper import int64_feature, bytes_feature
 

capslayer/data/datasets/mnist/reader.py

@@ -18,7 +18,11 @@
 from __future__ import print_function
 
 import os
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 from capslayer.data.utils.download_utils import maybe_download_and_extract
 from capslayer.data.datasets.mnist.writer import tfrecord_runner
 

capslayer/data/datasets/mnist/writer.py

@@ -19,7 +19,11 @@
 
 import os
 import numpy as np
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 from capslayer.data.utils.TFRecordHelper import int64_feature, bytes_feature
 

capslayer/data/utils/TFRecordHelper.py

@@ -17,7 +17,11 @@
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 
 def int64_feature(value):

capslayer/layers/convolutional.py

@@ -18,7 +18,11 @@
 from __future__ import print_function
 
 import capslayer as cl
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 from capslayer.core import routing
 from capslayer.core import transforming

capslayer/layers/convolutional_test.py

@@ -19,7 +19,11 @@
 
 import numpy as np
 import capslayer as cl
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 
 def testConv2d():

capslayer/layers/layers.py

@@ -23,7 +23,11 @@
 
 import numpy as np
 import capslayer as cl
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 from capslayer.core import routing
 from capslayer.core import transforming

capslayer/ops/losses/losses.py

@@ -18,7 +18,11 @@
 from __future__ import print_function
 
 import capslayer as cl
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 
 def spread_loss(labels, logits, margin, regularizer=None):

capslayer/ops/math_ops.py

@@ -19,7 +19,11 @@
 
 import numpy as np
 import capslayer as cl
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 
 def matmul(a, b,

capslayer/ops/nn_ops.py

@@ -17,7 +17,11 @@
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 import capslayer as cl
 import numpy as np
 

capslayer/ops/nn_ops_test.py

@@ -18,7 +18,11 @@
 from __future__ import print_function
 
 import numpy as np
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 from nn_ops import space_to_batch_nd_v1
 from nn_ops import space_to_batch_nd

capslayer/ops/ops.py

@@ -18,7 +18,11 @@
 from __future__ import print_function
 
 import capslayer as cl
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 
 def squash(inputs, axis=-2, ord="euclidean", name=None):

capslayer/summary/summary.py

@@ -17,7 +17,11 @@
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 
 def image(name,

models/baseline.py

@@ -19,7 +19,11 @@
 
 import numpy as np
 import capslayer as cl
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 from config import cfg
 

models/config.py

@@ -1,5 +1,9 @@
 import os
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 flags = tf.app.flags
 

models/main.py

@@ -20,7 +20,11 @@
 import os
 import time
 import numpy as np
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 from tensorflow.python.client import timeline
 from importlib import import_module
 from capslayer.plotlib import plot_activation

models/matrixCapsNet.py

@@ -19,7 +19,11 @@
 
 import numpy as np
 import capslayer as cl
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 from config import cfg
 

models/vectorCapsNet.py

@@ -19,7 +19,11 @@
 
 import numpy as np
 import capslayer as cl
-import tensorflow as tf
+try:
+    import tensorflow.compat.v1 as tf
+    tf.disable_v2_behavior()
+except:
+    import tensorflow as tf
 
 from config import cfg