From b7fc7f3f464f46e0db65f884a72569f4772e623a Mon Sep 17 00:00:00 2001 From: "Joshua V. Dillon" Date: Tue, 10 Jan 2017 12:13:54 -0800 Subject: [PATCH] Name tensors created in DistributionWith* subclasses. Change: 144112386 --- tensorflow/contrib/distributions/python/ops/bernoulli.py | 2 +- tensorflow/contrib/distributions/python/ops/beta.py | 4 ++-- tensorflow/contrib/distributions/python/ops/chi2.py | 3 ++- tensorflow/contrib/distributions/python/ops/exponential.py | 2 +- tensorflow/contrib/distributions/python/ops/gamma.py | 4 ++-- tensorflow/contrib/distributions/python/ops/inverse_gamma.py | 4 ++-- tensorflow/contrib/distributions/python/ops/laplace.py | 2 +- tensorflow/contrib/distributions/python/ops/normal.py | 2 +- tensorflow/contrib/distributions/python/ops/student_t.py | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/tensorflow/contrib/distributions/python/ops/bernoulli.py b/tensorflow/contrib/distributions/python/ops/bernoulli.py index 6e2d5365b7d..d2ede5e9672 100644 --- a/tensorflow/contrib/distributions/python/ops/bernoulli.py +++ b/tensorflow/contrib/distributions/python/ops/bernoulli.py @@ -183,7 +183,7 @@ class BernoulliWithSigmoidP(Bernoulli): parameters.pop("self") with ops.name_scope(name) as ns: super(BernoulliWithSigmoidP, self).__init__( - p=nn.sigmoid(p), + p=nn.sigmoid(p, name="sigmoid_p"), dtype=dtype, validate_args=validate_args, allow_nan_stats=allow_nan_stats, diff --git a/tensorflow/contrib/distributions/python/ops/beta.py b/tensorflow/contrib/distributions/python/ops/beta.py index 84839f40c4f..d01412672aa 100644 --- a/tensorflow/contrib/distributions/python/ops/beta.py +++ b/tensorflow/contrib/distributions/python/ops/beta.py @@ -294,8 +294,8 @@ class BetaWithSoftplusAB(Beta): parameters.pop("self") with ops.name_scope(name, values=[a, b]) as ns: super(BetaWithSoftplusAB, self).__init__( - a=nn.softplus(a), - b=nn.softplus(b), + a=nn.softplus(a, name="softplus_a"), + b=nn.softplus(b, name="softplus_b"), validate_args=validate_args, allow_nan_stats=allow_nan_stats, name=ns) diff --git a/tensorflow/contrib/distributions/python/ops/chi2.py b/tensorflow/contrib/distributions/python/ops/chi2.py index e79c0a37d24..210cbe95c82 100644 --- a/tensorflow/contrib/distributions/python/ops/chi2.py +++ b/tensorflow/contrib/distributions/python/ops/chi2.py @@ -93,7 +93,8 @@ class Chi2WithAbsDf(Chi2): parameters.pop("self") with ops.name_scope(name, values=[df]) as ns: super(Chi2WithAbsDf, self).__init__( - df=math_ops.floor(math_ops.abs(df)), + df=math_ops.floor(math_ops.abs(df, name="abs_df"), + name="floor_abs_df"), validate_args=validate_args, allow_nan_stats=allow_nan_stats, name=ns) diff --git a/tensorflow/contrib/distributions/python/ops/exponential.py b/tensorflow/contrib/distributions/python/ops/exponential.py index 6598f8a50b5..31bc853bf94 100644 --- a/tensorflow/contrib/distributions/python/ops/exponential.py +++ b/tensorflow/contrib/distributions/python/ops/exponential.py @@ -113,7 +113,7 @@ class ExponentialWithSoftplusLam(Exponential): parameters.pop("self") with ops.name_scope(name, values=[lam]) as ns: super(ExponentialWithSoftplusLam, self).__init__( - lam=nn.softplus(lam), + lam=nn.softplus(lam, name="softplus_lam"), validate_args=validate_args, allow_nan_stats=allow_nan_stats, name=ns) diff --git a/tensorflow/contrib/distributions/python/ops/gamma.py b/tensorflow/contrib/distributions/python/ops/gamma.py index 6b7b8e4fa9c..23ee15e4322 100644 --- a/tensorflow/contrib/distributions/python/ops/gamma.py +++ b/tensorflow/contrib/distributions/python/ops/gamma.py @@ -234,8 +234,8 @@ class GammaWithSoftplusAlphaBeta(Gamma): parameters.pop("self") with ops.name_scope(name, values=[alpha, beta]) as ns: super(GammaWithSoftplusAlphaBeta, self).__init__( - alpha=nn.softplus(alpha), - beta=nn.softplus(beta), + alpha=nn.softplus(alpha, name="softplus_alpha"), + beta=nn.softplus(beta, name="softplus_beta"), validate_args=validate_args, allow_nan_stats=allow_nan_stats, name=ns) diff --git a/tensorflow/contrib/distributions/python/ops/inverse_gamma.py b/tensorflow/contrib/distributions/python/ops/inverse_gamma.py index b2c7eda5def..f72d97b6541 100644 --- a/tensorflow/contrib/distributions/python/ops/inverse_gamma.py +++ b/tensorflow/contrib/distributions/python/ops/inverse_gamma.py @@ -232,8 +232,8 @@ class InverseGammaWithSoftplusAlphaBeta(InverseGamma): parameters.pop("self") with ops.name_scope(name, values=[alpha, beta]) as ns: super(InverseGammaWithSoftplusAlphaBeta, self).__init__( - alpha=nn.softplus(alpha), - beta=nn.softplus(beta), + alpha=nn.softplus(alpha, name="softplus_alpha"), + beta=nn.softplus(beta, name="softplus_gamma"), validate_args=validate_args, allow_nan_stats=allow_nan_stats, name=ns) diff --git a/tensorflow/contrib/distributions/python/ops/laplace.py b/tensorflow/contrib/distributions/python/ops/laplace.py index e9993b441ae..37355a1282a 100644 --- a/tensorflow/contrib/distributions/python/ops/laplace.py +++ b/tensorflow/contrib/distributions/python/ops/laplace.py @@ -188,7 +188,7 @@ class LaplaceWithSoftplusScale(Laplace): with ops.name_scope(name, values=[loc, scale]) as ns: super(LaplaceWithSoftplusScale, self).__init__( loc=loc, - scale=nn.softplus(scale), + scale=nn.softplus(scale, name="softplus_scale"), validate_args=validate_args, allow_nan_stats=allow_nan_stats, name=ns) diff --git a/tensorflow/contrib/distributions/python/ops/normal.py b/tensorflow/contrib/distributions/python/ops/normal.py index 02f652b053b..124f97f2c4c 100644 --- a/tensorflow/contrib/distributions/python/ops/normal.py +++ b/tensorflow/contrib/distributions/python/ops/normal.py @@ -218,7 +218,7 @@ class NormalWithSoftplusSigma(Normal): with ops.name_scope(name, values=[sigma]) as ns: super(NormalWithSoftplusSigma, self).__init__( mu=mu, - sigma=nn.softplus(sigma), + sigma=nn.softplus(sigma, name="softplus_sigma"), validate_args=validate_args, allow_nan_stats=allow_nan_stats, name=ns) diff --git a/tensorflow/contrib/distributions/python/ops/student_t.py b/tensorflow/contrib/distributions/python/ops/student_t.py index 88afc47bd61..17670c8572e 100644 --- a/tensorflow/contrib/distributions/python/ops/student_t.py +++ b/tensorflow/contrib/distributions/python/ops/student_t.py @@ -333,7 +333,7 @@ class StudentTWithAbsDfSoftplusSigma(StudentT): super(StudentTWithAbsDfSoftplusSigma, self).__init__( df=math_ops.floor(math_ops.abs(df)), mu=mu, - sigma=nn.softplus(sigma), + sigma=nn.softplus(sigma, name="softplus_sigma"), validate_args=validate_args, allow_nan_stats=allow_nan_stats, name=ns)