diff options
22 files changed, 94 insertions, 70 deletions
diff --git a/tensorflow/core/lib/strings/numbers.cc b/tensorflow/core/lib/strings/numbers.cc index 516decc3c0..8f34baa7de 100644 --- a/tensorflow/core/lib/strings/numbers.cc +++ b/tensorflow/core/lib/strings/numbers.cc @@ -23,6 +23,7 @@ limitations under the License. #include <locale> #include <unordered_map> +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/lib/strings/stringprintf.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/macros.h" @@ -203,7 +204,7 @@ bool safe_strto64(StringPiece str, int64* value) { int64 vlimit = kint64max; int sign = 1; - if (str.Consume("-")) { + if (str_util::ConsumePrefix(&str, "-")) { sign = -1; // Different limit for positive and negative integers. vlimit = kint64min; @@ -265,7 +266,7 @@ bool safe_strto32(StringPiece str, int32* value) { int64 vmax = kint32max; int sign = 1; - if (str.Consume("-")) { + if (str_util::ConsumePrefix(&str, "-")) { sign = -1; // Different max for positive and negative integers. ++vmax; diff --git a/tensorflow/core/lib/strings/ordered_code_test.cc b/tensorflow/core/lib/strings/ordered_code_test.cc index fee8a6f93e..ede9f4d390 100644 --- a/tensorflow/core/lib/strings/ordered_code_test.cc +++ b/tensorflow/core/lib/strings/ordered_code_test.cc @@ -22,6 +22,7 @@ limitations under the License. #include "tensorflow/core/lib/core/stringpiece.h" #include "tensorflow/core/lib/random/simple_philox.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/test.h" #include "tensorflow/core/platform/test_benchmark.h" @@ -128,7 +129,7 @@ void TestWriteAppends(T first, U second) { string encoded_first_only = encoded; OCWriteToString<U>(&encoded, second); EXPECT_NE(encoded, encoded_first_only); - EXPECT_TRUE(StringPiece(encoded).starts_with(encoded_first_only)); + EXPECT_TRUE(str_util::StartsWith(encoded, encoded_first_only)); } template <typename T> diff --git a/tensorflow/core/lib/strings/scanner.h b/tensorflow/core/lib/strings/scanner.h index d3b63357ee..c82e771368 100644 --- a/tensorflow/core/lib/strings/scanner.h +++ b/tensorflow/core/lib/strings/scanner.h @@ -18,6 +18,7 @@ limitations under the License. #include <string> #include "tensorflow/core/lib/core/stringpiece.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/macros.h" namespace tensorflow { @@ -75,14 +76,14 @@ class Scanner { // Consume the next s.size() characters of the input, if they match <s>. If // they don't match <s>, this is a no-op. Scanner& ZeroOrOneLiteral(StringPiece s) { - cur_.Consume(s); + str_util::ConsumePrefix(&cur_, s); return *this; } // Consume the next s.size() characters of the input, if they match <s>. If // they don't match <s>, then GetResult will ultimately return false. Scanner& OneLiteral(StringPiece s) { - if (!cur_.Consume(s)) { + if (!str_util::ConsumePrefix(&cur_, s)) { error_ = true; } return *this; diff --git a/tensorflow/core/platform/cloud/BUILD b/tensorflow/core/platform/cloud/BUILD index 3ee7be3c4e..be84316c48 100644 --- a/tensorflow/core/platform/cloud/BUILD +++ b/tensorflow/core/platform/cloud/BUILD @@ -85,6 +85,7 @@ cc_library( ":retrying_utils", ":time_util", "//tensorflow/core:framework_headers_lib", + "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "@jsoncpp_git//:jsoncpp", ], @@ -263,6 +264,7 @@ tf_cc_test( deps = [ ":gcs_file_system", ":http_request_fake", + "//tensorflow/core:lib", "//tensorflow/core:test", "//tensorflow/core:test_main", ], diff --git a/tensorflow/core/platform/cloud/gcs_file_system.cc b/tensorflow/core/platform/cloud/gcs_file_system.cc index 1691826483..3c0dc13d75 100644 --- a/tensorflow/core/platform/cloud/gcs_file_system.cc +++ b/tensorflow/core/platform/cloud/gcs_file_system.cc @@ -172,7 +172,7 @@ Status ParseGcsPath(StringPiece fname, bool empty_object_ok, string* bucket, return errors::InvalidArgument("GCS path doesn't contain a bucket name: ", fname); } - objectp.Consume("/"); + str_util::ConsumePrefix(&objectp, "/"); *object = objectp.ToString(); if (!empty_object_ok && object->empty()) { return errors::InvalidArgument("GCS path doesn't contain an object name: ", @@ -535,7 +535,8 @@ class GcsWritableFile : public WritableFile { *uploaded = 0; } else { StringPiece range_piece(received_range); - range_piece.Consume("bytes="); // May or may not be present. + str_util::ConsumePrefix(&range_piece, + "bytes="); // May or may not be present. std::vector<int64> range_parts; if (!str_util::SplitAndParseAsInts(range_piece, '-', &range_parts) || range_parts.size() != 2) { @@ -1172,7 +1173,7 @@ Status GcsFileSystem::GetChildrenBounded(const string& dirname, // 'object_prefix', which is part of 'dirname', should be removed from // the beginning of 'name'. StringPiece relative_path(name); - if (!relative_path.Consume(object_prefix)) { + if (!str_util::ConsumePrefix(&relative_path, object_prefix)) { return errors::Internal(strings::StrCat( "Unexpected response: the returned file name ", name, " doesn't match the prefix ", object_prefix)); @@ -1201,7 +1202,7 @@ Status GcsFileSystem::GetChildrenBounded(const string& dirname, } const string& prefix_str = prefix.asString(); StringPiece relative_path(prefix_str); - if (!relative_path.Consume(object_prefix)) { + if (!str_util::ConsumePrefix(&relative_path, object_prefix)) { return errors::Internal( "Unexpected response: the returned folder name ", prefix_str, " doesn't match the prefix ", object_prefix); diff --git a/tensorflow/core/platform/cloud/gcs_file_system_test.cc b/tensorflow/core/platform/cloud/gcs_file_system_test.cc index 8516421614..2fbde9b6a7 100644 --- a/tensorflow/core/platform/cloud/gcs_file_system_test.cc +++ b/tensorflow/core/platform/cloud/gcs_file_system_test.cc @@ -16,6 +16,7 @@ limitations under the License. #include "tensorflow/core/platform/cloud/gcs_file_system.h" #include <fstream> #include "tensorflow/core/lib/core/status_test_util.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/cloud/http_request_fake.h" #include "tensorflow/core/platform/test.h" @@ -584,8 +585,9 @@ TEST(GcsFileSystemTest, NewWritableFile_ResumeUploadAllAttemptsFail) { TF_EXPECT_OK(file->Append("content2")); const auto& status = file->Close(); EXPECT_EQ(errors::Code::ABORTED, status.code()); - EXPECT_TRUE(StringPiece(status.error_message()) - .contains("All 10 retry attempts failed. The last failure: " + EXPECT_TRUE( + str_util::StrContains(status.error_message(), + "All 10 retry attempts failed. The last failure: " "Unavailable: important HTTP error 503")) << status; } @@ -641,13 +643,12 @@ TEST(GcsFileSystemTest, NewWritableFile_UploadReturns410) { const auto& status = file->Close(); EXPECT_EQ(errors::Code::UNAVAILABLE, status.code()); EXPECT_TRUE( - StringPiece(status.error_message()) - .contains( - "Upload to gs://bucket/path/writeable.txt failed, caused by: " - "Not found: important HTTP error 410")) + str_util::StrContains(status.error_message(), + "Upload to gs://bucket/path/writeable.txt failed, " + "caused by: Not found: important HTTP error 410")) << status; - EXPECT_TRUE(StringPiece(status.error_message()) - .contains("when uploading gs://bucket/path/writeable.txt")) + EXPECT_TRUE(str_util::StrContains( + status.error_message(), "when uploading gs://bucket/path/writeable.txt")) << status; } diff --git a/tensorflow/core/platform/cloud/retrying_file_system_test.cc b/tensorflow/core/platform/cloud/retrying_file_system_test.cc index d3f763bb3c..ee6886fef7 100644 --- a/tensorflow/core/platform/cloud/retrying_file_system_test.cc +++ b/tensorflow/core/platform/cloud/retrying_file_system_test.cc @@ -16,6 +16,7 @@ limitations under the License. #include "tensorflow/core/platform/cloud/retrying_file_system.h" #include <fstream> #include "tensorflow/core/lib/core/status_test_util.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/test.h" namespace tensorflow { @@ -245,7 +246,7 @@ TEST(RetryingFileSystemTest, NewRandomAccessFile_AllRetriesFailed) { char scratch[10]; const auto& status = random_access_file->Read(0, 10, &result, scratch); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } @@ -399,7 +400,7 @@ TEST(RetryingFileSystemTest, NewWritableFile_AllRetriesFailed) { // Use it and check the results. const auto& status = writable_file->Sync(); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } @@ -428,7 +429,7 @@ TEST(RetryingFileSystemTest, NewReadOnlyMemoryRegionFromFile_AllRetriesFailed) { const auto& status = fs.NewReadOnlyMemoryRegionFromFile("filename.txt", &result); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } @@ -454,7 +455,7 @@ TEST(RetryingFileSystemTest, GetChildren_AllRetriesFailed) { std::vector<string> result; const auto& status = fs.GetChildren("gs://path", &result); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } @@ -481,7 +482,7 @@ TEST(RetryingFileSystemTest, GetMatchingPaths_AllRetriesFailed) { std::vector<string> result; const auto& status = fs.GetMatchingPaths("gs://path/dir", &result); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } @@ -506,7 +507,7 @@ TEST(RetryingFileSystemTest, DeleteFile_AllRetriesFailed) { std::vector<string> result; const auto& status = fs.DeleteFile("gs://path/file.txt"); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } @@ -531,7 +532,7 @@ TEST(RetryingFileSystemTest, CreateDir_AllRetriesFailed) { std::vector<string> result; const auto& status = fs.CreateDir("gs://path/newdir"); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } @@ -556,7 +557,7 @@ TEST(RetryingFileSystemTest, DeleteDir_AllRetriesFailed) { std::vector<string> result; const auto& status = fs.DeleteDir("gs://path/dir"); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } @@ -582,7 +583,7 @@ TEST(RetryingFileSystemTest, GetFileSize_AllRetriesFailed) { uint64 size; const auto& status = fs.GetFileSize("gs://path/file.txt", &size); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } @@ -605,7 +606,7 @@ TEST(RetryingFileSystemTest, RenameFile_AllRetriesFailed) { const auto& status = fs.RenameFile("old_name", "new_name"); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } @@ -630,7 +631,7 @@ TEST(RetryingFileSystemTest, Stat_AllRetriesFailed) { FileStatistics stat; const auto& status = fs.Stat("file_name", &stat); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } @@ -642,7 +643,7 @@ TEST(RetryingFileSystemTest, FileExists_AllRetriesFailed) { const auto& status = fs.FileExists("file_name"); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } @@ -677,7 +678,7 @@ TEST(RetryingFileSystemTest, IsDirectory_AllRetriesFailed) { const auto& status = fs.IsDirectory("gs://path/dir"); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } @@ -706,7 +707,7 @@ TEST(RetryingFileSystemTest, DeleteRecursively_AllRetriesFailed) { const auto& status = fs.DeleteRecursively("gs://path/dir", &undeleted_files, &undeleted_dirs); EXPECT_TRUE( - StringPiece(status.error_message()).contains("Retriable error #10")) + str_util::StrContains(status.error_message(), "Retriable error #10")) << status; } diff --git a/tensorflow/core/platform/cloud/retrying_utils_test.cc b/tensorflow/core/platform/cloud/retrying_utils_test.cc index 6eb340e094..1b6527618a 100644 --- a/tensorflow/core/platform/cloud/retrying_utils_test.cc +++ b/tensorflow/core/platform/cloud/retrying_utils_test.cc @@ -16,6 +16,7 @@ limitations under the License. #include "tensorflow/core/platform/cloud/retrying_utils.h" #include <fstream> #include "tensorflow/core/lib/core/status_test_util.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/env.h" #include "tensorflow/core/platform/test.h" @@ -31,10 +32,9 @@ TEST(RetryingUtilsTest, CallWithRetries_RetryDelays) { const auto& status = RetryingUtils::CallWithRetries(f, 500000L, sleep); EXPECT_EQ(errors::Code::ABORTED, status.code()); - EXPECT_TRUE(StringPiece(status.error_message()) - .contains("All 10 retry attempts " - "failed. The last failure: " - "Unavailable: Failed.")) + EXPECT_TRUE(str_util::StrContains( + status.error_message(), + "All 10 retry attempts failed. The last failure: Unavailable: Failed.")) << status; EXPECT_EQ(10, requested_delays.size()); diff --git a/tensorflow/core/util/command_line_flags.cc b/tensorflow/core/util/command_line_flags.cc index 3efc703faf..480ce94fca 100644 --- a/tensorflow/core/util/command_line_flags.cc +++ b/tensorflow/core/util/command_line_flags.cc @@ -17,6 +17,7 @@ limitations under the License. #include <vector> #include "tensorflow/core/lib/core/stringpiece.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/lib/strings/stringprintf.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/util/command_line_flags.h" @@ -28,7 +29,9 @@ bool ParseStringFlag(tensorflow::StringPiece arg, tensorflow::StringPiece flag, const std::function<bool(string)>& hook, bool* value_parsing_ok) { *value_parsing_ok = true; - if (arg.Consume("--") && arg.Consume(flag) && arg.Consume("=")) { + if (str_util::ConsumePrefix(&arg, "--") && + str_util::ConsumePrefix(&arg, flag) && + str_util::ConsumePrefix(&arg, "=")) { *value_parsing_ok = hook(arg.ToString()); return true; } @@ -40,7 +43,9 @@ bool ParseInt32Flag(tensorflow::StringPiece arg, tensorflow::StringPiece flag, const std::function<bool(int32)>& hook, bool* value_parsing_ok) { *value_parsing_ok = true; - if (arg.Consume("--") && arg.Consume(flag) && arg.Consume("=")) { + if (str_util::ConsumePrefix(&arg, "--") && + str_util::ConsumePrefix(&arg, flag) && + str_util::ConsumePrefix(&arg, "=")) { char extra; int32 parsed_int32; if (sscanf(arg.data(), "%d%c", &parsed_int32, &extra) != 1) { @@ -60,7 +65,9 @@ bool ParseInt64Flag(tensorflow::StringPiece arg, tensorflow::StringPiece flag, const std::function<bool(int64)>& hook, bool* value_parsing_ok) { *value_parsing_ok = true; - if (arg.Consume("--") && arg.Consume(flag) && arg.Consume("=")) { + if (str_util::ConsumePrefix(&arg, "--") && + str_util::ConsumePrefix(&arg, flag) && + str_util::ConsumePrefix(&arg, "=")) { char extra; int64 parsed_int64; if (sscanf(arg.data(), "%lld%c", &parsed_int64, &extra) != 1) { @@ -80,7 +87,8 @@ bool ParseBoolFlag(tensorflow::StringPiece arg, tensorflow::StringPiece flag, const std::function<bool(bool)>& hook, bool* value_parsing_ok) { *value_parsing_ok = true; - if (arg.Consume("--") && arg.Consume(flag)) { + if (str_util::ConsumePrefix(&arg, "--") && + str_util::ConsumePrefix(&arg, flag)) { if (arg.empty()) { *value_parsing_ok = hook(true); return true; @@ -107,7 +115,9 @@ bool ParseFloatFlag(tensorflow::StringPiece arg, tensorflow::StringPiece flag, const std::function<bool(float)>& hook, bool* value_parsing_ok) { *value_parsing_ok = true; - if (arg.Consume("--") && arg.Consume(flag) && arg.Consume("=")) { + if (str_util::ConsumePrefix(&arg, "--") && + str_util::ConsumePrefix(&arg, flag) && + str_util::ConsumePrefix(&arg, "=")) { char extra; float parsed_float; if (sscanf(arg.data(), "%f%c", &parsed_float, &extra) != 1) { diff --git a/tensorflow/core/util/device_name_utils_test.cc b/tensorflow/core/util/device_name_utils_test.cc index c1bc0f3378..ff9c108f10 100644 --- a/tensorflow/core/util/device_name_utils_test.cc +++ b/tensorflow/core/util/device_name_utils_test.cc @@ -408,7 +408,7 @@ static void MergeDevNamesError(const string& name_a, const string& name_b, DeviceNameUtils::ParsedName target_a = Name(name_a); Status s = DeviceNameUtils::MergeDevNames(&target_a, Name(name_b)); EXPECT_EQ(s.code(), error::INVALID_ARGUMENT); - EXPECT_TRUE(StringPiece(s.error_message()).contains(expected_error_substr)) + EXPECT_TRUE(str_util::StrContains(s.error_message(), expected_error_substr)) << s; } diff --git a/tensorflow/core/util/equal_graph_def.cc b/tensorflow/core/util/equal_graph_def.cc index f1ec497a67..b87dce0dff 100644 --- a/tensorflow/core/util/equal_graph_def.cc +++ b/tensorflow/core/util/equal_graph_def.cc @@ -23,6 +23,7 @@ limitations under the License. #include "tensorflow/core/framework/node_def.pb.h" #include "tensorflow/core/framework/node_def_util.h" #include "tensorflow/core/lib/hash/hash.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/lib/strings/strcat.h" #include "tensorflow/core/platform/protobuf.h" @@ -144,7 +145,7 @@ bool EqualNodeDef(const NodeDef& actual, const NodeDef& expected, string* diff, int first_control_input = actual.input_size(); for (int i = 0; i < actual.input_size(); ++i) { - if (StringPiece(actual.input(i)).starts_with("^")) { + if (str_util::StartsWith(actual.input(i), "^")) { first_control_input = i; break; } @@ -240,7 +241,7 @@ uint64 NodeDefHash(const NodeDef& ndef, const EqualGraphDefOptions& options) { // Normal inputs. Order important. int first_control_input = ndef.input_size(); for (int i = 0; i < ndef.input_size(); ++i) { - if (StringPiece(ndef.input(i)).starts_with("^")) { + if (str_util::StartsWith(ndef.input(i), "^")) { first_control_input = i; break; } diff --git a/tensorflow/core/util/memmapped_file_system.cc b/tensorflow/core/util/memmapped_file_system.cc index ea0a381f4f..1fa6b8bec0 100644 --- a/tensorflow/core/util/memmapped_file_system.cc +++ b/tensorflow/core/util/memmapped_file_system.cc @@ -15,6 +15,7 @@ limitations under the License. #include "tensorflow/core/util/memmapped_file_system.h" #include "tensorflow/core/lib/core/errors.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/protobuf.h" #include "tensorflow/core/util/memmapped_file_system.pb.h" @@ -242,7 +243,7 @@ Status MemmappedFileSystem::InitializeFromFile(Env* env, } bool MemmappedFileSystem::IsMemmappedPackageFilename(const string& filename) { - return StringPiece(filename).starts_with(kMemmappedPackagePrefix); + return str_util::StartsWith(filename, kMemmappedPackagePrefix); } namespace { diff --git a/tensorflow/core/util/reporter_test.cc b/tensorflow/core/util/reporter_test.cc index 575c27d4ef..90ea09876e 100644 --- a/tensorflow/core/util/reporter_test.cc +++ b/tensorflow/core/util/reporter_test.cc @@ -29,7 +29,7 @@ namespace { // Tests of all the error paths in log_reader.cc follow: static void ExpectHasSubstr(StringPiece s, StringPiece expected) { - EXPECT_TRUE(StringPiece(s).contains(expected)) + EXPECT_TRUE(str_util::StrContains(s, expected)) << s << " does not contain " << expected; } diff --git a/tensorflow/core/util/tensor_slice_reader_test.cc b/tensorflow/core/util/tensor_slice_reader_test.cc index 010cc36823..3c9590e488 100644 --- a/tensorflow/core/util/tensor_slice_reader_test.cc +++ b/tensorflow/core/util/tensor_slice_reader_test.cc @@ -22,6 +22,7 @@ limitations under the License. #include "tensorflow/core/lib/core/status_test_util.h" #include "tensorflow/core/lib/core/stringpiece.h" #include "tensorflow/core/lib/io/path.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/lib/strings/strcat.h" #include "tensorflow/core/platform/env.h" #include "tensorflow/core/platform/logging.h" @@ -422,7 +423,7 @@ static void VersionTest(const VersionDef& versions, const string& error) { // Read it back in and verify that we get the expected error TensorSliceReader reader(path, OpenTableTensorSliceReader); EXPECT_TRUE(reader.status().code() == error::INVALID_ARGUMENT && - StringPiece(reader.status().error_message()).starts_with(error)) + str_util::StartsWith(reader.status().error_message(), error)) << "Expected error starting with '" << errors::InvalidArgument(error) << "', got '" << reader.status() << "'"; } diff --git a/tensorflow/core/util/tensor_slice_writer_test.cc b/tensorflow/core/util/tensor_slice_writer_test.cc index ff5bfd65ae..31397f11b6 100644 --- a/tensorflow/core/util/tensor_slice_writer_test.cc +++ b/tensorflow/core/util/tensor_slice_writer_test.cc @@ -22,6 +22,7 @@ limitations under the License. #include "tensorflow/core/lib/core/status_test_util.h" #include "tensorflow/core/lib/core/stringpiece.h" #include "tensorflow/core/lib/io/path.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/protobuf.h" #include "tensorflow/core/platform/test.h" @@ -333,8 +334,8 @@ TEST(TensorSliceWriteTest, SizeErrors) { const std::vector<int8> data(300000000, -1); Status s = writer.Add("test1", shape, slice, data.data()); EXPECT_EQ(s.code(), error::INVALID_ARGUMENT); - EXPECT_TRUE(StringPiece(s.error_message()) - .contains("Tensor slice is too large to serialize")); + EXPECT_TRUE(str_util::StrContains( + s.error_message(), "Tensor slice is too large to serialize")); } // Add a large string tensor slice, which will fail. @@ -344,8 +345,8 @@ TEST(TensorSliceWriteTest, SizeErrors) { const std::vector<string> data(256 * 1024, std::string(8192, 'f')); Status s = writer.Add("test2", shape, slice, data.data()); EXPECT_EQ(s.code(), error::INVALID_ARGUMENT); - EXPECT_TRUE(StringPiece(s.error_message()) - .contains("Tensor slice is too large to serialize")); + EXPECT_TRUE(str_util::StrContains( + s.error_message(), "Tensor slice is too large to serialize")); } } diff --git a/tensorflow/tools/graph_transforms/backports_test.cc b/tensorflow/tools/graph_transforms/backports_test.cc index ab9a61afa7..80a954e062 100644 --- a/tensorflow/tools/graph_transforms/backports_test.cc +++ b/tensorflow/tools/graph_transforms/backports_test.cc @@ -20,6 +20,7 @@ limitations under the License. #include "tensorflow/cc/ops/standard_ops.h" #include "tensorflow/core/framework/tensor_testutil.h" #include "tensorflow/core/lib/core/status_test_util.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/test.h" #include "tensorflow/core/platform/test_benchmark.h" #include "tensorflow/core/public/session.h" @@ -191,7 +192,7 @@ TEST(BackportTensorArrayV3Test, TestBackportTensorArrayV3Subtypes) { std::map<string, const NodeDef*> node_lookup; MapNamesToNodes(result, &node_lookup); ASSERT_EQ(1, node_lookup.count("v3_node")); - EXPECT_TRUE(StringPiece(node_lookup.at("v3_node")->op()).ends_with("V2")); + EXPECT_TRUE(str_util::EndsWith(node_lookup.at("v3_node")->op(), "V2")); } } diff --git a/tensorflow/tools/graph_transforms/fold_constants_test.cc b/tensorflow/tools/graph_transforms/fold_constants_test.cc index 6bfdfe43f5..a082399a87 100644 --- a/tensorflow/tools/graph_transforms/fold_constants_test.cc +++ b/tensorflow/tools/graph_transforms/fold_constants_test.cc @@ -24,6 +24,7 @@ limitations under the License. #include "tensorflow/core/framework/tensor_shape.pb.h" #include "tensorflow/core/framework/tensor_testutil.h" #include "tensorflow/core/lib/core/status_test_util.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/test.h" #include "tensorflow/core/platform/test_benchmark.h" #include "tensorflow/core/public/session.h" @@ -209,10 +210,10 @@ class ConstantFoldingTest : public ::testing::Test { for (const NodeDef& node : graph_def.node()) { const StringPiece name(node.name()); const int occurrence_count = folded_node_map.count(node.name()); - if (name.ends_with("expect_removed")) { + if (str_util::EndsWith(name, "expect_removed")) { EXPECT_EQ(0, occurrence_count) << "node.name()=" << node.name(); } - if (name.ends_with("expect_remains")) { + if (str_util::EndsWith(name, "expect_remains")) { EXPECT_EQ(1, occurrence_count) << "node.name()=" << node.name(); } } diff --git a/tensorflow/tools/graph_transforms/freeze_requantization_ranges.cc b/tensorflow/tools/graph_transforms/freeze_requantization_ranges.cc index 2436c7e4a2..f401723808 100644 --- a/tensorflow/tools/graph_transforms/freeze_requantization_ranges.cc +++ b/tensorflow/tools/graph_transforms/freeze_requantization_ranges.cc @@ -40,8 +40,8 @@ Status ExtractMinMaxRecords(const string& log_file_name, for (const string& file_line : file_lines) { // We expect to find a line with components separated by semicolons, so to // start make sure that the basic structure is in place/ - StringPiece line(file_line); - if (!line.contains(print_suffix + ";" + requant_prefix)) { + if (!str_util::StrContains(file_line, + print_suffix + ";" + requant_prefix)) { continue; } std::vector<string> line_parts = str_util::Split(file_line, ';'); @@ -53,8 +53,7 @@ Status ExtractMinMaxRecords(const string& log_file_name, bool min_max_found = false; int min_max_index; for (int i = 1; i < line_parts.size(); ++i) { - StringPiece line_part(line_parts[i]); - if (line_part.starts_with(requant_prefix)) { + if (str_util::StartsWith(line_parts[i], requant_prefix)) { min_max_found = true; min_max_index = i; } @@ -90,7 +89,7 @@ Status ExtractMinMaxRecords(const string& log_file_name, continue; } StringPiece name_string = line_parts[min_max_index - 1]; - if (!name_string.ends_with(print_suffix)) { + if (!str_util::EndsWith(name_string, print_suffix)) { continue; } string name = diff --git a/tensorflow/tools/graph_transforms/insert_logging.cc b/tensorflow/tools/graph_transforms/insert_logging.cc index e1ee2b420b..377665448c 100644 --- a/tensorflow/tools/graph_transforms/insert_logging.cc +++ b/tensorflow/tools/graph_transforms/insert_logging.cc @@ -19,6 +19,7 @@ limitations under the License. #include "tensorflow/core/graph/graph_constructor.h" #include "tensorflow/core/graph/node_builder.h" #include "tensorflow/core/graph/subgraph.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/init_main.h" #include "tensorflow/core/public/session.h" #include "tensorflow/core/util/command_line_flags.h" @@ -101,7 +102,7 @@ Status InsertLogging(const GraphDef& input_graph_def, const bool op_matches = (ops.count(node.op()) > 0); bool prefix_matches = false; for (const string& prefix : prefixes) { - if (StringPiece(node.name()).starts_with(prefix)) { + if (str_util::StartsWith(node.name(), prefix)) { prefix_matches = true; } } diff --git a/tensorflow/tools/graph_transforms/sparsify_gather.cc b/tensorflow/tools/graph_transforms/sparsify_gather.cc index 701e350fc3..cc82100148 100644 --- a/tensorflow/tools/graph_transforms/sparsify_gather.cc +++ b/tensorflow/tools/graph_transforms/sparsify_gather.cc @@ -22,6 +22,7 @@ limitations under the License. #include "tensorflow/core/graph/graph_constructor.h" #include "tensorflow/core/graph/node_builder.h" #include "tensorflow/core/graph/subgraph.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/init_main.h" #include "tensorflow/core/public/session.h" #include "tensorflow/core/util/command_line_flags.h" @@ -88,7 +89,7 @@ void CreateConstNode(const Tensor& tensor, const string& name, string GetMonolithicTensorKey(const string& tensor_slice_name) { std::vector<string> names = Split(tensor_slice_name, "/"); - if (StringPiece(names[names.size() - 1]).starts_with("part_")) { + if (str_util::StartsWith(names[names.size() - 1], "part_")) { CHECK_GE(names.size(), 2); names.pop_back(); } @@ -102,8 +103,8 @@ Status ObtainTensorSlice(const GraphDef& input_graph_def, for (const auto& node : input_graph_def.node()) { std::vector<string> node_name_parts = Split(node.name(), "/"); if (node_name_parts.size() == 2 && - StringPiece(node_name_parts[0]).starts_with("save") && - StringPiece(node_name_parts[1]).starts_with("Assign") && + str_util::StartsWith(node_name_parts[0], "save") && + str_util::StartsWith(node_name_parts[1], "Assign") && node.input(0) == target_name) { restore_node_name = node.input(1); break; diff --git a/tensorflow/tools/graph_transforms/transform_graph_test.cc b/tensorflow/tools/graph_transforms/transform_graph_test.cc index bc2412fcbd..b276229aa4 100644 --- a/tensorflow/tools/graph_transforms/transform_graph_test.cc +++ b/tensorflow/tools/graph_transforms/transform_graph_test.cc @@ -22,6 +22,7 @@ limitations under the License. #include "tensorflow/core/framework/tensor_testutil.h" #include "tensorflow/core/lib/core/status_test_util.h" #include "tensorflow/core/lib/io/path.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/test.h" #include "tensorflow/core/platform/test_benchmark.h" #include "tensorflow/core/public/session.h" @@ -112,12 +113,11 @@ class TransformGraphTest : public ::testing::Test { graph_transforms::MapNamesToNodes(out_graph_def, &out_node_map); for (const NodeDef& node : out_graph_def.node()) { - const StringPiece name(node.name()); const int occurrence_count = out_node_map.count(node.name()); - if (name.ends_with("expect_removed")) { + if (str_util::EndsWith(node.name(), "expect_removed")) { EXPECT_EQ(0, occurrence_count) << "node.name()=" << node.name(); } - if (name.ends_with("expect_remains")) { + if (str_util::EndsWith(node.name(), "expect_remains")) { EXPECT_EQ(1, occurrence_count) << "node.name()=" << node.name(); } } @@ -139,7 +139,7 @@ class TransformGraphTest : public ::testing::Test { Status no_such_status = TransformGraph({}, {}, {{"test_no_such_transform", {}}}, &graph_def); EXPECT_TRUE( - StringPiece(no_such_status.ToString()).contains("not recognized")); + str_util::StrContains(no_such_status.ToString(), "not recognized")); } void TestParseTransformParameters() { diff --git a/tensorflow/tools/graph_transforms/transform_utils.cc b/tensorflow/tools/graph_transforms/transform_utils.cc index 55f28a9e1d..367048965d 100644 --- a/tensorflow/tools/graph_transforms/transform_utils.cc +++ b/tensorflow/tools/graph_transforms/transform_utils.cc @@ -88,7 +88,7 @@ void NodeNamePartsFromInput(const string& input_name, string* prefix, *suffix = ":" + input_parts[1]; } StringPiece node_name_piece(input_parts[0]); - if (node_name_piece.Consume("^")) { + if (str_util::ConsumePrefix(&node_name_piece, "^")) { *prefix = "^"; } else { *prefix = ""; @@ -200,8 +200,7 @@ Status SortByExecutionOrder(const GraphDef& input_graph_def, // for merge only wait for one non-control input. int32 num_control_edges = 0; for (int i = 0; i < node_def.input_size(); ++i) { - StringPiece input_name(node_def.input(i)); - if (input_name.starts_with("^")) { + if (str_util::StartsWith(node_def.input(i), "^")) { num_control_edges++; } } @@ -504,7 +503,7 @@ Status RenameNodeInputs(const GraphDef& input_graph_def, const string& dest_name = input_to_rename.second; bool is_match; string match_name; - if (StringPiece(source_name).ends_with(":*")) { + if (str_util::EndsWith(source_name, ":*")) { is_match = true; string prefix; string unused_node_name; |