diff options
author | 2016-01-26 10:46:54 -0800 | |
---|---|---|
committer | 2016-01-26 11:00:22 -0800 | |
commit | 351e0289095b4e638e6ab71c8d69a61efca6ecb2 (patch) | |
tree | 03a36f9771f97ef3f02e43c7e7c466d4d436d2e6 /tensorflow | |
parent | 22550dbd074835ac127fc054ae623b5fc205a34b (diff) |
Global search & replace to move to the new location for
tensorflow/core/ files and build targets.
Change: 113073090
Diffstat (limited to 'tensorflow')
21 files changed, 32 insertions, 32 deletions
diff --git a/tensorflow/core/util/bcast.h b/tensorflow/core/util/bcast.h index 64576843ba..1d01ce809d 100644 --- a/tensorflow/core/util/bcast.h +++ b/tensorflow/core/util/bcast.h @@ -20,7 +20,7 @@ limitations under the License. #include "tensorflow/core/lib/gtl/inlined_vector.h" #include "tensorflow/core/platform/macros.h" -#include "tensorflow/core/platform/port.h" +#include "tensorflow/core/platform/types.h" namespace tensorflow { diff --git a/tensorflow/core/util/device_name_utils.h b/tensorflow/core/util/device_name_utils.h index d7c7949bc9..a375ca4427 100644 --- a/tensorflow/core/util/device_name_utils.h +++ b/tensorflow/core/util/device_name_utils.h @@ -18,8 +18,8 @@ limitations under the License. #include <string> +#include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/lib/core/stringpiece.h" -#include "tensorflow/core/public/status.h" namespace tensorflow { diff --git a/tensorflow/core/util/events_writer.cc b/tensorflow/core/util/events_writer.cc index ca0ce266d6..cfdbb07cd5 100644 --- a/tensorflow/core/util/events_writer.cc +++ b/tensorflow/core/util/events_writer.cc @@ -17,14 +17,14 @@ limitations under the License. #include <stddef.h> // for NULL +#include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/lib/io/path.h" #include "tensorflow/core/lib/strings/strcat.h" #include "tensorflow/core/lib/strings/stringprintf.h" +#include "tensorflow/core/platform/env.h" #include "tensorflow/core/platform/host_info.h" #include "tensorflow/core/platform/logging.h" -#include "tensorflow/core/platform/port.h" -#include "tensorflow/core/public/env.h" -#include "tensorflow/core/public/status.h" +#include "tensorflow/core/platform/types.h" #include "tensorflow/core/util/event.pb.h" namespace tensorflow { diff --git a/tensorflow/core/util/events_writer.h b/tensorflow/core/util/events_writer.h index 627f8771ae..826821de79 100644 --- a/tensorflow/core/util/events_writer.h +++ b/tensorflow/core/util/events_writer.h @@ -19,9 +19,9 @@ limitations under the License. #include <memory> #include <string> #include "tensorflow/core/lib/io/record_writer.h" +#include "tensorflow/core/platform/env.h" #include "tensorflow/core/platform/macros.h" -#include "tensorflow/core/platform/port.h" -#include "tensorflow/core/public/env.h" +#include "tensorflow/core/platform/types.h" #include "tensorflow/core/util/event.pb.h" namespace tensorflow { diff --git a/tensorflow/core/util/events_writer_test.cc b/tensorflow/core/util/events_writer_test.cc index f98f3195ca..1fd79cfee9 100644 --- a/tensorflow/core/util/events_writer_test.cc +++ b/tensorflow/core/util/events_writer_test.cc @@ -17,15 +17,15 @@ limitations under the License. #include <math.h> #include "tensorflow/core/lib/core/errors.h" +#include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/lib/core/status_test_util.h" #include "tensorflow/core/lib/io/path.h" #include "tensorflow/core/lib/io/record_reader.h" #include "tensorflow/core/lib/strings/strcat.h" +#include "tensorflow/core/platform/env.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/protobuf.h" #include "tensorflow/core/platform/test.h" -#include "tensorflow/core/public/env.h" -#include "tensorflow/core/public/status.h" #include "tensorflow/core/util/event.pb.h" namespace tensorflow { diff --git a/tensorflow/core/util/guarded_philox_random.h b/tensorflow/core/util/guarded_philox_random.h index 0440bae830..10b3eee1bc 100644 --- a/tensorflow/core/util/guarded_philox_random.h +++ b/tensorflow/core/util/guarded_philox_random.h @@ -20,7 +20,7 @@ limitations under the License. #include "tensorflow/core/lib/random/philox_random.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" namespace tensorflow { diff --git a/tensorflow/core/util/padding.h b/tensorflow/core/util/padding.h index 8fff42387a..d6d970d27a 100644 --- a/tensorflow/core/util/padding.h +++ b/tensorflow/core/util/padding.h @@ -22,7 +22,7 @@ limitations under the License. #include <string> #include "tensorflow/core/framework/graph.pb.h" -#include "tensorflow/core/public/status.h" +#include "tensorflow/core/lib/core/status.h" namespace tensorflow { diff --git a/tensorflow/core/util/saved_tensor_slice_util.h b/tensorflow/core/util/saved_tensor_slice_util.h index 40e3312b38..6c3759ffac 100644 --- a/tensorflow/core/util/saved_tensor_slice_util.h +++ b/tensorflow/core/util/saved_tensor_slice_util.h @@ -22,8 +22,8 @@ limitations under the License. #include "tensorflow/core/framework/tensor.pb.h" #include "tensorflow/core/framework/tensor_slice.h" #include "tensorflow/core/framework/types.h" +#include "tensorflow/core/lib/core/status.h" // for Status #include "tensorflow/core/platform/protobuf.h" -#include "tensorflow/core/public/status.h" // for Status namespace tensorflow { diff --git a/tensorflow/core/util/tensor_slice_reader.cc b/tensorflow/core/util/tensor_slice_reader.cc index 71d1d15e34..b8732b4773 100644 --- a/tensorflow/core/util/tensor_slice_reader.cc +++ b/tensorflow/core/util/tensor_slice_reader.cc @@ -22,9 +22,9 @@ limitations under the License. #include "tensorflow/core/lib/io/match.h" #include "tensorflow/core/lib/io/table.h" #include "tensorflow/core/lib/io/table_options.h" +#include "tensorflow/core/platform/env.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/protobuf.h" -#include "tensorflow/core/public/env.h" #include "tensorflow/core/util/saved_tensor_slice_util.h" #include "tensorflow/core/util/tensor_slice_util.h" diff --git a/tensorflow/core/util/tensor_slice_reader.h b/tensorflow/core/util/tensor_slice_reader.h index 5cd8b83670..19f8bd068a 100644 --- a/tensorflow/core/util/tensor_slice_reader.h +++ b/tensorflow/core/util/tensor_slice_reader.h @@ -23,17 +23,17 @@ limitations under the License. #include <unordered_map> #include <vector> +#include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/tensor_slice.h" #include "tensorflow/core/framework/types.pb.h" +#include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/lib/core/stringpiece.h" #include "tensorflow/core/lib/gtl/map_util.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/macros.h" #include "tensorflow/core/platform/mutex.h" -#include "tensorflow/core/platform/port.h" #include "tensorflow/core/platform/protobuf.h" -#include "tensorflow/core/public/status.h" -#include "tensorflow/core/public/tensor_shape.h" +#include "tensorflow/core/platform/types.h" #include "tensorflow/core/util/saved_tensor_slice.pb.h" #include "tensorflow/core/util/saved_tensor_slice_util.h" #include "tensorflow/core/util/tensor_slice_set.h" diff --git a/tensorflow/core/util/tensor_slice_reader_cache.h b/tensorflow/core/util/tensor_slice_reader_cache.h index d083402396..71ea46e715 100644 --- a/tensorflow/core/util/tensor_slice_reader_cache.h +++ b/tensorflow/core/util/tensor_slice_reader_cache.h @@ -22,9 +22,9 @@ limitations under the License. #include <unordered_map> +#include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/platform/mutex.h" -#include "tensorflow/core/platform/port.h" -#include "tensorflow/core/public/status.h" +#include "tensorflow/core/platform/types.h" #include "tensorflow/core/util/tensor_slice_reader.h" namespace tensorflow { diff --git a/tensorflow/core/util/tensor_slice_reader_test.cc b/tensorflow/core/util/tensor_slice_reader_test.cc index 1a2d866ee8..f1252b8b1e 100644 --- a/tensorflow/core/util/tensor_slice_reader_test.cc +++ b/tensorflow/core/util/tensor_slice_reader_test.cc @@ -21,9 +21,9 @@ limitations under the License. #include "tensorflow/core/lib/io/path.h" #include "tensorflow/core/lib/strings/strcat.h" #include "tensorflow/core/platform/logging.h" -#include "tensorflow/core/platform/port.h" #include "tensorflow/core/platform/protobuf.h" #include "tensorflow/core/platform/test.h" +#include "tensorflow/core/platform/types.h" #include "tensorflow/core/util/saved_tensor_slice_util.h" #include "tensorflow/core/util/tensor_slice_reader_cache.h" #include "tensorflow/core/util/tensor_slice_writer.h" diff --git a/tensorflow/core/util/tensor_slice_set.h b/tensorflow/core/util/tensor_slice_set.h index 4747968622..9a59eee443 100644 --- a/tensorflow/core/util/tensor_slice_set.h +++ b/tensorflow/core/util/tensor_slice_set.h @@ -26,12 +26,12 @@ limitations under the License. #include <unordered_map> #include <vector> +#include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/tensor_slice.h" #include "tensorflow/core/framework/types.h" +#include "tensorflow/core/lib/core/status.h" // for Status #include "tensorflow/core/lib/core/stringpiece.h" // for StringPiece -#include "tensorflow/core/platform/port.h" // for int64 -#include "tensorflow/core/public/status.h" // for Status -#include "tensorflow/core/public/tensor_shape.h" +#include "tensorflow/core/platform/types.h" // for int64 namespace tensorflow { diff --git a/tensorflow/core/util/tensor_slice_set_test.cc b/tensorflow/core/util/tensor_slice_set_test.cc index f85ee7a7dc..0aa8dc87c8 100644 --- a/tensorflow/core/util/tensor_slice_set_test.cc +++ b/tensorflow/core/util/tensor_slice_set_test.cc @@ -16,9 +16,9 @@ limitations under the License. #include "tensorflow/core/util/tensor_slice_set.h" #include <vector> +#include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/test.h" -#include "tensorflow/core/public/status.h" namespace tensorflow { diff --git a/tensorflow/core/util/tensor_slice_util.h b/tensorflow/core/util/tensor_slice_util.h index 27b0eb0915..eb74464828 100644 --- a/tensorflow/core/util/tensor_slice_util.h +++ b/tensorflow/core/util/tensor_slice_util.h @@ -16,9 +16,9 @@ limitations under the License. #ifndef TENSORFLOW_UTIL_TENSOR_SLICE_UTIL_H_ #define TENSORFLOW_UTIL_TENSOR_SLICE_UTIL_H_ +#include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/tensor_slice.h" #include "tensorflow/core/platform/logging.h" -#include "tensorflow/core/public/tensor_shape.h" namespace tensorflow { diff --git a/tensorflow/core/util/tensor_slice_writer.cc b/tensorflow/core/util/tensor_slice_writer.cc index 77418e5bac..3a5328f2ac 100644 --- a/tensorflow/core/util/tensor_slice_writer.cc +++ b/tensorflow/core/util/tensor_slice_writer.cc @@ -19,8 +19,8 @@ limitations under the License. #include "tensorflow/core/lib/io/table_builder.h" #include "tensorflow/core/lib/random/random.h" #include "tensorflow/core/lib/strings/strcat.h" +#include "tensorflow/core/platform/env.h" #include "tensorflow/core/platform/logging.h" -#include "tensorflow/core/public/env.h" #include "tensorflow/core/util/saved_tensor_slice_util.h" namespace tensorflow { diff --git a/tensorflow/core/util/tensor_slice_writer.h b/tensorflow/core/util/tensor_slice_writer.h index e78e46cc34..d3ae7754af 100644 --- a/tensorflow/core/util/tensor_slice_writer.h +++ b/tensorflow/core/util/tensor_slice_writer.h @@ -22,16 +22,16 @@ limitations under the License. #include <unordered_map> +#include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/tensor_slice.h" #include "tensorflow/core/framework/types.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/map_util.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/macros.h" -#include "tensorflow/core/platform/port.h" -#include "tensorflow/core/public/status.h" -#include "tensorflow/core/public/tensor_shape.h" +#include "tensorflow/core/platform/types.h" #include "tensorflow/core/util/saved_tensor_slice.pb.h" #include "tensorflow/core/util/saved_tensor_slice_util.h" diff --git a/tensorflow/core/util/use_cudnn.cc b/tensorflow/core/util/use_cudnn.cc index 5ff7cd98b4..069ec8d539 100644 --- a/tensorflow/core/util/use_cudnn.cc +++ b/tensorflow/core/util/use_cudnn.cc @@ -17,7 +17,7 @@ limitations under the License. #include <stdlib.h> -#include "tensorflow/core/platform/port.h" +#include "tensorflow/core/platform/types.h" namespace tensorflow { diff --git a/tensorflow/core/util/util.h b/tensorflow/core/util/util.h index 2c5ccd3f4f..d47c2d3394 100644 --- a/tensorflow/core/util/util.h +++ b/tensorflow/core/util/util.h @@ -16,8 +16,8 @@ limitations under the License. #ifndef TENSORFLOW_UTIL_UTIL_H_ #define TENSORFLOW_UTIL_UTIL_H_ +#include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/lib/core/stringpiece.h" -#include "tensorflow/core/public/tensor_shape.h" namespace tensorflow { diff --git a/tensorflow/core/util/work_sharder.h b/tensorflow/core/util/work_sharder.h index 94b6397274..ad21100b00 100644 --- a/tensorflow/core/util/work_sharder.h +++ b/tensorflow/core/util/work_sharder.h @@ -19,7 +19,7 @@ limitations under the License. #include <functional> #include "tensorflow/core/lib/core/threadpool.h" -#include "tensorflow/core/platform/port.h" +#include "tensorflow/core/platform/types.h" namespace tensorflow { diff --git a/tensorflow/core/util/work_sharder_test.cc b/tensorflow/core/util/work_sharder_test.cc index 6b5bdb6225..3772bf9bca 100644 --- a/tensorflow/core/util/work_sharder_test.cc +++ b/tensorflow/core/util/work_sharder_test.cc @@ -19,9 +19,9 @@ limitations under the License. #include "tensorflow/core/lib/core/threadpool.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/mutex.h" -#include "tensorflow/core/platform/port.h" #include "tensorflow/core/platform/test.h" #include "tensorflow/core/platform/test_benchmark.h" +#include "tensorflow/core/platform/types.h" namespace tensorflow { namespace { |