Update to import TF 2.0 in many TensorFlow Privacy Python modules.

PiperOrigin-RevId: 425901093

tensorflow_privacy/privacy/dp_query/distributed_discrete_gaussian_query_test.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for DistributedDiscreteGaussianSumQuery."""
 
 from absl.testing import parameterized
 import numpy as np

tensorflow_privacy/privacy/dp_query/dp_query.py

@@ -44,7 +44,7 @@ throughout the entire training process, the global state is usually None.
 import abc
 import collections
 
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 
 
 class DPQuery(metaclass=abc.ABCMeta):

tensorflow_privacy/privacy/dp_query/gaussian_query.py

@@ -16,8 +16,7 @@
 import collections
 import distutils
 
-import tensorflow.compat.v1 as tf
-
+import tensorflow as tf
 from tensorflow_privacy.privacy.analysis import dp_event
 from tensorflow_privacy.privacy.dp_query import dp_query
 

tensorflow_privacy/privacy/dp_query/nested_query.py

@@ -15,8 +15,7 @@
 
 import collections
 
-import tensorflow.compat.v1 as tf
-
+import tensorflow as tf
 from tensorflow_privacy.privacy.analysis import dp_event
 from tensorflow_privacy.privacy.dp_query import dp_query
 import tree

tensorflow_privacy/privacy/dp_query/nested_query_test.py

@@ -16,8 +16,7 @@ import collections
 
 from absl.testing import parameterized
 import numpy as np
-import tensorflow.compat.v1 as tf
-
+import tensorflow as tf
 from tensorflow_privacy.privacy.dp_query import dp_query
 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

@@ -13,8 +13,7 @@
 # limitations under the License.
 """Implements DPQuery interface for no privacy average queries."""
 
-import tensorflow.compat.v1 as tf
-
+import tensorflow as tf
 from tensorflow_privacy.privacy.analysis import dp_event
 from tensorflow_privacy.privacy.dp_query import dp_query
 

tensorflow_privacy/privacy/dp_query/no_privacy_query_test.py

@@ -13,8 +13,7 @@
 # limitations under the License.
 
 from absl.testing import parameterized
-import tensorflow.compat.v1 as tf
-
+import tensorflow 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

@@ -15,8 +15,7 @@
 
 import collections
 
-import tensorflow.compat.v1 as tf
-
+import tensorflow as tf
 from tensorflow_privacy.privacy.dp_query import dp_query
 
 

tensorflow_privacy/privacy/dp_query/normalized_query_test.py

@@ -12,8 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import tensorflow.compat.v1 as tf
-
+import tensorflow as tf
 from tensorflow_privacy.privacy.dp_query import gaussian_query
 from tensorflow_privacy.privacy.dp_query import normalized_query
 from tensorflow_privacy.privacy.dp_query import test_utils

tensorflow_privacy/privacy/dp_query/quantile_adaptive_clip_sum_query.py

@@ -15,8 +15,7 @@
 
 import collections
 
-import tensorflow.compat.v1 as tf
-
+import tensorflow as tf
 from tensorflow_privacy.privacy.analysis import dp_event
 from tensorflow_privacy.privacy.dp_query import dp_query
 from tensorflow_privacy.privacy.dp_query import gaussian_query

tensorflow_privacy/privacy/dp_query/quantile_estimator_query.py

@@ -15,7 +15,7 @@
 
 import collections
 
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 from tensorflow_privacy.privacy.dp_query import dp_query
 from tensorflow_privacy.privacy.dp_query import gaussian_query
 from tensorflow_privacy.privacy.dp_query import no_privacy_query

tensorflow_privacy/privacy/dp_query/restart_query.py

@@ -15,12 +15,12 @@
 
 This query is used to compose with a DPQuery that has `reset_state` function.
 """
+
 import abc
 import collections
 from typing import Optional
 
 import tensorflow as tf
-
 from tensorflow_privacy.privacy.dp_query import dp_query
 
 

tensorflow_privacy/privacy/privacy_tests/membership_inference_attack/keras_evaluation_test.py

@@ -14,7 +14,7 @@
 
 from absl.testing import absltest
 import numpy as np
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 from tensorflow_privacy.privacy.privacy_tests.membership_inference_attack import keras_evaluation
 from tensorflow_privacy.privacy.privacy_tests.membership_inference_attack.data_structures import AttackResults
 from tensorflow_privacy.privacy.privacy_tests.membership_inference_attack.data_structures import AttackType

tutorials/mnist_dpsgd_tutorial_common.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 """Common tools for DP-SGD MNIST tutorials."""
 
-import tensorflow.compat.v1 as tf
+import tensorflow as tf
 import tensorflow_datasets as tfds