Skip to content

Commit

Permalink
Automated Code Change
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 626276362
  • Loading branch information
@tensorflower-gardener
tensorflower-gardener committed Apr 19, 2024
1 parent 0fe2bcd commit 7f5d552
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 44 deletions.
12 changes: 6 additions & 6 deletions tensorflow/core/summary/summary_converter.cc
View file
Expand Up @@ -58,7 +58,7 @@ Status TensorValueAt(Tensor t, int64_t i, T* out) {
" not supported.");
}
// clang-format on
return OkStatus();
return absl::OkStatus();
#undef CASE
#undef COMPLEX_CASE
}
Expand Down Expand Up @@ -102,7 +102,7 @@ Status AddImages(const string& tag, int max_images, int batch_size, int w,
return errors::Internal("PNG encoding failed");
}
}
return OkStatus();
return absl::OkStatus();
}

template <class T>
Expand Down Expand Up @@ -211,7 +211,7 @@ Status AddTensorAsScalarToSummary(const Tensor& t, const string& tag,
float value;
TF_RETURN_IF_ERROR(TensorValueAt<float>(t, 0, &value));
v->set_simple_value(value);
return OkStatus();
return absl::OkStatus();
}

Status AddTensorAsHistogramToSummary(const Tensor& t, const string& tag,
Expand All @@ -231,7 +231,7 @@ Status AddTensorAsHistogramToSummary(const Tensor& t, const string& tag,
histo.Add(double_val);
}
histo.EncodeToProto(v->mutable_histo(), false /* Drop zero buckets */);
return OkStatus();
return absl::OkStatus();
}

Status AddTensorAsImageToSummary(const Tensor& tensor, const string& tag,
Expand Down Expand Up @@ -280,7 +280,7 @@ Status AddTensorAsImageToSummary(const Tensor& tensor, const string& tag,
"Got ",
DataTypeString(tensor.dtype()));
}
return OkStatus();
return absl::OkStatus();
}

Status AddTensorAsAudioToSummary(const Tensor& tensor, const string& tag,
Expand Down Expand Up @@ -321,7 +321,7 @@ Status AddTensorAsAudioToSummary(const Tensor& tensor, const string& tag,
channels_by_frames.data(), sample_rate_truncated, num_channels,
length_frames, sa->mutable_encoded_audio_string()));
}
return OkStatus();
return absl::OkStatus();
}

} // namespace tensorflow
50 changes: 25 additions & 25 deletions tensorflow/core/summary/summary_db_writer.cc
View file
Expand Up @@ -109,7 +109,7 @@ Status CheckSupportedType(const Tensor& t) {
return errors::Unimplemented(DataTypeString(t.dtype()),
" tensors unsupported on platform");
}
return OkStatus();
return absl::OkStatus();
#undef CASE
}

Expand Down Expand Up @@ -226,7 +226,7 @@ class GraphWriter {
TF_RETURN_WITH_CONTEXT_IF_ERROR(saver.SaveNodeInputs(), "SaveNodeInputs");
TF_RETURN_WITH_CONTEXT_IF_ERROR(saver.SaveNodes(), "SaveNodes");
TF_RETURN_WITH_CONTEXT_IF_ERROR(saver.SaveGraph(run_id), "SaveGraph");
return OkStatus();
return absl::OkStatus();
}

private:
Expand Down Expand Up @@ -295,7 +295,7 @@ class GraphWriter {
TF_RETURN_IF_ERROR(MaybeFlush());
}
}
return OkStatus();
return absl::OkStatus();
}

Status SaveNodes() {
Expand Down Expand Up @@ -330,7 +330,7 @@ class GraphWriter {
TF_RETURN_WITH_CONTEXT_IF_ERROR(insert.StepAndReset(), node->name());
TF_RETURN_IF_ERROR(MaybeFlush());
}
return OkStatus();
return absl::OkStatus();
}

Status SaveGraph(int64_t run_id) {
Expand Down Expand Up @@ -361,7 +361,7 @@ class GraphWriter {
unflushed_bytes_, " bytes");
unflushed_bytes_ = 0;
}
return OkStatus();
return absl::OkStatus();
}

