aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <gardener@tensorflow.org>2017-01-20 13:14:02 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2017-01-20 13:24:01 -0800
commitfac4a354131a5311b43c313823384d4324575cc7 (patch)
treede1c1dbe892492f183f0954b5391a1dfec6bd396
parentba9e992bfb73a0d548a15ee84ba50a70e73fc259 (diff)
Delete namespace aliases in tensorflow::ops for Input,
Output, etc. now that all uses have migrated to using the tensorflow namespace. Change: 145119259
-rw-r--r--RELEASE.md2
-rw-r--r--tensorflow/cc/framework/ops.h13
2 files changed, 2 insertions, 13 deletions
diff --git a/RELEASE.md b/RELEASE.md
index 29b6cba6ba..9081c1e033 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -59,6 +59,8 @@
behavior by specifying the attribute dct_method='INTEGER_ACCURATE'.
* `tf.complex_abs` has been removed from the Python interface. `tf.abs`
supports complex tensors and should be used instead.
+* In the C++ API (in tensorflow/cc), Input, Output, etc. have moved
+ from the tensorflow::ops namespace to tensorflow.
# Release 0.12.0
diff --git a/tensorflow/cc/framework/ops.h b/tensorflow/cc/framework/ops.h
index 32086d4123..d4f1079c3b 100644
--- a/tensorflow/cc/framework/ops.h
+++ b/tensorflow/cc/framework/ops.h
@@ -284,19 +284,6 @@ class InputList {
std::vector<Input> inputs_;
};
-// These symbols used to live in the ops namespace, so we temporarily
-// declare some aliases there. TODO(josh11b): Delete this!
-namespace ops {
-
-using ::tensorflow::Input;
-using ::tensorflow::InputList;
-using ::tensorflow::Operation;
-using ::tensorflow::Output;
-using ::tensorflow::OutputHash;
-using ::tensorflow::OutputList;
-
-} // namespace ops
-
} // namespace tensorflow
#endif // THIRD_PARTY_TENSORFLOW_CC_FRAMEWORK_OPS_H_