Global search & replace to move to the new location for

tensorflow/core/ files and build targets.
Change: 113078322

tensorflow/cc/tutorials/example_trainer.cc

@@ -20,6 +20,7 @@ limitations under the License.
 
 #include "tensorflow/cc/ops/standard_ops.h"
 #include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/graph/default_device.h"
 #include "tensorflow/core/graph/graph_def_builder.h"
 #include "tensorflow/core/lib/core/threadpool.h"
@@ -28,7 +29,6 @@ limitations under the License.
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/public/session.h"
-#include "tensorflow/core/public/tensor.h"
 
 using tensorflow::string;
 using tensorflow::int32;

tensorflow/core/client/tensor_c_api.cc

@@ -18,16 +18,16 @@ limitations under the License.
 #include <memory>
 #include <vector>
 
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/lib/core/coding.h"
 #include "tensorflow/core/lib/core/errors.h"
+#include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/core/lib/core/stringpiece.h"
 #include "tensorflow/core/lib/gtl/array_slice.h"
-#include "tensorflow/core/platform/port.h"
 #include "tensorflow/core/platform/protobuf.h"
+#include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/public/session.h"
-#include "tensorflow/core/public/status.h"
-#include "tensorflow/core/public/tensor.h"
-#include "tensorflow/core/public/tensor_shape.h"
 
 // The implementation below is at the top level instead of the
 // brain namespace because we are defining 'extern "C"' functions.

tensorflow/core/client/tensor_c_api_test.cc

@@ -16,8 +16,8 @@ limitations under the License.
 #include "tensorflow/core/public/tensor_c_api.h"
 
 #include <vector>
+#include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/platform/test.h"
-#include "tensorflow/core/public/tensor.h"
 
 using tensorflow::Tensor;
 using tensorflow::TensorShape;

tensorflow/core/lib/hash/crc32c.h

@@ -17,7 +17,7 @@ limitations under the License.
 #define TENSORFLOW_LIB_HASH_CRC32C_H_
 
 #include <stddef.h>