Sqlite* const db_;
Expand Down Expand Up @@ -428,7 +428,7 @@ class RunMetadata {
auto e = tag_ids_.find(tag_name);
if (e != tag_ids_.end()) {
*tag_id = e->second;
return OkStatus();
return absl::OkStatus();
}
TF_RETURN_IF_ERROR(ids_->CreateNewId(tag_id));
tag_ids_[tag_name] = *tag_id;
Expand Down Expand Up @@ -468,7 +468,7 @@ class RunMetadata {
private:
Status InitializeUser(Sqlite* db, uint64 now)
TF_EXCLUSIVE_LOCKS_REQUIRED(mu_) {
if (user_id_ != kAbsent || user_name_.empty()) return OkStatus();
if (user_id_ != kAbsent || user_name_.empty()) return absl::OkStatus();
const char* get_sql = R"sql(
SELECT user_id FROM Users WHERE user_name = ?
)sql";
Expand All @@ -479,7 +479,7 @@ class RunMetadata {
TF_RETURN_IF_ERROR(get.Step(&is_done));
if (!is_done) {
user_id_ = get.ColumnInt(0);
return OkStatus();
return absl::OkStatus();
}
TF_RETURN_IF_ERROR(ids_->CreateNewId(&user_id_));
const char* insert_sql = R"sql(
Expand All @@ -495,12 +495,12 @@ class RunMetadata {
insert.BindText(2, user_name_);
insert.BindDouble(3, DoubleTime(now));
TF_RETURN_IF_ERROR(insert.StepAndReset());
return OkStatus();
return absl::OkStatus();
}

Status InitializeExperiment(Sqlite* db, uint64 now, double computed_time)
TF_EXCLUSIVE_LOCKS_REQUIRED(mu_) {
if (experiment_name_.empty()) return OkStatus();
if (experiment_name_.empty()) return absl::OkStatus();
if (experiment_id_ == kAbsent) {
TF_RETURN_IF_ERROR(InitializeUser(db, now));
const char* get_sql = R"sql(
Expand Down Expand Up @@ -562,12 +562,12 @@ class RunMetadata {
update.BindInt(2, experiment_id_);
TF_RETURN_IF_ERROR(update.StepAndReset());
}
return OkStatus();
return absl::OkStatus();
}

Status InitializeRun(Sqlite* db, uint64 now, double computed_time)
TF_EXCLUSIVE_LOCKS_REQUIRED(mu_) {
if (run_name_.empty()) return OkStatus();
if (run_name_.empty()) return absl::OkStatus();
TF_RETURN_IF_ERROR(InitializeExperiment(db, now, computed_time));
if (run_id_ == kAbsent) {
TF_RETURN_IF_ERROR(ids_->CreateNewId(&run_id_));
Expand Down Expand Up @@ -606,7 +606,7 @@ class RunMetadata {
update.BindInt(2, run_id_);
TF_RETURN_IF_ERROR(update.StepAndReset());
}
return OkStatus();
return absl::OkStatus();
}

mutex mu_;
Expand Down Expand Up @@ -674,7 +674,7 @@ class SeriesWriter {
TF_RETURN_IF_ERROR(txn.Commit());
rowids_.clear();
}
return OkStatus();
return absl::OkStatus();
}

private:
Expand Down Expand Up @@ -718,7 +718,7 @@ class SeriesWriter {
stmt.BindBlobUnsafe(5, data);
stmt.BindInt(6, rowid);
TF_RETURN_IF_ERROR(stmt.StepAndReset());
return OkStatus();
return absl::OkStatus();
}

Status UpdateNdString(Sqlite* db, const Tensor& t, int64_t tensor_rowid)
Expand Down Expand Up @@ -748,7 +748,7 @@ class SeriesWriter {
inserter.BindBlobUnsafe(3, flat(i));
TF_RETURN_WITH_CONTEXT_IF_ERROR(inserter.StepAndReset(), "i=", i);
}
return OkStatus();
return absl::OkStatus();
}

Status Reserve(Sqlite* db, const Tensor& t) SQLITE_TRANSACTIONS_EXCLUDED(*db)
Expand Down Expand Up @@ -799,7 +799,7 @@ class SeriesWriter {
unflushed_bytes_ += reserved_bytes;
TF_RETURN_IF_ERROR(MaybeFlush(db, txn));
}
return OkStatus();
return absl::OkStatus();
}

Status MaybeFlush(Sqlite* db, SqliteTransaction* txn)
Expand All @@ -810,7 +810,7 @@ class SeriesWriter {
unflushed_bytes_, " bytes");
unflushed_bytes_ = 0;
}
return OkStatus();
return absl::OkStatus();
}

