diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2018-07-27 16:09:26 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-07-27 16:13:15 -0700 |
| commit | 13a9453aa3c9deccb0bccd7805fb1c34004a5525 (patch) | |
| tree | 09e980eddf7626076e44c7855d8cffbdb4ce12f8 /tensorflow/core/graph | |
| parent | 2beb3a9d8b9df294e7635cc23d195a76fd78de79 (diff) | |
Remove references to std::string in MKL-related code.
tensorflow::string is sometimes ::string and sometimes std::string, which
makes code that uses both subtly dangerous. For example,
FactoryKeyCreator::AddAsKey() has an overload for tensorflow::string but had
many callsites passing a std::string, causing incorrect behavior on
the google platform.
PiperOrigin-RevId: 206389641
Diffstat (limited to 'tensorflow/core/graph')
| -rw-r--r-- | tensorflow/core/graph/mkl_graph_util.h | 1 | ||||
| -rw-r--r-- | tensorflow/core/graph/mkl_layout_pass.cc | 1 | ||||
| -rw-r--r-- | tensorflow/core/graph/mkl_layout_pass_test.cc | 1 | ||||
| -rw-r--r-- | tensorflow/core/graph/mkl_tfconversion_pass.cc | 1 | ||||
| -rw-r--r-- | tensorflow/core/graph/mkl_tfconversion_pass_test.cc | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/tensorflow/core/graph/mkl_graph_util.h b/tensorflow/core/graph/mkl_graph_util.h index 5f51d6083b..333bf761b0 100644 --- a/tensorflow/core/graph/mkl_graph_util.h +++ b/tensorflow/core/graph/mkl_graph_util.h @@ -17,7 +17,6 @@ limitations under the License. #define TENSORFLOW_CORE_GRAPH_MKL_GRAPH_UTIL_H_ #ifdef INTEL_MKL -#include <string> #include "tensorflow/core/framework/op_kernel.h" namespace tensorflow { diff --git a/tensorflow/core/graph/mkl_layout_pass.cc b/tensorflow/core/graph/mkl_layout_pass.cc index b9667998d6..3e769b5303 100644 --- a/tensorflow/core/graph/mkl_layout_pass.cc +++ b/tensorflow/core/graph/mkl_layout_pass.cc @@ -22,7 +22,6 @@ limitations under the License. #include <memory> #include <queue> #include <set> -#include <string> #include <unordered_set> #include <utility> #include <vector> diff --git a/tensorflow/core/graph/mkl_layout_pass_test.cc b/tensorflow/core/graph/mkl_layout_pass_test.cc index fc474c0dc8..f2bffa2113 100644 --- a/tensorflow/core/graph/mkl_layout_pass_test.cc +++ b/tensorflow/core/graph/mkl_layout_pass_test.cc @@ -19,7 +19,6 @@ limitations under the License. #include "tensorflow/core/graph/mkl_graph_util.h" #include <algorithm> -#include <string> #include <vector> #include "tensorflow/core/framework/op.h" diff --git a/tensorflow/core/graph/mkl_tfconversion_pass.cc b/tensorflow/core/graph/mkl_tfconversion_pass.cc index e9ced4d2b6..aa39af637f 100644 --- a/tensorflow/core/graph/mkl_tfconversion_pass.cc +++ b/tensorflow/core/graph/mkl_tfconversion_pass.cc @@ -18,7 +18,6 @@ limitations under the License. #include <memory> #include <queue> #include <set> -#include <string> #include <utility> #include <vector> diff --git a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc index bbdbe78bbd..ebcb6de551 100644 --- a/tensorflow/core/graph/mkl_tfconversion_pass_test.cc +++ b/tensorflow/core/graph/mkl_tfconversion_pass_test.cc @@ -19,7 +19,6 @@ limitations under the License. #include "tensorflow/core/graph/mkl_graph_util.h" #include <algorithm> -#include <string> #include <vector> #include "tensorflow/core/framework/op.h" |