Remove old forwarding headers and build rules.

Change: 113575334

tensorflow/core/BUILD

@@ -123,12 +123,10 @@ cc_library(
         "platform/macros.h",
         "platform/mem.h",
         "platform/mutex.h",
-        "platform/port.h",  # TODO(josh11b): delete
         "platform/protobuf.h",  # TODO(josh11b): make internal
         "platform/regexp.h",
         "platform/thread_annotations.h",
         "platform/types.h",
-        "public/status.h",  # Deprecated: use lib/core/status.h instead
     ],
     visibility = ["//visibility:public"],
     deps = [":lib_internal"],
@@ -168,9 +166,9 @@ tf_cuda_library(
         "framework/control_flow.h",  # TODO(josh11b): Make internal?
         "framework/device_base.h",
         "framework/function.h",
-        "framework/node_def_builder.h",
         "framework/kernel_def_builder.h",
         "framework/lookup_interface.h",
+        "framework/node_def_builder.h",
         "framework/node_def_util.h",
         "framework/numeric_op.h",
         "framework/numeric_types.h",
@@ -190,13 +188,9 @@ tf_cuda_library(
         "framework/tensor_slice.h",
         "framework/tensor_types.h",
         "framework/tensor_util.h",
-        "framework/type_traits.h",
         "framework/type_index.h",
+        "framework/type_traits.h",
         "framework/types.h",
-        # Deprecated. TODO(josh11b): Use the framework/ versions instead.
-        "public/tensor.h",
-        "public/tensor_shape.h",
-        # NOTE(josh11b): Will stay in public/
         "public/version.h",
         "util/bcast.h",
         "util/cuda_kernel_helper.h",
@@ -208,8 +202,8 @@ tf_cuda_library(
         "util/saved_tensor_slice_util.h",
         "util/sparse/group_iterator.h",
         "util/sparse/sparse_tensor.h",
-        "util/tensor_slice_reader_cache.h",
         "util/tensor_slice_reader.h",
+        "util/tensor_slice_reader_cache.h",
         "util/tensor_slice_writer.h",
         "util/use_cudnn.h",
         "util/util.h",
@@ -719,9 +713,7 @@ cc_library(
         "framework/tensor.h",
         "platform/env.h",
         "platform/logging.h",
-        "platform/port.h",
         "public/session.h",
-        "public/tensor.h",
     ],
     copts = [
         "-mfpu=neon",
@@ -752,7 +744,6 @@ cc_library(
             "lib/**/*.cc",
             "platform/*.h",
             "platform/*.cc",
-            "public/status.h",  # TODO(josh11b): delete this
         ] + tf_additional_lib_srcs(),
         exclude = [
             "**/*test*",
@@ -796,10 +787,6 @@ tf_cuda_library(
             "framework/**/*.cc",
             "util/**/*.h",
             "util/**/*.cc",
-            # TODO(josh11b): Delete these once everyone has switched to the
-            # framework/ versions.
-            "public/tensor.h",
-            "public/tensor_shape.h",
         ],
         exclude = [
             "**/*test*",

tensorflow/core/kernels/depthtospace_op.cc

@@ -30,7 +30,7 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/platform/logging.h"
-#include "tensorflow/core/platform/port.h"
+#include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
 

tensorflow/core/kernels/spacetodepth_op.cc

@@ -30,7 +30,7 @@ limitations under the License.
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/platform/logging.h"
-#include "tensorflow/core/platform/port.h"
+#include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
 

tensorflow/core/platform/port.h

@@ -1,21 +0,0 @@
-/* Copyright 2015 Google Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifndef TENSORFLOW_PLATFORM_PORT_H_
-#define TENSORFLOW_PLATFORM_PORT_H_
-
-#include "tensorflow/core/platform/types.h"
-
-#endif  // TENSORFLOW_PLATFORM_PORT_H_

tensorflow/core/public/status.h

@@ -1,22 +0,0 @@
-/* Copyright 2015 Google Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifndef TENSORFLOW_PUBLIC_STATUS_H_
-#define TENSORFLOW_PUBLIC_STATUS_H_
-
-// This file is deprecated, use ../lib/core/status.h instead.
-#include "tensorflow/core/lib/core/status.h"
-
-#endif  // TENSORFLOW_PUBLIC_STATUS_H_

tensorflow/core/public/tensor.h

@@ -1,22 +0,0 @@
-/* Copyright 2015 Google Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifndef TENSORFLOW_PUBLIC_TENSOR_H_
-#define TENSORFLOW_PUBLIC_TENSOR_H_
-
-// This file is deprecated, use ../framework/tensor.h instead.
-#include "tensorflow/core/framework/tensor.h"
-
-#endif  // TENSORFLOW_PUBLIC_TENSOR_H_

tensorflow/core/public/tensor_shape.h

@@ -1,22 +0,0 @@
-/* Copyright 2015 Google Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifndef TENSORFLOW_PUBLIC_TENSOR_SHAPE_H_
-#define TENSORFLOW_PUBLIC_TENSOR_SHAPE_H_
-
-// This file is deprecated, use ../framework/tensor_shape.h instead.
-#include "tensorflow/core/framework/tensor_shape.h"
-
-#endif  // TENSORFLOW_PUBLIC_TENSOR_SHAPE_H_