mutex mu_;
Expand Down Expand Up @@ -845,14 +845,14 @@ class RunWriter {
Status Finish(Sqlite* db) SQLITE_TRANSACTIONS_EXCLUDED(*db)
TF_LOCKS_EXCLUDED(mu_) {
mutex_lock lock(mu_);
if (series_writers_.empty()) return OkStatus();
if (series_writers_.empty()) return absl::OkStatus();
for (auto i = series_writers_.begin(); i != series_writers_.end(); ++i) {
if (!i->second) continue;
TF_RETURN_WITH_CONTEXT_IF_ERROR(i->second->Finish(db),
"finish tag_id=", i->first);
i->second.reset();
}
return OkStatus();
return absl::OkStatus();
}

private:
Expand Down Expand Up @@ -918,7 +918,7 @@ class SummaryDbWriter : public SummaryWriterInterface {
}
}

Status Flush() override { return OkStatus(); }
Status Flush() override { return absl::OkStatus(); }

Status WriteTensor(int64_t global_step, Tensor t, const string& tag,
const string& serialized_metadata) override {
Expand Down Expand Up @@ -994,7 +994,7 @@ class SummaryDbWriter : public SummaryWriterInterface {
run_.Append(db_, tag_id, step, now, computed_time, t),
meta_.user_name(), "/", meta_.experiment_name(), "/", meta_.run_name(),
"/", tag, "@", step);
return OkStatus();
return absl::OkStatus();
}

Status MigrateEvent(std::unique_ptr<Event> e) {
Expand All @@ -1021,7 +1021,7 @@ class SummaryDbWriter : public SummaryWriterInterface {
// TODO(@jart): Handle other stuff.
break;
}
return OkStatus();
return absl::OkStatus();
}

Status MigrateGraph(const Event* e, const string& graph_def) {
Expand Down Expand Up @@ -1053,7 +1053,7 @@ class SummaryDbWriter : public SummaryWriterInterface {
default:
break;
}
return OkStatus();
return absl::OkStatus();
}

Status MigrateTensor(const Event* e, Summary::Value* s, uint64 now) {
Expand Down Expand Up @@ -1150,7 +1150,7 @@ Status CreateSummaryDbWriter(Sqlite* db, const string& experiment_name,
const string& run_name, const string& user_name,
Env* env, SummaryWriterInterface** result) {
*result = new SummaryDbWriter(env, db, experiment_name, run_name, user_name);
return OkStatus();
return absl::OkStatus();
}

} // namespace tensorflow
8 changes: 4 additions & 4 deletions tensorflow/core/summary/summary_file_writer.cc
View file
Expand Up @@ -63,7 +63,7 @@ class SummaryFileWriter : public SummaryWriterInterface {
"Could not initialize events writer.");
last_flush_ = env_->NowMicros();
is_initialized_ = true;
return OkStatus();
return absl::OkStatus();
}

Status Flush() override {
Expand Down Expand Up @@ -157,7 +157,7 @@ class SummaryFileWriter : public SummaryWriterInterface {
env_->NowMicros() - last_flush_ > 1000 * flush_millis_) {
return InternalFlush();
}
return OkStatus();
return absl::OkStatus();
}

string DebugString() const override { return "SummaryFileWriter"; }
Expand All @@ -175,7 +175,7 @@ class SummaryFileWriter : public SummaryWriterInterface {
TF_RETURN_WITH_CONTEXT_IF_ERROR(events_writer_->Flush(),
"Could not flush events file.");
last_flush_ = env_->NowMicros();
return OkStatus();
return absl::OkStatus();
}