-#include "tensorflow/core/platform/port.h"
+#include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
 namespace crc32c {

tensorflow/core/lib/hash/hash.cc

@@ -17,7 +17,7 @@ limitations under the License.
 
 #include "tensorflow/core/lib/core/raw_coding.h"
 #include "tensorflow/core/platform/macros.h"
-#include "tensorflow/core/platform/port.h"
+#include "tensorflow/core/platform/types.h"
 
 #include <string.h>
 

tensorflow/core/lib/hash/hash.h

@@ -23,7 +23,7 @@ limitations under the License.
 
 #include <string>
 
-#include "tensorflow/core/platform/port.h"
+#include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
 

tensorflow/core/lib/histogram/histogram.cc

@@ -21,7 +21,7 @@ limitations under the License.
 
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/mutex.h"
-#include "tensorflow/core/platform/port.h"
+#include "tensorflow/core/platform/types.h"
 namespace tensorflow {
 namespace histogram {
 

tensorflow/core/lib/histogram/histogram.h

@@ -21,8 +21,8 @@ limitations under the License.
 #include "tensorflow/core/lib/gtl/array_slice.h"
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mutex.h"
-#include "tensorflow/core/platform/port.h"
 #include "tensorflow/core/platform/thread_annotations.h"
+#include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
 

tensorflow/core/lib/png/png_io.cc

@@ -27,7 +27,7 @@ limitations under the License.
 #include "tensorflow/core/lib/png/png_io.h"
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/png.h"
-#include "tensorflow/core/platform/port.h"  // endian
+#include "tensorflow/core/platform/types.h"  // endian
 
 namespace tensorflow {
 namespace png {

tensorflow/core/platform/posix/env.cc

@@ -27,9 +27,9 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/core/lib/core/error_codes.pb.h"
+#include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/load_library.h"
 #include "tensorflow/core/platform/logging.h"
-#include "tensorflow/core/public/env.h"
 
 namespace tensorflow {
 

tensorflow/core/platform/posix/port.cc

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/core/platform/port.h"
+#include "tensorflow/core/platform/types.h"
 #if defined(__linux) && !defined(__ANDROID__)
 #include <sched.h>
 #endif

tensorflow/core/public/README.md

@@ -51,7 +51,7 @@ using the C++ Session API:
 
 #include "tensorflow/core/framework/graph.pb.h"
 #include "tensorflow/core/public/session.h"
-#include "tensorflow/core/public/tensor.h"
+#include "tensorflow/core/framework/tensor.h"
 
 int main(int argc, char** argv) {
   // Construct your graph.

tensorflow/core/public/session.h

@@ -20,10 +20,10 @@ limitations under the License.
 #include <vector>
 
 #include "tensorflow/core/framework/graph.pb.h"
-#include "tensorflow/core/public/env.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/public/session_options.h"
-#include "tensorflow/core/public/status.h"
-#include "tensorflow/core/public/tensor.h"
 
 namespace tensorflow {
 

tensorflow/core/public/session_options.h

@@ -18,7 +18,7 @@ limitations under the License.
 
 #include <string>
 #include "tensorflow/core/framework/config.pb.h"
-#include "tensorflow/core/platform/port.h"
+#include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
 

tensorflow/examples/label_image/main.cc

@@ -37,6 +37,7 @@ limitations under the License.
 #include "tensorflow/cc/ops/image_ops.h"
 #include "tensorflow/cc/ops/standard_ops.h"
 #include "tensorflow/core/framework/graph.pb.h"
+#include "tensorflow/core/framework/tensor.h"
 #include "tensorflow/core/graph/default_device.h"
 #include "tensorflow/core/graph/graph_def_builder.h"
 #include "tensorflow/core/lib/core/errors.h"
@@ -48,7 +49,6 @@ limitations under the License.
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/types.h"
 #include "tensorflow/core/public/session.h"
-#include "tensorflow/core/public/tensor.h"
 #include "tensorflow/examples/label_image/command_line_flags.h"
 
 // These are all common classes it's handy to reference with no namespace.

tensorflow/python/lib/core/py_func.cc

@@ -22,7 +22,7 @@ limitations under the License.
 #include "tensorflow/core/lib/core/threadpool.h"
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mutex.h"
-#include "tensorflow/core/platform/port.h"
+#include "tensorflow/core/platform/types.h"
 
 // Return type of import_array() changed between Python 2 and 3
 // NUMPY_IMPORT_ARRAY_RETVAL is NULL for Python 3

tensorflow/python/lib/core/py_func.h

@@ -16,8 +16,8 @@ limitations under the License.
 #ifndef TENSORFLOW_PYTHON_LIB_CORE_PY_FUNC_H_
 #define TENSORFLOW_PYTHON_LIB_CORE_PY_FUNC_H_
 
-#include "tensorflow/core/public/status.h"
-#include "tensorflow/core/public/tensor.h"
+#include "tensorflow/core/framework/tensor.h"
+#include "tensorflow/core/lib/core/status.h"
 
 #include <Python.h>
 

tensorflow/python/platform/base.i

@@ -17,7 +17,7 @@ limitations under the License.
 //
 %{
   #include <memory>
-  #include "tensorflow/core/platform/port.h"
+  #include "tensorflow/core/platform/types.h"
   using tensorflow::uint64;
   using tensorflow::string;
 

tensorflow/stream_executor/lib/env.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_STREAM_EXECUTOR_LIB_ENV_H_
 #define TENSORFLOW_STREAM_EXECUTOR_LIB_ENV_H_
 
-#include "tensorflow/core/public/env.h"
+#include "tensorflow/core/platform/env.h"
 #include "tensorflow/stream_executor/lib/stringpiece.h"
 #include "tensorflow/stream_executor/platform/port.h"
 

tensorflow/stream_executor/lib/status.h

@@ -18,7 +18,7 @@ limitations under the License.
 #ifndef TENSORFLOW_STREAM_EXECUTOR_LIB_STATUS_H_
 #define TENSORFLOW_STREAM_EXECUTOR_LIB_STATUS_H_
 
-#include "tensorflow/core/public/status.h"
+#include "tensorflow/core/lib/core/status.h"
 #include "tensorflow/stream_executor/lib/error.h"  // IWYU pragma: export
 #include "tensorflow/stream_executor/platform/logging.h"
 

tensorflow/stream_executor/lib/thread_options.h

@@ -16,7 +16,7 @@ limitations under the License.
 #ifndef TENSORFLOW_STREAM_EXECUTOR_LIB_THREAD_OPTIONS_H_
 #define TENSORFLOW_STREAM_EXECUTOR_LIB_THREAD_OPTIONS_H_
 
-#include "tensorflow/core/public/env.h"
+#include "tensorflow/core/platform/env.h"
 
 namespace perftools {
 namespace gputools {

tensorflow/stream_executor/platform/mutex.h

@@ -17,7 +17,7 @@ limitations under the License.
 #define TENSORFLOW_STREAM_EXECUTOR_PLATFORM_MUTEX_H_
 
 #include "tensorflow/core/platform/mutex.h"
-#include "tensorflow/core/platform/port.h"
+#include "tensorflow/core/platform/types.h"
 
 #if defined(PLATFORM_GOOGLE)
 #include "tensorflow/stream_executor/platform/google/mutex.h"

tensorflow/stream_executor/platform/port.h

@@ -20,7 +20,7 @@ limitations under the License.
 
 #include "tensorflow/core/platform/macros.h"
 #include "tensorflow/core/platform/mutex.h"
-#include "tensorflow/core/platform/port.h"
+#include "tensorflow/core/platform/types.h"
 
 namespace perftools {
 namespace gputools {