Remove enable_v2_behavior calls from TFP now that TF2 is standard.

davmre · tensorflower-gardener · commit 4deddda319dc · 2021-06-22T14:24:29.000-07:00
This change was automatically generated by replacing the regex `\n( )*tf.enable_v2_behavior\(\)(\n)+` with `\n`.

PiperOrigin-RevId: 380891346
diff --git a/tensorflow_probability/python/bijectors/bijector_properties_test.py b/tensorflow_probability/python/bijectors/bijector_properties_test.py
@@ -1010,6 +1010,5 @@ def constraint_for(bijector_name=None, param=None):
 
 
 if __name__ == '__main__':
-  tf.enable_v2_behavior()
   np.set_printoptions(floatmode='unique', precision=None)
   tf.test.main()
diff --git a/tensorflow_probability/python/bijectors/rational_quadratic_spline_test.py b/tensorflow_probability/python/bijectors/rational_quadratic_spline_test.py
@@ -292,5 +292,4 @@ def testAssertsNonPositiveSlope(self):
 
 
 if __name__ == '__main__':
-  tf.enable_v2_behavior()
   tf.test.main()
diff --git a/tensorflow_probability/python/distributions/gaussian_process.py b/tensorflow_probability/python/distributions/gaussian_process.py
@@ -176,8 +176,6 @@ class GaussianProcess(distribution.AutoCompositeTensorDistribution):
   import tensorflow.compat.v2 as tf
   import tensorflow_probability as tfp
 
-  tf.enable_v2_behavior()
-
   tfd = tfp.distributions
   psd_kernels = tfp.math.psd_kernels
 
diff --git a/tensorflow_probability/python/distributions/gaussian_process_regression_model.py b/tensorflow_probability/python/distributions/gaussian_process_regression_model.py
@@ -194,8 +194,6 @@ class GaussianProcessRegressionModel(gaussian_process.GaussianProcess):
   import tensorflow.compat.v2 as tf
   import tensorflow_probability as tfp
 
-  tf.enable_v2_behavior()
-
   tfb = tfp.bijectors
   tfd = tfp.distributions
   psd_kernels = tfp.math.psd_kernels
diff --git a/tensorflow_probability/python/distributions/pixel_cnn.py b/tensorflow_probability/python/distributions/pixel_cnn.py
@@ -110,8 +110,6 @@ class PixelCNN(distribution.Distribution):
   tfk = tf.keras
   tfkl = tf.keras.layers
 
-  tf.enable_v2_behavior()
-
   # Load MNIST from tensorflow_datasets
   data = tfds.load('mnist')
   train_data, test_data = data['train'], data['test']
diff --git a/tensorflow_probability/python/distributions/student_t_process.py b/tensorflow_probability/python/distributions/student_t_process.py
@@ -165,8 +165,6 @@ class StudentTProcess(distribution.AutoCompositeTensorDistribution):
   import tensorflow.compat.v2 as tf
   import tensorflow_probability as tfp
 
-  tf.enable_v2_behavior()
-
   tfd = tfp.distributions
   psd_kernels = tfp.math.psd_kernels
 
diff --git a/tensorflow_probability/python/distributions/variational_gaussian_process.py b/tensorflow_probability/python/distributions/variational_gaussian_process.py
@@ -495,8 +495,6 @@ class VariationalGaussianProcess(gaussian_process.GaussianProcess):
   import tensorflow.compat.v2 as tf
   import tensorflow_probability as tfp
 
-  tf.enable_v2_behavior()
-
   tfb = tfp.bijectors
   tfd = tfp.distributions
   tfk = tfp.math.psd_kernels
diff --git a/tensorflow_probability/python/experimental/composite_tensor_test.py b/tensorflow_probability/python/experimental/composite_tensor_test.py
@@ -479,5 +479,4 @@ def test_already_composite_tensor(self):
 
 
 if __name__ == '__main__':
-  tf.enable_v2_behavior()
   tf.test.main()
diff --git a/tensorflow_probability/python/experimental/linalg/linear_operator_psd_kernel_test.py b/tensorflow_probability/python/experimental/linalg/linear_operator_psd_kernel_test.py
@@ -320,5 +320,4 @@ def f():
 
 
 if __name__ == '__main__':
-  tf.enable_v2_behavior()
   tf.test.main()
diff --git a/tensorflow_probability/python/internal/distribute_test_lib.py b/tensorflow_probability/python/internal/distribute_test_lib.py
@@ -19,7 +19,6 @@
 from tensorflow_probability.python.internal import distribution_util
 from tensorflow_probability.python.internal import test_util
 
-tf.enable_v2_behavior()
 JAX_MODE = False
 NUMPY_MODE = False
 NUM_DEVICES = 4
diff --git a/tensorflow_probability/python/math/psd_kernels/psd_kernel_properties_test.py b/tensorflow_probability/python/math/psd_kernels/psd_kernel_properties_test.py
@@ -174,5 +174,4 @@ def constraint_for(kernel_name=None, param=None):
 
 
 if __name__ == '__main__':
