diff options
| author |  mbhuiyan <mohammad.ashraf.bhuiyan@intel.com> | 2018-05-16 10:49:29 -0700 |
|---|---|---|
| committer | mbhuiyan <mohammad.ashraf.bhuiyan@intel.com> | 2018-05-16 10:49:29 -0700 |
| commit | 2acf23109aabb2952ce73dee89fe1e63b0e80961 (patch) | |
| tree | 54724426fcf6d8d9a5dab57862ae749997dc5fd5 /tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py | |
| parent | 7a667f694fc25691d1093019a6fe4e0cd32fd344 (diff) | |
| parent | 383e6d48dfd5037bcb5d56937366f1ba12b9a67d (diff) | |
resolving the conflict while merging master
Diffstat (limited to 'tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py')
| -rw-r--r-- | tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py index 84c8d29072..0362996e68 100644 --- a/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py +++ b/tensorflow/contrib/distributions/python/ops/relaxed_bernoulli.py @@ -165,7 +165,7 @@ class RelaxedBernoulli(transformed_distribution.TransformedDistribution): Raises: ValueError: If both `probs` and `logits` are passed, or if neither. """ - parameters = locals() + parameters = distribution_util.parent_frame_arguments() with ops.name_scope(name, values=[logits, probs, temperature]) as name: with ops.control_dependencies([check_ops.assert_positive(temperature)] if validate_args else []): |