aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/solvers
diff options
context:
space:
mode:
authorGravatar Ankur Taly <ataly@google.com>2018-02-16 18:22:55 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-02-16 18:27:19 -0800
commit0e6f39d1bd7fe8daa86944f6ab0dd94fbeb4962a (patch)
treeee0dabaff4147ecc9bc92acd2a50dadbfd694f39 /tensorflow/contrib/solvers
parent128572c316e6f2eb6346f920314ef98e88e75069 (diff)
Merge changes from github.
PiperOrigin-RevId: 186073337
Diffstat (limited to 'tensorflow/contrib/solvers')
-rw-r--r--tensorflow/contrib/solvers/python/ops/linear_equations.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tensorflow/contrib/solvers/python/ops/linear_equations.py b/tensorflow/contrib/solvers/python/ops/linear_equations.py
index 2395707257..d791d46763 100644
--- a/tensorflow/contrib/solvers/python/ops/linear_equations.py
+++ b/tensorflow/contrib/solvers/python/ops/linear_equations.py
@@ -28,6 +28,7 @@ from tensorflow.python.ops import array_ops
from tensorflow.python.ops import control_flow_ops
from tensorflow.python.ops import linalg_ops
from tensorflow.python.ops import math_ops
+from tensorflow.python.ops import linalg_ops
def conjugate_gradient(operator,