-  tf.enable_v2_behavior()
   tf.test.main()
diff --git a/tensorflow_probability/python/mcmc/internal/leapfrog_integrator.py b/tensorflow_probability/python/mcmc/internal/leapfrog_integrator.py
@@ -104,8 +104,6 @@ def leapfrog(x, v, eps, L, f, M):
   import tensorflow.compat.v2 as tf
   import tensorflow_probability as tfp
   from tensorflow_probability.python.mcmc.internal import leapfrog_integrator as leapfrog_impl
-  tf.enable_v2_behavior()
-
   dims = 10
   dtype = tf.float32
 
diff --git a/tensorflow_probability/python/mcmc/kernel.py b/tensorflow_probability/python/mcmc/kernel.py
@@ -44,7 +44,6 @@ class TransitionKernel(object):
   ```python
   from tensorflow_probability.python.mcmc import kernel as kernel_base
   import tensorflow.compat.v2 as tf
-  tf.enable_v2_behavior()
   import tensorflow_probability as tfp
 
   tfd = tfp.distributions
diff --git a/tensorflow_probability/python/mcmc/langevin.py b/tensorflow_probability/python/mcmc/langevin.py
@@ -93,8 +93,6 @@ class MetropolisAdjustedLangevinAlgorithm(kernel_base.TransitionKernel):
   import numpy as np
   import matplotlib.pyplot as plt
 
-  tf.enable_v2_behavior()
-
   tfd = tfp.distributions
   dtype = np.float32
 
@@ -140,8 +138,6 @@ def target_log_prob(x):
   import tensorflow_probability as tfp
   import numpy as np
 
-  tf.enable_v2_behavior()
-
   dtype = np.float32
   true_mean = dtype([0, 0, 0])
   true_cov = dtype([[1, 0.25, 0.25], [0.25, 1, 0.25], [0.25, 0.25, 1]])
diff --git a/tensorflow_probability/python/mcmc/random_walk_metropolis.py b/tensorflow_probability/python/mcmc/random_walk_metropolis.py
@@ -221,8 +221,6 @@ class RandomWalkMetropolis(kernel_base.TransitionKernel):
   import numpy as np
   import tensorflow.compat.v2 as tf
   import tensorflow_probability as tfp
-  tf.enable_v2_behavior()
-
   tfd = tfp.distributions
 
   dtype = np.float32
@@ -253,8 +251,6 @@ class RandomWalkMetropolis(kernel_base.TransitionKernel):
   import numpy as np
   import tensorflow.compat.v2 as tf
   import tensorflow_probability as tfp
-  tf.enable_v2_behavior()
-
   tfd = tfp.distributions
 
   dtype = np.float32
@@ -304,8 +300,6 @@ class RandomWalkMetropolis(kernel_base.TransitionKernel):
   import numpy as np
   import tensorflow.compat.v2 as tf
   import tensorflow_probability as tfp
-  tf.enable_v2_behavior()
-
   tfd = tfp.distributions
 
   dtype = np.float32
diff --git a/tensorflow_probability/python/mcmc/slice_sampler_kernel.py b/tensorflow_probability/python/mcmc/slice_sampler_kernel.py
@@ -96,8 +96,6 @@ class SliceSampler(kernel_base.TransitionKernel):
   import tensorflow_probability as tfp
   import numpy as np
 
-  tf.enable_v2_behavior()
-
   dtype = np.float32
 
   target = tfd.Normal(loc=dtype(0), scale=dtype(1))
@@ -133,8 +131,6 @@ class SliceSampler(kernel_base.TransitionKernel):
   import tensorflow_probability as tfp
   import numpy as np
 
-  tf.enable_v2_behavior()
-
   dtype = np.float32
   true_mean = dtype([0, 0])
   true_cov = dtype([[1, 0.5], [0.5, 1]])

Original file line number	Diff line number	Diff line change
`@@ -292,5 +292,4 @@ def testAssertsNonPositiveSlope(self):`
`292`	`292`
`293`	`293`
`294`	`294`	`if __name__ == '__main__':`
`295`		`- tf.enable_v2_behavior()`
`296`	`295`	`tf.test.main()`
Original file line number	Diff line number	Diff line change
`@@ -479,5 +479,4 @@ def test_already_composite_tensor(self):`
`479`	`479`
`480`	`480`
`481`	`481`	`if __name__ == '__main__':`
`482`		`- tf.enable_v2_behavior()`
`483`	`482`	`tf.test.main()`
Original file line number	Diff line number	Diff line change
`@@ -320,5 +320,4 @@ def f():`
`320`	`320`
`321`	`321`
`322`	`322`	`if __name__ == '__main__':`
`323`		`- tf.enable_v2_behavior()`
`324`	`323`	`tf.test.main()`