bool is_initialized_;
Expand Down Expand Up @@ -205,7 +205,7 @@ Status CreateSummaryFileWriter(int max_queue, int flush_millis,
return s;
}
*result = w;
return OkStatus();
return absl::OkStatus();
}

} // namespace tensorflow
18 changes: 9 additions & 9 deletions tensorflow/core/summary/summary_file_writer_test.cc
View file
Expand Up @@ -84,7 +84,7 @@ class SummaryFileWriterTest : public ::testing::Test {
if (!found) {
return errors::Unknown("Found no file for ", test_name);
}
return OkStatus();
return absl::OkStatus();
}

FakeClockEnv env_;
Expand All @@ -99,7 +99,7 @@ TEST_F(SummaryFileWriterTest, WriteTensor) {
2, one, "name",
SummaryMetadata().SerializeAsString()));
TF_RETURN_IF_ERROR(writer->Flush());
return OkStatus();
return absl::OkStatus();
},
[](const Event& e) {
EXPECT_EQ(e.step(), 2);
Expand All @@ -114,7 +114,7 @@ TEST_F(SummaryFileWriterTest, WriteTensor) {
TF_RETURN_IF_ERROR(writer->WriteTensor(
2, hello, "name", SummaryMetadata().SerializeAsString()));
TF_RETURN_IF_ERROR(writer->Flush());
return OkStatus();
return absl::OkStatus();
},
[](const Event& e) {
EXPECT_EQ(e.step(), 2);
Expand All @@ -133,7 +133,7 @@ TEST_F(SummaryFileWriterTest, WriteScalar) {
one.scalar<float>()() = 1.0;
TF_RETURN_IF_ERROR(writer->WriteScalar(2, one, "name"));
TF_RETURN_IF_ERROR(writer->Flush());
return OkStatus();
return absl::OkStatus();
},
[](const Event& e) {
EXPECT_EQ(e.step(), 2);
Expand All @@ -151,7 +151,7 @@ TEST_F(SummaryFileWriterTest, WriteHistogram) {
TF_RETURN_IF_ERROR(
writer->WriteHistogram(2, one, "name"));
TF_RETURN_IF_ERROR(writer->Flush());
return OkStatus();
return absl::OkStatus();
},
[](const Event& e) {
EXPECT_EQ(e.step(), 2);
Expand All @@ -173,7 +173,7 @@ static Status CreateImage(SummaryWriterInterface* writer) {
one.scalar<T>()() = T(1);
TF_RETURN_IF_ERROR(writer->WriteImage(2, one, "name", 1, bad_color));
TF_RETURN_IF_ERROR(writer->Flush());
return OkStatus();
return absl::OkStatus();
}

// Verify that the event contains an image generated by CreateImage above.
Expand Down Expand Up @@ -217,7 +217,7 @@ TEST_F(SummaryFileWriterTest, WriteAudio) {
one.scalar<float>()() = 1.0;
TF_RETURN_IF_ERROR(writer->WriteAudio(2, one, "name", 1, 1));
TF_RETURN_IF_ERROR(writer->Flush());
return OkStatus();
return absl::OkStatus();
},
[](const Event& e) {
EXPECT_EQ(e.step(), 2);
Expand All @@ -236,7 +236,7 @@ TEST_F(SummaryFileWriterTest, WriteEvent) {
e->mutable_summary()->add_value()->set_tag("hi");
TF_RETURN_IF_ERROR(writer->WriteEvent(std::move(e)));
TF_RETURN_IF_ERROR(writer->Flush());
return OkStatus();
return absl::OkStatus();
},
[](const Event& e) {
EXPECT_EQ(e.step(), 7);
Expand All @@ -254,7 +254,7 @@ TEST_F(SummaryFileWriterTest, WallTime) {
one.scalar<float>()() = 1.0;
TF_RETURN_IF_ERROR(writer->WriteScalar(2, one, "name"));
TF_RETURN_IF_ERROR(writer->Flush());
return OkStatus();
return absl::OkStatus();
},
[](const Event& e) { EXPECT_EQ(e.wall_time(), 7.023); }));
}
Expand Down

0 comments on commit 7f5d552

Please sign in to comment.