Explicitly replace "import tensorflow" with "tensorflow.compat.v1"

PiperOrigin-RevId: 290355582

tensorflow_privacy/privacy/analysis/privacy_ledger.py

@@ -20,7 +20,7 @@ from __future__ import print_function
 import collections
 
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.analysis import tensor_buffer
 from tensorflow_privacy.privacy.dp_query import dp_query

tensorflow_privacy/privacy/analysis/privacy_ledger_test.py

@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.analysis import privacy_ledger
 from tensorflow_privacy.privacy.dp_query import gaussian_query

tensorflow_privacy/privacy/analysis/tensor_buffer.py

@@ -17,7 +17,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 
 class TensorBuffer(object):

tensorflow_privacy/privacy/analysis/tensor_buffer_test_eager.py

@@ -17,7 +17,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.analysis import tensor_buffer
 

tensorflow_privacy/privacy/analysis/tensor_buffer_test_graph.py

@@ -17,7 +17,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.analysis import tensor_buffer
 

tensorflow_privacy/privacy/bolt_on/__init__.py

@@ -14,7 +14,7 @@
 """BoltOn Method for privacy."""
 import sys
 from distutils.version import LooseVersion
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 if LooseVersion(tf.__version__) < LooseVersion("2.0.0"):
   raise ImportError("Please upgrade your version "

tensorflow_privacy/privacy/bolt_on/losses.py

@@ -17,12 +17,12 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
-from tensorflow.python.framework import ops as _ops
+from tensorflow.compat.v1.python.framework import ops as _ops
-from tensorflow.python.keras import losses
+from tensorflow.compat.v1.python.keras import losses
-from tensorflow.python.keras.regularizers import L1L2
+from tensorflow.compat.v1.python.keras.regularizers import L1L2
-from tensorflow.python.keras.utils import losses_utils
+from tensorflow.compat.v1.python.keras.utils import losses_utils
-from tensorflow.python.platform import tf_logging as logging
+from tensorflow.compat.v1.python.platform import tf_logging as logging
 
 
 class StrongConvexMixin:  # pylint: disable=old-style-class

tensorflow_privacy/privacy/bolt_on/losses_test.py

@@ -21,10 +21,10 @@ from contextlib import contextmanager  # pylint: disable=g-importing-member
 from io import StringIO  # pylint: disable=g-importing-member
 import sys
 from absl.testing import parameterized
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
-from tensorflow.python.framework import test_util
+from tensorflow.compat.v1.python.framework import test_util
-from tensorflow.python.keras import keras_parameterized
+from tensorflow.compat.v1.python.keras import keras_parameterized
-from tensorflow.python.keras.regularizers import L1L2
+from tensorflow.compat.v1.python.keras.regularizers import L1L2
 from tensorflow_privacy.privacy.bolt_on.losses import StrongConvexBinaryCrossentropy
 from tensorflow_privacy.privacy.bolt_on.losses import StrongConvexHuber
 from tensorflow_privacy.privacy.bolt_on.losses import StrongConvexMixin

tensorflow_privacy/privacy/bolt_on/models.py

@@ -16,10 +16,10 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
-from tensorflow.python.framework import ops as _ops
+from tensorflow.compat.v1.python.framework import ops as _ops
-from tensorflow.python.keras import optimizers
+from tensorflow.compat.v1.python.keras import optimizers
-from tensorflow.python.keras.models import Model
+from tensorflow.compat.v1.python.keras.models import Model
 from tensorflow_privacy.privacy.bolt_on.losses import StrongConvexMixin
 from tensorflow_privacy.privacy.bolt_on.optimizers import BoltOn
 

tensorflow_privacy/privacy/bolt_on/models_test.py

@@ -18,12 +18,12 @@ from __future__ import division
 from __future__ import print_function
 
 from absl.testing import parameterized
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
-from tensorflow.python.framework import ops as _ops
+from tensorflow.compat.v1.python.framework import ops as _ops
-from tensorflow.python.keras import keras_parameterized
+from tensorflow.compat.v1.python.keras import keras_parameterized
-from tensorflow.python.keras import losses
+from tensorflow.compat.v1.python.keras import losses
-from tensorflow.python.keras.optimizer_v2.optimizer_v2 import OptimizerV2
+from tensorflow.compat.v1.python.keras.optimizer_v2.optimizer_v2 import OptimizerV2
-from tensorflow.python.keras.regularizers import L1L2
+from tensorflow.compat.v1.python.keras.regularizers import L1L2
 from tensorflow_privacy.privacy.bolt_on import models
 from tensorflow_privacy.privacy.bolt_on.losses import StrongConvexMixin
 from tensorflow_privacy.privacy.bolt_on.optimizers import BoltOn

tensorflow_privacy/privacy/bolt_on/optimizers.py

@@ -17,9 +17,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
-from tensorflow.python.keras.optimizer_v2 import optimizer_v2
+from tensorflow.compat.v1.python.keras.optimizer_v2 import optimizer_v2
-from tensorflow.python.ops import math_ops
+from tensorflow.compat.v1.python.ops import math_ops
 from tensorflow_privacy.privacy.bolt_on.losses import StrongConvexMixin
 
 _accepted_distributions = ['laplace']  # implemented distributions for noising

tensorflow_privacy/privacy/bolt_on/optimizers_test.py

@@ -19,16 +19,16 @@ from __future__ import print_function
 
 import unittest
 from absl.testing import parameterized
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
-from tensorflow.python import ops as _ops
+from tensorflow.compat.v1.python import ops as _ops
-from tensorflow.python.framework import test_util
+from tensorflow.compat.v1.python.framework import test_util
-from tensorflow.python.keras import keras_parameterized
+from tensorflow.compat.v1.python.keras import keras_parameterized
-from tensorflow.python.keras import losses
+from tensorflow.compat.v1.python.keras import losses
-from tensorflow.python.keras.initializers import constant
+from tensorflow.compat.v1.python.keras.initializers import constant
-from tensorflow.python.keras.models import Model
+from tensorflow.compat.v1.python.keras.models import Model
-from tensorflow.python.keras.optimizer_v2.optimizer_v2 import OptimizerV2
+from tensorflow.compat.v1.python.keras.optimizer_v2.optimizer_v2 import OptimizerV2
-from tensorflow.python.keras.regularizers import L1L2
+from tensorflow.compat.v1.python.keras.regularizers import L1L2
-from tensorflow.python.platform import test
+from tensorflow.compat.v1.python.platform import test
 from tensorflow_privacy.privacy.bolt_on import optimizers as opt
 from tensorflow_privacy.privacy.bolt_on.losses import StrongConvexMixin
 

tensorflow_privacy/privacy/dp_query/dp_query.py

@@ -48,7 +48,7 @@ from __future__ import print_function
 
 import abc
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 
 class DPQuery(object):

tensorflow_privacy/privacy/dp_query/gaussian_query.py

@@ -22,7 +22,7 @@ from __future__ import print_function
 import collections
 
 from distutils.version import LooseVersion
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.dp_query import dp_query
 from tensorflow_privacy.privacy.dp_query import normalized_query

tensorflow_privacy/privacy/dp_query/gaussian_query_test.py

@@ -21,7 +21,7 @@ from __future__ import print_function
 from absl.testing import parameterized
 import numpy as np
 from six.moves import xrange
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.dp_query import gaussian_query
 from tensorflow_privacy.privacy.dp_query import test_utils

tensorflow_privacy/privacy/dp_query/nested_query_test.py

@@ -21,7 +21,7 @@ from __future__ import print_function
 
 from absl.testing import parameterized
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.dp_query import gaussian_query
 from tensorflow_privacy.privacy.dp_query import nested_query

tensorflow_privacy/privacy/dp_query/no_privacy_query.py

@@ -17,7 +17,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.dp_query import dp_query
 

tensorflow_privacy/privacy/dp_query/no_privacy_query_test.py

@@ -19,7 +19,7 @@ from __future__ import division
 from __future__ import print_function
 
 from absl.testing import parameterized
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.dp_query import no_privacy_query
 from tensorflow_privacy.privacy.dp_query import test_utils

tensorflow_privacy/privacy/dp_query/normalized_query.py

@@ -21,7 +21,7 @@ from __future__ import print_function
 
 import collections
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.dp_query import dp_query
 

tensorflow_privacy/privacy/dp_query/normalized_query_test.py

@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.dp_query import gaussian_query
 from tensorflow_privacy.privacy.dp_query import normalized_query

tensorflow_privacy/privacy/dp_query/quantile_adaptive_clip_sum_query.py

@@ -27,7 +27,7 @@ from __future__ import print_function
 
 import collections
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.dp_query import dp_query
 from tensorflow_privacy.privacy.dp_query import gaussian_query

tensorflow_privacy/privacy/dp_query/quantile_adaptive_clip_sum_query_test.py

@@ -21,7 +21,7 @@ from __future__ import print_function
 from absl.testing import parameterized
 
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.analysis import privacy_ledger
 from tensorflow_privacy.privacy.dp_query import quantile_adaptive_clip_sum_query

tensorflow_privacy/privacy/optimizers/dp_optimizer.py

@@ -19,7 +19,7 @@ from __future__ import print_function
 
 from absl import logging
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.analysis import privacy_ledger
 from tensorflow_privacy.privacy.dp_query import gaussian_query

tensorflow_privacy/privacy/optimizers/dp_optimizer_eager_test.py

@@ -19,7 +19,7 @@ from __future__ import print_function
 
 from absl.testing import parameterized
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.analysis import privacy_ledger
 from tensorflow_privacy.privacy.dp_query import gaussian_query

tensorflow_privacy/privacy/optimizers/dp_optimizer_test.py

@@ -20,7 +20,7 @@ from __future__ import print_function
 from absl.testing import parameterized
 import mock
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.analysis import privacy_ledger
 from tensorflow_privacy.privacy.dp_query import gaussian_query

tensorflow_privacy/privacy/optimizers/dp_optimizer_vectorized.py

@@ -19,7 +19,7 @@ from __future__ import print_function
 
 from absl import logging
 
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 AdagradOptimizer = tf.compat.v1.train.AdagradOptimizer
 AdamOptimizer = tf.compat.v1.train.AdamOptimizer

tensorflow_privacy/privacy/optimizers/dp_optimizer_vectorized_test.py

@@ -20,7 +20,7 @@ from __future__ import print_function
 from absl.testing import parameterized
 import mock
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.optimizers import dp_optimizer_vectorized
 from tensorflow_privacy.privacy.optimizers.dp_optimizer_vectorized import VectorizedDPAdagrad

tutorials/bolton_tutorial.py

@@ -15,7 +15,7 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-import tensorflow as tf  # pylint: disable=wrong-import-position
+import tensorflow.compat.v1 as tf  # pylint: disable=wrong-import-position
 from tensorflow_privacy.privacy.bolt_on import losses  # pylint: disable=wrong-import-position
 from tensorflow_privacy.privacy.bolt_on import models  # pylint: disable=wrong-import-position
 from tensorflow_privacy.privacy.bolt_on.optimizers import BoltOn  # pylint: disable=wrong-import-position

tutorials/lm_dpsgd_tutorial.py

@@ -41,7 +41,7 @@ from absl import app
 from absl import flags
 
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 import tensorflow_datasets as tfds
 
 from tensorflow_privacy.privacy.analysis import privacy_ledger

tutorials/mnist_dpsgd_tutorial.py

@@ -22,7 +22,7 @@ from absl import app
 from absl import flags
 
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.analysis import privacy_ledger
 from tensorflow_privacy.privacy.analysis.rdp_accountant import compute_rdp_from_ledger

tutorials/mnist_dpsgd_tutorial_eager.py

@@ -20,7 +20,7 @@ from absl import app
 from absl import flags
 
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.analysis.rdp_accountant import compute_rdp
 from tensorflow_privacy.privacy.analysis.rdp_accountant import get_privacy_spent

tutorials/mnist_dpsgd_tutorial_keras.py

@@ -22,7 +22,7 @@ from absl import flags
 from absl import logging
 
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.analysis.rdp_accountant import compute_rdp
 from tensorflow_privacy.privacy.analysis.rdp_accountant import get_privacy_spent

tutorials/mnist_dpsgd_tutorial_vectorized.py

@@ -22,7 +22,7 @@ from absl import app
 from absl import flags
 
 import numpy as np
-import tensorflow as tf
+import tensorflow.compat.v1 as tf
 
 from tensorflow_privacy.privacy.analysis.rdp_accountant import compute_rdp
 from tensorflow_privacy.privacy.analysis.rdp_accountant import get_privacy_spent