diff options
| author |  Jianwei Xie <xiejw@google.com> | 2018-03-28 14:36:18 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-03-28 14:38:46 -0700 |
| commit | e97c9e91e016efd951dc52e82744f607d948bb2a (patch) | |
| tree | e98e3a2aaec29758533b3c331140b464ff6ce50e /tensorflow/contrib/learn | |
| parent | ef6552b544b3c3bf6808be807b30dd9bd4f19669 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 190835392
Diffstat (limited to 'tensorflow/contrib/learn')
| -rw-r--r-- | tensorflow/contrib/learn/BUILD | 1 | ||||
| -rw-r--r-- | tensorflow/contrib/learn/python/learn/estimators/linear.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tensorflow/contrib/learn/BUILD b/tensorflow/contrib/learn/BUILD index 9c59150580..16f80a876f 100644 --- a/tensorflow/contrib/learn/BUILD +++ b/tensorflow/contrib/learn/BUILD @@ -226,6 +226,7 @@ py_test( size = "small", srcs = ["python/learn/monitors_test.py"], srcs_version = "PY2AND3", + tags = ["no_pip_gpu"], # b/74437598 deps = [ ":learn", "//tensorflow/contrib/framework:framework_py", diff --git a/tensorflow/contrib/learn/python/learn/estimators/linear.py b/tensorflow/contrib/learn/python/learn/estimators/linear.py index 64d7ecc68e..70b70af98c 100644 --- a/tensorflow/contrib/learn/python/learn/estimators/linear.py +++ b/tensorflow/contrib/learn/python/learn/estimators/linear.py @@ -243,8 +243,8 @@ def sdca_model_fn(features, labels, mode, params): parent_scope = "linear" - with variable_scope.variable_op_scope( - features.values(), parent_scope) as scope: + with variable_scope.variable_scope( + values=features.values(), name_or_scope=parent_scope) as scope: features = features.copy() features.update(layers.transform_features(features, feature_columns)) logits, columns_to_variables, bias = ( |