diff --git a/capslayer/core/routing.py b/capslayer/core/routing.py index 6f10e8c..08a9444 100644 --- a/capslayer/core/routing.py +++ b/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, diff --git a/capslayer/core/transformation.py b/capslayer/core/transformation.py index ba41349..c73b35e 100644 --- a/capslayer/core/transformation.py +++ b/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 diff --git a/capslayer/data/datasets/cifar10/reader.py b/capslayer/data/datasets/cifar10/reader.py index 342eec8..15f3e3f 100644 --- a/capslayer/data/datasets/cifar10/reader.py +++ b/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 diff --git a/capslayer/data/datasets/cifar10/writer.py b/capslayer/data/datasets/cifar10/writer.py index b1a4b97..709c12f 100644 --- a/capslayer/data/datasets/cifar10/writer.py +++ b/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 diff --git a/capslayer/data/datasets/cifar100/reader.py b/capslayer/data/datasets/cifar100/reader.py index 32940c0..99a6b90 100644 --- a/capslayer/data/datasets/cifar100/reader.py +++ b/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 diff --git a/capslayer/data/datasets/cifar100/writer.py b/capslayer/data/datasets/cifar100/writer.py index be27c48..f2551aa 100644 --- a/capslayer/data/datasets/cifar100/writer.py +++ b/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 diff --git a/capslayer/data/datasets/fashion_mnist/reader.py b/capslayer/data/datasets/fashion_mnist/reader.py index ec5614a..b3df81b 100644 --- a/capslayer/data/datasets/fashion_mnist/reader.py +++ b/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 diff --git a/capslayer/data/datasets/fashion_mnist/writer.py b/capslayer/data/datasets/fashion_mnist/writer.py index 52c7377..47d9d13 100644 --- a/capslayer/data/datasets/fashion_mnist/writer.py +++ b/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 diff --git a/capslayer/data/datasets/mnist/reader.py b/capslayer/data/datasets/mnist/reader.py index ab64872..17c01b7 100644 --- a/capslayer/data/datasets/mnist/reader.py +++ b/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 diff --git a/capslayer/data/datasets/mnist/writer.py b/capslayer/data/datasets/mnist/writer.py index e1d5809..db7f699 100644 --- a/capslayer/data/datasets/mnist/writer.py +++ b/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 diff --git a/capslayer/data/utils/TFRecordHelper.py b/capslayer/data/utils/TFRecordHelper.py index bb8212c..61400b4 100644 --- a/capslayer/data/utils/TFRecordHelper.py +++ b/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): diff --git a/capslayer/layers/convolutional.py b/capslayer/layers/convolutional.py index bc1ab9f..e126a99 100644 --- a/capslayer/layers/convolutional.py +++ b/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 diff --git a/capslayer/layers/convolutional_test.py b/capslayer/layers/convolutional_test.py index 17a0789..5593e27 100644 --- a/capslayer/layers/convolutional_test.py +++ b/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(): diff --git a/capslayer/layers/layers.py b/capslayer/layers/layers.py index b6c5253..9c36cff 100644 --- a/capslayer/layers/layers.py +++ b/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 diff --git a/capslayer/ops/losses/losses.py b/capslayer/ops/losses/losses.py index 3eab2ea..5ee7339 100644 --- a/capslayer/ops/losses/losses.py +++ b/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): diff --git a/capslayer/ops/math_ops.py b/capslayer/ops/math_ops.py index cb4dff3..63f1cc0 100644 --- a/capslayer/ops/math_ops.py +++ b/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, diff --git a/capslayer/ops/nn_ops.py b/capslayer/ops/nn_ops.py index a15aa5c..7da5265 100644 --- a/capslayer/ops/nn_ops.py +++ 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 diff --git a/capslayer/ops/nn_ops_test.py b/capslayer/ops/nn_ops_test.py index eb96c05..239c0cb 100644 --- a/capslayer/ops/nn_ops_test.py +++ b/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 diff --git a/capslayer/ops/ops.py b/capslayer/ops/ops.py index ecc87d5..776fe43 100644 --- a/capslayer/ops/ops.py +++ b/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): diff --git a/capslayer/summary/summary.py b/capslayer/summary/summary.py index 644de86..50a319a 100644 --- a/capslayer/summary/summary.py +++ b/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, diff --git a/models/baseline.py b/models/baseline.py index fd5a6a3..ac83bd2 100644 --- a/models/baseline.py +++ b/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 diff --git a/models/config.py b/models/config.py index 7e19c90..8f24b1e 100644 --- a/models/config.py +++ b/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 diff --git a/models/main.py b/models/main.py index 16ffe39..07e5c41 100644 --- a/models/main.py +++ b/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 diff --git a/models/matrixCapsNet.py b/models/matrixCapsNet.py index 0d6bc19..36ecb95 100644 --- a/models/matrixCapsNet.py +++ b/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 diff --git a/models/vectorCapsNet.py b/models/vectorCapsNet.py index e314acc..00d8337 100644 --- a/models/vectorCapsNet.py +++ b/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