Skip to content

No public description #1518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
Open

No public description #1518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tensorflow_text/core/kernels/fast_wordpiece_tokenizer_model_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ class FastWordpieceBuilder {
int unk_token_id_ = -1;

// A wrapper to access the trie encoded by `trie_array_`.
absl::optional<trie_utils::DartsCloneTrieWrapper> trie_;
std::optional<trie_utils::DartsCloneTrieWrapper> trie_;

// The actual data of the trie.
std::vector<uint32_t> trie_array_;
Expand Down Expand Up @@ -271,7 +271,7 @@ absl::Status FastWordpieceBuilder::BuildModel(
}

// Determine `unk_token_id_`.
const absl::optional<int> unk_token_id = vocab_->LookupId(unk_token_);
const std::optional<int> unk_token_id = vocab_->LookupId(unk_token_);
if (!unk_token_id.has_value()) {
return absl::FailedPreconditionError("Cannot find unk_token in the vocab!");
}
Expand Down Expand Up @@ -309,7 +309,7 @@ FastWordpieceBuilder::PrepareVocabTokensToBuildTrie() {
std::vector<TrieVocabToken> tokens_to_build_trie;
tokens_to_build_trie.reserve(vocab_->Size());
for (int token_id = 0; token_id < vocab_->Size(); ++token_id) {
const absl::optional<absl::string_view> word = vocab_->LookupWord(token_id);
const std::optional<absl::string_view> word = vocab_->LookupWord(token_id);
if (!word.has_value()) {
return absl::FailedPreconditionError(
"Impossible. `token_id` is definitely within the range of vocab "
Expand Down Expand Up @@ -837,7 +837,7 @@ absl::Status FastWordpieceBuilder::PrecomputeResultForSuffixIndicator() {
return absl::FailedPreconditionError(status.error_msg);
}
for (int i = 0; i < subwords.size(); ++i) {
const absl::optional<int> subword_id = vocab_->LookupId(subwords[i]);
const std::optional<int> subword_id = vocab_->LookupId(subwords[i]);
if (!subword_id.has_value()) {
return absl::FailedPreconditionError(
"Impossible because `subwords[i]` must be in the vocabulary!");
Expand Down Expand Up @@ -877,7 +877,7 @@ absl::StatusOr<std::string> FastWordpieceBuilder::ExportToFlatBuffer() const {
if (support_detokenization_) {
vocab_fbs_vector.reserve(vocab_->Size());
for (int i = 0; i < vocab_->Size(); ++i) {
const absl::optional<absl::string_view> word = vocab_->LookupWord(i);
const std::optional<absl::string_view> word = vocab_->LookupWord(i);
if (!word.has_value()) {
return absl::FailedPreconditionError(
"Impossible. `token_id` is definitely within the range of vocab "
Expand Down
4 changes: 2 additions & 2 deletions tensorflow_text/core/kernels/phrase_tokenizer_model_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ absl::Status PhraseBuilder::BuildModel(const std::vector<std::string>& vocab,
}

// Determine `unk_token_id_`.
const absl::optional<int> unk_token_id = vocab_->LookupId(unk_token_);
const std::optional<int> unk_token_id = vocab_->LookupId(unk_token_);
if (!unk_token_id.has_value()) {
return absl::FailedPreconditionError("Cannot find unk_token in the vocab!");
}
Expand All @@ -93,7 +93,7 @@ absl::StatusOr<std::string> PhraseBuilder::ExportToFlatBuffer() const {
if (support_detokenization_) {
vocab_fbs_vector.reserve(vocab_->Size());
for (int i = 0; i < vocab_->Size(); ++i) {
const absl::optional<absl::string_view> word = vocab_->LookupWord(i);
const std::optional<absl::string_view> word = vocab_->LookupWord(i);
if (!word.has_value()) {
return absl::FailedPreconditionError(
"Impossible. `token_id` is definitely within the range of vocab "
Expand Down
4 changes: 2 additions & 2 deletions tensorflow_text/core/kernels/string_vocab.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ LookupStatus StringVocab::Contains(absl::string_view key, bool* value) const {
return LookupStatus();
}

absl::optional<int> StringVocab::LookupId(absl::string_view key) const {
std::optional<int> StringVocab::LookupId(absl::string_view key) const {
auto it = index_map_.find(key);
if (it == index_map_.end()) {
return absl::nullopt;
Expand All @@ -40,7 +40,7 @@ absl::optional<int> StringVocab::LookupId(absl::string_view key) const {
}

// Returns the key of `vocab_id` or empty if `vocab_id` is not valid.
absl::optional<absl::string_view> StringVocab::LookupWord(int vocab_id) const {
std::optional<absl::string_view> StringVocab::LookupWord(int vocab_id) const {
if (vocab_id >= vocab_.size() || vocab_id < 0) {
return absl::nullopt;
}
Expand Down
4 changes: 2 additions & 2 deletions tensorflow_text/core/kernels/string_vocab.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ class StringVocab : public WordpieceVocab {
StringVocab(const StringVocab&) = delete;
StringVocab& operator=(const StringVocab&) = delete;
LookupStatus Contains(absl::string_view key, bool* value) const override;
absl::optional<int> LookupId(absl::string_view key) const;
std::optional<int> LookupId(absl::string_view key) const;
// Returns the key of `vocab_id` or empty if `vocab_id` is not valid.
absl::optional<absl::string_view> LookupWord(int vocab_id) const;
std::optional<absl::string_view> LookupWord(int vocab_id) const;
int Size() const { return index_map_.size(); }

private:
Expand Down