From e588a79e86dc20f2bcede6057d20b89cd45e48f6 Mon Sep 17 00:00:00 2001 From: Nathan Memmott Date: Wed, 17 Jun 2026 11:51:42 -0700 Subject: [PATCH 1/7] Fix absl includes --- .../src/cmake/modify_headers.cmake | 4 +-- .../sentencepiece/src/src/bpe_model.cc | 8 ++--- third_party/sentencepiece/src/src/bpe_model.h | 2 +- .../src/src/bpe_model_trainer.cc | 14 ++++----- .../sentencepiece/src/src/bpe_model_trainer.h | 6 ++-- .../src/src/bpe_model_trainer_test.cc | 4 +-- third_party/sentencepiece/src/src/builder.cc | 18 +++++------ third_party/sentencepiece/src/src/builder.h | 4 +-- .../sentencepiece/src/src/builder_test.cc | 4 +-- .../sentencepiece/src/src/char_model.cc | 2 +- .../sentencepiece/src/src/char_model.h | 2 +- .../src/src/char_model_trainer.cc | 2 +- .../src/src/char_model_trainer.h | 2 +- .../src/src/char_model_trainer_test.cc | 4 +-- third_party/sentencepiece/src/src/common.h | 12 ++++---- .../src/src/compile_charsmap_main.cc | 8 ++--- .../sentencepiece/src/src/filesystem.cc | 4 +-- .../sentencepiece/src/src/filesystem.h | 4 +-- .../sentencepiece/src/src/filesystem_test.cc | 2 +- third_party/sentencepiece/src/src/init.cc | 12 ++++---- .../src/src/invalid_model_test.cc | 6 ++-- .../sentencepiece/src/src/model_interface.cc | 6 ++-- .../sentencepiece/src/src/model_interface.h | 6 ++-- .../src/src/model_interface_test.cc | 2 +- .../sentencepiece/src/src/normalizer.cc | 8 ++--- .../sentencepiece/src/src/normalizer.h | 4 +-- .../sentencepiece/src/src/normalizer_test.cc | 4 +-- .../src/src/pretokenizer_for_training.cc | 4 +-- .../src/src/pretokenizer_for_training.h | 4 +-- .../src/src/pretokenizer_for_training_test.cc | 10 +++---- .../src/src/sentencepiece_processor.cc | 28 ++++++++--------- .../src/src/sentencepiece_processor.h | 6 ++-- ...sentencepiece_processor_benchmarks_test.cc | 10 +++---- .../sentencepiece_processor_parallel_test.cc | 4 +-- .../src/src/sentencepiece_processor_test.cc | 8 ++--- .../src/src/sentencepiece_trainer.cc | 14 ++++----- .../src/src/sentencepiece_trainer.h | 6 ++-- .../src/src/sentencepiece_trainer_test.cc | 6 ++-- .../sentencepiece/src/src/spec_parser.h | 12 ++++---- .../sentencepiece/src/src/spm_decode_main.cc | 4 +-- .../sentencepiece/src/src/spm_encode_main.cc | 10 +++---- .../src/src/spm_export_vocab_main.cc | 2 +- .../src/src/spm_normalize_main.cc | 2 +- .../sentencepiece/src/src/spm_train_main.cc | 10 +++---- .../sentencepiece/src/src/testharness.cc | 2 +- .../sentencepiece/src/src/testharness.h | 6 ++-- .../src/src/trainer_interface.cc | 22 +++++++------- .../sentencepiece/src/src/trainer_interface.h | 6 ++-- .../src/src/trainer_interface_test.cc | 6 ++-- .../sentencepiece/src/src/unicode_script.cc | 2 +- .../src/src/unicode_script_map.h | 2 +- .../src/src/unicode_script_test.cc | 2 +- .../sentencepiece/src/src/unigram_model.cc | 12 ++++---- .../sentencepiece/src/src/unigram_model.h | 2 +- .../src/src/unigram_model_test.cc | 6 ++-- .../src/src/unigram_model_trainer.cc | 12 ++++---- .../src/src/unigram_model_trainer.h | 4 +-- .../src/src/unigram_model_trainer_test.cc | 4 +-- third_party/sentencepiece/src/src/util.cc | 10 +++---- third_party/sentencepiece/src/src/util.h | 30 +++++++++---------- .../sentencepiece/src/src/util_test.cc | 10 +++---- .../sentencepiece/src/src/word_model.cc | 2 +- .../sentencepiece/src/src/word_model.h | 2 +- .../src/src/word_model_trainer.cc | 6 ++-- .../src/src/word_model_trainer.h | 2 +- .../src/src/word_model_trainer_test.cc | 4 +-- 66 files changed, 224 insertions(+), 224 deletions(-) diff --git a/third_party/sentencepiece/src/cmake/modify_headers.cmake b/third_party/sentencepiece/src/cmake/modify_headers.cmake index 1ca6077956bd1..93eeda58e54c1 100644 --- a/third_party/sentencepiece/src/cmake/modify_headers.cmake +++ b/third_party/sentencepiece/src/cmake/modify_headers.cmake @@ -1,11 +1,11 @@ # CMake script to modify headers for installation -# Replaces #include "third_party/absl/..." with #include +# Replaces #include "absl/..." with #include if (NOT DEFINED INPUT_FILE OR NOT DEFINED OUTPUT_FILE) message(FATAL_ERROR "INPUT_FILE and OUTPUT_FILE must be defined") endif() file(READ "${INPUT_FILE}" content) -# Replace #include "third_party/absl/..."" with #include +# Replace #include "absl/..."" with #include string(REGEX REPLACE "#include \"third_party/(absl/[^\"]+)\"" "#include <\\1>" content "${content}") file(WRITE "${OUTPUT_FILE}" "${content}") diff --git a/third_party/sentencepiece/src/src/bpe_model.cc b/third_party/sentencepiece/src/src/bpe_model.cc index bc9d23de55608..8d03204151e70 100644 --- a/third_party/sentencepiece/src/src/bpe_model.cc +++ b/third_party/sentencepiece/src/src/bpe_model.cc @@ -25,10 +25,10 @@ #include "freelist.h" #include "model_interface.h" #include "sentencepiece_model.pb.h" -#include "third_party/absl/base/attributes.h" -#include "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/random/random.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/base/attributes.h" +#include "absl/container/flat_hash_map.h" +#include "absl/random/random.h" +#include "absl/strings/string_view.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/bpe_model.h b/third_party/sentencepiece/src/src/bpe_model.h index 11df76c3f8515..2385548314ee6 100644 --- a/third_party/sentencepiece/src/src/bpe_model.h +++ b/third_party/sentencepiece/src/src/bpe_model.h @@ -17,7 +17,7 @@ #include "model_interface.h" #include "sentencepiece_model.pb.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/strings/string_view.h" namespace sentencepiece { namespace bpe { diff --git a/third_party/sentencepiece/src/src/bpe_model_trainer.cc b/third_party/sentencepiece/src/src/bpe_model_trainer.cc index 57715d0fd2436..3594a66b053d9 100644 --- a/third_party/sentencepiece/src/src/bpe_model_trainer.cc +++ b/third_party/sentencepiece/src/src/bpe_model_trainer.cc @@ -20,13 +20,13 @@ #include #include "pretokenizer_for_training.h" -#include "third_party/absl/container/flat_hash_set.h" -#include "third_party/absl/flags/flag.h" -#include "third_party/absl/hash/hash.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/str_join.h" -#include "third_party/absl/strings/str_replace.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/container/flat_hash_set.h" +#include "absl/flags/flag.h" +#include "absl/hash/hash.h" +#include "absl/status/status.h" +#include "absl/strings/str_join.h" +#include "absl/strings/str_replace.h" +#include "absl/strings/string_view.h" #include "util.h" #ifdef SPM_NLCODEC_BPE diff --git a/third_party/sentencepiece/src/src/bpe_model_trainer.h b/third_party/sentencepiece/src/src/bpe_model_trainer.h index f01edbb54d5fd..b5ca82dd3c54d 100644 --- a/third_party/sentencepiece/src/src/bpe_model_trainer.h +++ b/third_party/sentencepiece/src/src/bpe_model_trainer.h @@ -23,9 +23,9 @@ #include #include "sentencepiece_model.pb.h" -#include "third_party/absl/container/btree_set.h" -#include "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/status/status.h" +#include "absl/container/btree_set.h" +#include "absl/container/flat_hash_map.h" +#include "absl/status/status.h" #include "trainer_interface.h" namespace sentencepiece::bpe { diff --git a/third_party/sentencepiece/src/src/bpe_model_trainer_test.cc b/third_party/sentencepiece/src/src/bpe_model_trainer_test.cc index b811adf5adb16..9dea38eabdde3 100644 --- a/third_party/sentencepiece/src/src/bpe_model_trainer_test.cc +++ b/third_party/sentencepiece/src/src/bpe_model_trainer_test.cc @@ -21,8 +21,8 @@ #include "sentencepiece_processor.h" #include "sentencepiece_trainer.h" #include "testharness.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_join.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_join.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/builder.cc b/third_party/sentencepiece/src/src/builder.cc index e8824867d3990..94fa4157ff3dd 100644 --- a/third_party/sentencepiece/src/src/builder.cc +++ b/third_party/sentencepiece/src/src/builder.cc @@ -19,15 +19,15 @@ #include #include "filesystem.h" -#include "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/container/flat_hash_set.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_join.h" -#include "third_party/absl/strings/str_replace.h" -#include "third_party/absl/strings/str_split.h" -#include "third_party/absl/strings/string_view.h" -#include "third_party/absl/strings/strip.h" +#include "absl/container/flat_hash_map.h" +#include "absl/container/flat_hash_set.h" +#include "absl/status/status.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_join.h" +#include "absl/strings/str_replace.h" +#include "absl/strings/str_split.h" +#include "absl/strings/string_view.h" +#include "absl/strings/strip.h" #ifdef ENABLE_NFKC_COMPILE #include diff --git a/third_party/sentencepiece/src/src/builder.h b/third_party/sentencepiece/src/src/builder.h index 9206f092092c3..8959e3e5f300e 100644 --- a/third_party/sentencepiece/src/src/builder.h +++ b/third_party/sentencepiece/src/src/builder.h @@ -22,8 +22,8 @@ #include "common.h" #include "sentencepiece_model.pb.h" #include "sentencepiece_processor.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/status/status.h" +#include "absl/strings/string_view.h" namespace sentencepiece::normalizer { diff --git a/third_party/sentencepiece/src/src/builder_test.cc b/third_party/sentencepiece/src/src/builder_test.cc index 8b785727e6f64..776eb211e0ff2 100644 --- a/third_party/sentencepiece/src/src/builder_test.cc +++ b/third_party/sentencepiece/src/src/builder_test.cc @@ -19,8 +19,8 @@ #include "normalizer.h" #include "sentencepiece_trainer.h" #include "testharness.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/char_model.cc b/third_party/sentencepiece/src/src/char_model.cc index 3cf3d07ec6640..9aea69c0d795b 100644 --- a/third_party/sentencepiece/src/src/char_model.cc +++ b/third_party/sentencepiece/src/src/char_model.cc @@ -14,7 +14,7 @@ #include "char_model.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/strings/string_view.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/char_model.h b/third_party/sentencepiece/src/src/char_model.h index 0af17d8c311f2..5fe22b5fd672d 100644 --- a/third_party/sentencepiece/src/src/char_model.h +++ b/third_party/sentencepiece/src/src/char_model.h @@ -17,7 +17,7 @@ #include "model_interface.h" #include "sentencepiece_model.pb.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/strings/string_view.h" namespace sentencepiece { namespace character { diff --git a/third_party/sentencepiece/src/src/char_model_trainer.cc b/third_party/sentencepiece/src/src/char_model_trainer.cc index c35c05980aab3..f11be3645b42c 100644 --- a/third_party/sentencepiece/src/src/char_model_trainer.cc +++ b/third_party/sentencepiece/src/src/char_model_trainer.cc @@ -17,7 +17,7 @@ #include #include "char_model.h" -#include "third_party/absl/status/status.h" +#include "absl/status/status.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/char_model_trainer.h b/third_party/sentencepiece/src/src/char_model_trainer.h index 01c59fc0e9ea8..119aba822ef0a 100644 --- a/third_party/sentencepiece/src/src/char_model_trainer.h +++ b/third_party/sentencepiece/src/src/char_model_trainer.h @@ -16,7 +16,7 @@ #define CHAR_MODEL_TRAINER_H_ #include "sentencepiece_model.pb.h" -#include "third_party/absl/status/status.h" +#include "absl/status/status.h" #include "trainer_interface.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/char_model_trainer_test.cc b/third_party/sentencepiece/src/src/char_model_trainer_test.cc index 2cc949e1c6d35..21b9d6b2aeed1 100644 --- a/third_party/sentencepiece/src/src/char_model_trainer_test.cc +++ b/third_party/sentencepiece/src/src/char_model_trainer_test.cc @@ -20,8 +20,8 @@ #include "filesystem.h" #include "sentencepiece_processor.h" #include "testharness.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_join.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_join.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/common.h b/third_party/sentencepiece/src/src/common.h index ba8286043688d..8a251ab8f023e 100644 --- a/third_party/sentencepiece/src/src/common.h +++ b/third_party/sentencepiece/src/src/common.h @@ -18,12 +18,12 @@ #include #include -#include "third_party/absl/log/check.h" -#include "third_party/absl/log/globals.h" -#include "third_party/absl/log/log.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/status/status_macros.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/log/check.h" +#include "absl/log/globals.h" +#include "absl/log/log.h" +#include "absl/status/status.h" +#include "absl/status/status_macros.h" +#include "absl/strings/string_view.h" #if defined(_WIN32) && !defined(__CYGWIN__) #define OS_WIN diff --git a/third_party/sentencepiece/src/src/compile_charsmap_main.cc b/third_party/sentencepiece/src/src/compile_charsmap_main.cc index a79bc6d2f8bec..cc744ea8f2102 100644 --- a/third_party/sentencepiece/src/src/compile_charsmap_main.cc +++ b/third_party/sentencepiece/src/src/compile_charsmap_main.cc @@ -22,10 +22,10 @@ #include "filesystem.h" #include "init.h" #include "sentencepiece_processor.h" -#include "third_party/absl/flags/flag.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/flags/flag.h" +#include "absl/status/status.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" using sentencepiece::normalizer::Builder; diff --git a/third_party/sentencepiece/src/src/filesystem.cc b/third_party/sentencepiece/src/src/filesystem.cc index 08c2656268aa4..174b6bfa14e11 100644 --- a/third_party/sentencepiece/src/src/filesystem.cc +++ b/third_party/sentencepiece/src/src/filesystem.cc @@ -18,8 +18,8 @@ #include #include -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/status/status.h" +#include "absl/strings/string_view.h" #include "util.h" #if defined(OS_WIN) && defined(UNICODE) && defined(_UNICODE) diff --git a/third_party/sentencepiece/src/src/filesystem.h b/third_party/sentencepiece/src/src/filesystem.h index 35f4639696da3..54949c2792e59 100644 --- a/third_party/sentencepiece/src/src/filesystem.h +++ b/third_party/sentencepiece/src/src/filesystem.h @@ -23,8 +23,8 @@ #include "common.h" #include "sentencepiece_processor.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/status/status.h" +#include "absl/strings/string_view.h" namespace sentencepiece { namespace filesystem { diff --git a/third_party/sentencepiece/src/src/filesystem_test.cc b/third_party/sentencepiece/src/src/filesystem_test.cc index 423a2019f27de..0825cc3800acb 100644 --- a/third_party/sentencepiece/src/src/filesystem_test.cc +++ b/third_party/sentencepiece/src/src/filesystem_test.cc @@ -15,7 +15,7 @@ #include "filesystem.h" #include "testharness.h" -#include "third_party/absl/strings/str_cat.h" +#include "absl/strings/str_cat.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/init.cc b/third_party/sentencepiece/src/src/init.cc index c2c651e20f7e7..641d9710d7396 100644 --- a/third_party/sentencepiece/src/src/init.cc +++ b/third_party/sentencepiece/src/src/init.cc @@ -16,12 +16,12 @@ #include "common.h" #include "config.h" -#include "third_party/absl/flags/flag.h" -#include "third_party/absl/flags/parse.h" -#include "third_party/absl/flags/usage.h" -#include "third_party/absl/flags/usage_config.h" -#include "third_party/absl/log/initialize.h" -#include "third_party/absl/strings/str_cat.h" +#include "absl/flags/flag.h" +#include "absl/flags/parse.h" +#include "absl/flags/usage.h" +#include "absl/flags/usage_config.h" +#include "absl/log/initialize.h" +#include "absl/strings/str_cat.h" #include "util.h" #ifdef _USE_EXTERNAL_PROTOBUF diff --git a/third_party/sentencepiece/src/src/invalid_model_test.cc b/third_party/sentencepiece/src/src/invalid_model_test.cc index c8dc78e9b862e..9f3f55d9d0c4d 100644 --- a/third_party/sentencepiece/src/src/invalid_model_test.cc +++ b/third_party/sentencepiece/src/src/invalid_model_test.cc @@ -21,9 +21,9 @@ #include #include "testharness.h" -#include "third_party/absl/base/internal/endian.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/base/internal/endian.h" +#include "absl/status/status.h" +#include "absl/strings/string_view.h" #include "third_party/darts_clone/darts.h" #include "sentencepiece_model.pb.h" #include "sentencepiece_processor.h" diff --git a/third_party/sentencepiece/src/src/model_interface.cc b/third_party/sentencepiece/src/src/model_interface.cc index 63eccee1f8712..f68320617d127 100644 --- a/third_party/sentencepiece/src/src/model_interface.cc +++ b/third_party/sentencepiece/src/src/model_interface.cc @@ -17,9 +17,9 @@ #include #include "sentencepiece_model.pb.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_format.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" +#include "absl/strings/string_view.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/model_interface.h b/third_party/sentencepiece/src/src/model_interface.h index 5e08182ac0042..089a9cad444fa 100644 --- a/third_party/sentencepiece/src/src/model_interface.h +++ b/third_party/sentencepiece/src/src/model_interface.h @@ -25,9 +25,9 @@ #include "normalizer.h" #include "sentencepiece_model.pb.h" #include "sentencepiece_processor.h" -#include "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/container/flat_hash_map.h" +#include "absl/status/status.h" +#include "absl/strings/string_view.h" #include "third_party/darts_clone/darts.h" #include "util.h" diff --git a/third_party/sentencepiece/src/src/model_interface_test.cc b/third_party/sentencepiece/src/src/model_interface_test.cc index c3ca26f52eb4a..c4baa1fdca732 100644 --- a/third_party/sentencepiece/src/src/model_interface_test.cc +++ b/third_party/sentencepiece/src/src/model_interface_test.cc @@ -16,7 +16,7 @@ #include "model_factory.h" #include "testharness.h" -#include "third_party/absl/container/flat_hash_map.h" +#include "absl/container/flat_hash_map.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/normalizer.cc b/third_party/sentencepiece/src/src/normalizer.cc index 05a4931104a05..5a36414ae4a4c 100644 --- a/third_party/sentencepiece/src/src/normalizer.cc +++ b/third_party/sentencepiece/src/src/normalizer.cc @@ -19,10 +19,10 @@ #include #include "common.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/match.h" -#include "third_party/absl/strings/string_view.h" -#include "third_party/absl/strings/strip.h" +#include "absl/status/status.h" +#include "absl/strings/match.h" +#include "absl/strings/string_view.h" +#include "absl/strings/strip.h" #include "third_party/darts_clone/darts.h" #include "util.h" diff --git a/third_party/sentencepiece/src/src/normalizer.h b/third_party/sentencepiece/src/src/normalizer.h index 67a430b66e85e..197fbdc92a83d 100644 --- a/third_party/sentencepiece/src/src/normalizer.h +++ b/third_party/sentencepiece/src/src/normalizer.h @@ -24,8 +24,8 @@ #include "common.h" #include "sentencepiece_model.pb.h" #include "sentencepiece_processor.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/status/status.h" +#include "absl/strings/string_view.h" #include "third_party/darts_clone/darts.h" namespace sentencepiece::normalizer { diff --git a/third_party/sentencepiece/src/src/normalizer_test.cc b/third_party/sentencepiece/src/src/normalizer_test.cc index 94f6b3488d0cf..32258265e56a9 100644 --- a/third_party/sentencepiece/src/src/normalizer_test.cc +++ b/third_party/sentencepiece/src/src/normalizer_test.cc @@ -21,8 +21,8 @@ #include "builder.h" #include "sentencepiece_trainer.h" #include "testharness.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/status/status.h" +#include "absl/strings/string_view.h" #include "third_party/darts_clone/darts.h" #include "util.h" diff --git a/third_party/sentencepiece/src/src/pretokenizer_for_training.cc b/third_party/sentencepiece/src/src/pretokenizer_for_training.cc index 06debb228d5de..f1da565c2e531 100644 --- a/third_party/sentencepiece/src/src/pretokenizer_for_training.cc +++ b/third_party/sentencepiece/src/src/pretokenizer_for_training.cc @@ -15,8 +15,8 @@ #include -#include "third_party/absl/strings/str_replace.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/strings/str_replace.h" +#include "absl/strings/string_view.h" namespace sentencepiece { namespace pretokenizer { diff --git a/third_party/sentencepiece/src/src/pretokenizer_for_training.h b/third_party/sentencepiece/src/src/pretokenizer_for_training.h index caa8d3bfd66a2..20d6924518395 100644 --- a/third_party/sentencepiece/src/src/pretokenizer_for_training.h +++ b/third_party/sentencepiece/src/src/pretokenizer_for_training.h @@ -21,8 +21,8 @@ #include "common.h" #include "sentencepiece.pb.h" #include "sentencepiece_processor.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/status/status.h" +#include "absl/strings/string_view.h" namespace sentencepiece::pretokenizer { diff --git a/third_party/sentencepiece/src/src/pretokenizer_for_training_test.cc b/third_party/sentencepiece/src/src/pretokenizer_for_training_test.cc index 57c392593693b..a5b8e3019bee8 100644 --- a/third_party/sentencepiece/src/src/pretokenizer_for_training_test.cc +++ b/third_party/sentencepiece/src/src/pretokenizer_for_training_test.cc @@ -14,11 +14,11 @@ #include "pretokenizer_for_training.h" #include "testharness.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_join.h" -#include "third_party/absl/strings/str_split.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/status/status.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_join.h" +#include "absl/strings/str_split.h" +#include "absl/strings/string_view.h" #include "trainer_interface.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/sentencepiece_processor.cc b/third_party/sentencepiece/src/src/sentencepiece_processor.cc index d60514dedad84..5d58d070a3d08 100644 --- a/third_party/sentencepiece/src/src/sentencepiece_processor.cc +++ b/third_party/sentencepiece/src/src/sentencepiece_processor.cc @@ -30,20 +30,20 @@ #include "model_interface.h" #include "normalizer.h" #include "sentencepiece.pb.h" -#include "third_party/absl/cleanup/cleanup.h" -#include "third_party/absl/container/fixed_array.h" -#include "third_party/absl/container/flat_hash_set.h" -#include "third_party/absl/functional/function_ref.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/numbers.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_join.h" -#include "third_party/absl/strings/str_replace.h" -#include "third_party/absl/strings/str_split.h" -#include "third_party/absl/strings/string_view.h" -#include "third_party/absl/strings/strip.h" -#include "third_party/absl/synchronization/blocking_counter.h" -#include "third_party/absl/synchronization/mutex.h" +#include "absl/cleanup/cleanup.h" +#include "absl/container/fixed_array.h" +#include "absl/container/flat_hash_set.h" +#include "absl/functional/function_ref.h" +#include "absl/status/status.h" +#include "absl/strings/numbers.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_join.h" +#include "absl/strings/str_replace.h" +#include "absl/strings/str_split.h" +#include "absl/strings/string_view.h" +#include "absl/strings/strip.h" +#include "absl/synchronization/blocking_counter.h" +#include "absl/synchronization/mutex.h" #include "unigram_model.h" #include "util.h" diff --git a/third_party/sentencepiece/src/src/sentencepiece_processor.h b/third_party/sentencepiece/src/src/sentencepiece_processor.h index 2231dbc6a7669..388835adcc624 100644 --- a/third_party/sentencepiece/src/src/sentencepiece_processor.h +++ b/third_party/sentencepiece/src/src/sentencepiece_processor.h @@ -24,13 +24,13 @@ #include #include -#include "third_party/absl/strings/string_view.h" -#include "third_party/absl/types/span.h" +#include "absl/strings/string_view.h" +#include "absl/types/span.h" namespace absl { using std::string_view; } // namespace absl -#include "third_party/absl/status/status.h" +#include "absl/status/status.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/sentencepiece_processor_benchmarks_test.cc b/third_party/sentencepiece/src/src/sentencepiece_processor_benchmarks_test.cc index a8c87a3b1311b..1f8c917f6ee1f 100644 --- a/third_party/sentencepiece/src/src/sentencepiece_processor_benchmarks_test.cc +++ b/third_party/sentencepiece/src/src/sentencepiece_processor_benchmarks_test.cc @@ -23,11 +23,11 @@ #include "sentencepiece.pb.h" #include "sentencepiece_processor.h" #include "testharness.h" -#include "third_party/absl/log/check.h" -#include "third_party/absl/log/flags.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/str_split.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/log/check.h" +#include "absl/log/flags.h" +#include "absl/status/status.h" +#include "absl/strings/str_split.h" +#include "absl/strings/string_view.h" #include "third_party/benchmark/include/benchmark/benchmark.h" #include "util.h" diff --git a/third_party/sentencepiece/src/src/sentencepiece_processor_parallel_test.cc b/third_party/sentencepiece/src/src/sentencepiece_processor_parallel_test.cc index c0afcce3f2f88..685388264a705 100644 --- a/third_party/sentencepiece/src/src/sentencepiece_processor_parallel_test.cc +++ b/third_party/sentencepiece/src/src/sentencepiece_processor_parallel_test.cc @@ -20,8 +20,8 @@ #include "sentencepiece_model.pb.h" #include "sentencepiece_processor.h" #include "testharness.h" -#include "third_party/absl/log/check.h" -#include "third_party/absl/log/log.h" +#include "absl/log/check.h" +#include "absl/log/log.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/sentencepiece_processor_test.cc b/third_party/sentencepiece/src/src/sentencepiece_processor_test.cc index d3c861b1a2fcf..34b573ba3b129 100644 --- a/third_party/sentencepiece/src/src/sentencepiece_processor_test.cc +++ b/third_party/sentencepiece/src/src/sentencepiece_processor_test.cc @@ -24,10 +24,10 @@ #include "sentencepiece_model.pb.h" #include "sentencepiece_trainer.h" #include "testharness.h" -#include "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/strings/match.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/container/flat_hash_map.h" +#include "absl/strings/match.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/sentencepiece_trainer.cc b/third_party/sentencepiece/src/src/sentencepiece_trainer.cc index fd86f35fd7fb1..3f62030ab52d8 100644 --- a/third_party/sentencepiece/src/src/sentencepiece_trainer.cc +++ b/third_party/sentencepiece/src/src/sentencepiece_trainer.cc @@ -23,13 +23,13 @@ #include "sentencepiece.pb.h" #include "sentencepiece_model.pb.h" #include "spec_parser.h" -#include "third_party/absl/flags/flag.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/numbers.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_split.h" -#include "third_party/absl/strings/string_view.h" -#include "third_party/absl/strings/strip.h" +#include "absl/flags/flag.h" +#include "absl/status/status.h" +#include "absl/strings/numbers.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_split.h" +#include "absl/strings/string_view.h" +#include "absl/strings/strip.h" #include "trainer_factory.h" #include "util.h" diff --git a/third_party/sentencepiece/src/src/sentencepiece_trainer.h b/third_party/sentencepiece/src/src/sentencepiece_trainer.h index 5f2a49b63c526..611c2f5d0d35c 100644 --- a/third_party/sentencepiece/src/src/sentencepiece_trainer.h +++ b/third_party/sentencepiece/src/src/sentencepiece_trainer.h @@ -20,9 +20,9 @@ #include #include "sentencepiece_processor.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/string_view.h" -#include "third_party/absl/types/span.h" +#include "absl/status/status.h" +#include "absl/strings/string_view.h" +#include "absl/types/span.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/sentencepiece_trainer_test.cc b/third_party/sentencepiece/src/src/sentencepiece_trainer_test.cc index 2055a72a138a0..901295ec8c2ae 100644 --- a/third_party/sentencepiece/src/src/sentencepiece_trainer_test.cc +++ b/third_party/sentencepiece/src/src/sentencepiece_trainer_test.cc @@ -17,9 +17,9 @@ #include "filesystem.h" #include "sentencepiece_model.pb.h" #include "testharness.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/status/status.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/spec_parser.h b/third_party/sentencepiece/src/src/spec_parser.h index 41fb5733a4c5f..f5e48b0ad32e7 100644 --- a/third_party/sentencepiece/src/src/spec_parser.h +++ b/third_party/sentencepiece/src/src/spec_parser.h @@ -19,12 +19,12 @@ #include #include "sentencepiece_processor.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/status/status_builder.h" -#include "third_party/absl/strings/ascii.h" -#include "third_party/absl/strings/numbers.h" -#include "third_party/absl/strings/str_split.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/status/status.h" +#include "absl/status/status_builder.h" +#include "absl/strings/ascii.h" +#include "absl/strings/numbers.h" +#include "absl/strings/str_split.h" +#include "absl/strings/string_view.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/spm_decode_main.cc b/third_party/sentencepiece/src/src/spm_decode_main.cc index dc5ca5cffaf80..97cde9928a6b4 100644 --- a/third_party/sentencepiece/src/src/spm_decode_main.cc +++ b/third_party/sentencepiece/src/src/spm_decode_main.cc @@ -21,8 +21,8 @@ #include "init.h" #include "sentencepiece.pb.h" #include "sentencepiece_processor.h" -#include "third_party/absl/flags/flag.h" -#include "third_party/absl/strings/str_split.h" +#include "absl/flags/flag.h" +#include "absl/strings/str_split.h" #include "util.h" ABSL_FLAG(std::string, model, "", "model file name"); diff --git a/third_party/sentencepiece/src/src/spm_encode_main.cc b/third_party/sentencepiece/src/src/spm_encode_main.cc index b05724af12e4d..44328f756e625 100644 --- a/third_party/sentencepiece/src/src/spm_encode_main.cc +++ b/third_party/sentencepiece/src/src/spm_encode_main.cc @@ -22,11 +22,11 @@ #include "init.h" #include "sentencepiece.pb.h" #include "sentencepiece_processor.h" -#include "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/flags/flag.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_join.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/container/flat_hash_map.h" +#include "absl/flags/flag.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_join.h" +#include "absl/strings/string_view.h" #include "trainer_interface.h" ABSL_FLAG(std::string, model, "", "model file name"); diff --git a/third_party/sentencepiece/src/src/spm_export_vocab_main.cc b/third_party/sentencepiece/src/src/spm_export_vocab_main.cc index f68baa467941f..ed3c577065a7e 100644 --- a/third_party/sentencepiece/src/src/spm_export_vocab_main.cc +++ b/third_party/sentencepiece/src/src/spm_export_vocab_main.cc @@ -19,7 +19,7 @@ #include "init.h" #include "sentencepiece_model.pb.h" #include "sentencepiece_processor.h" -#include "third_party/absl/flags/flag.h" +#include "absl/flags/flag.h" ABSL_FLAG(std::string, output, "", "Output filename"); ABSL_FLAG(std::string, model, "", "input model file name"); diff --git a/third_party/sentencepiece/src/src/spm_normalize_main.cc b/third_party/sentencepiece/src/src/spm_normalize_main.cc index c004189b88e1e..e15fa324b4acc 100644 --- a/third_party/sentencepiece/src/src/spm_normalize_main.cc +++ b/third_party/sentencepiece/src/src/spm_normalize_main.cc @@ -21,7 +21,7 @@ #include "sentencepiece_model.pb.h" #include "sentencepiece_processor.h" #include "sentencepiece_trainer.h" -#include "third_party/absl/flags/flag.h" +#include "absl/flags/flag.h" ABSL_FLAG(std::string, model, "", "Model file name"); ABSL_FLAG(bool, use_internal_normalization, false, diff --git a/third_party/sentencepiece/src/src/spm_train_main.cc b/third_party/sentencepiece/src/src/spm_train_main.cc index f42218ef62baa..7218bbc8bd3b9 100644 --- a/third_party/sentencepiece/src/src/spm_train_main.cc +++ b/third_party/sentencepiece/src/src/spm_train_main.cc @@ -18,11 +18,11 @@ #include "init.h" #include "sentencepiece_model.pb.h" #include "sentencepiece_trainer.h" -#include "third_party/absl/flags/flag.h" -#include "third_party/absl/strings/ascii.h" -#include "third_party/absl/strings/str_join.h" -#include "third_party/absl/strings/str_split.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/flags/flag.h" +#include "absl/strings/ascii.h" +#include "absl/strings/str_join.h" +#include "absl/strings/str_split.h" +#include "absl/strings/string_view.h" #include "util.h" using sentencepiece::NormalizerSpec; diff --git a/third_party/sentencepiece/src/src/testharness.cc b/third_party/sentencepiece/src/src/testharness.cc index c8cd4c2c2475c..0ad01dc0e1104 100644 --- a/third_party/sentencepiece/src/src/testharness.cc +++ b/third_party/sentencepiece/src/src/testharness.cc @@ -26,7 +26,7 @@ #include #include "common.h" -#include "third_party/absl/strings/str_cat.h" +#include "absl/strings/str_cat.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/testharness.h b/third_party/sentencepiece/src/src/testharness.h index c573db30cf6d7..2c53f5e4798ef 100644 --- a/third_party/sentencepiece/src/src/testharness.h +++ b/third_party/sentencepiece/src/src/testharness.h @@ -21,9 +21,9 @@ #include #include "common.h" -#include "third_party/absl/flags/flag.h" -#include "third_party/absl/flags/parse.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/flags/flag.h" +#include "absl/flags/parse.h" +#include "absl/strings/string_view.h" ABSL_DECLARE_FLAG(std::string, test_tmpdir); ABSL_DECLARE_FLAG(std::string, test_srcdir); diff --git a/third_party/sentencepiece/src/src/trainer_interface.cc b/third_party/sentencepiece/src/src/trainer_interface.cc index 5555016433bca..73f331b0ff758 100644 --- a/third_party/sentencepiece/src/src/trainer_interface.cc +++ b/third_party/sentencepiece/src/src/trainer_interface.cc @@ -29,17 +29,17 @@ #include "normalizer.h" #include "sentencepiece_processor.h" #include "sentencepiece_trainer.h" -#include "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/container/flat_hash_set.h" -#include "third_party/absl/random/random.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/match.h" -#include "third_party/absl/strings/numbers.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_format.h" -#include "third_party/absl/strings/str_join.h" -#include "third_party/absl/strings/str_split.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/container/flat_hash_map.h" +#include "absl/container/flat_hash_set.h" +#include "absl/random/random.h" +#include "absl/status/status.h" +#include "absl/strings/match.h" +#include "absl/strings/numbers.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" +#include "absl/strings/str_join.h" +#include "absl/strings/str_split.h" +#include "absl/strings/string_view.h" #include "unicode_script.h" #include "util.h" diff --git a/third_party/sentencepiece/src/src/trainer_interface.h b/third_party/sentencepiece/src/src/trainer_interface.h index 9b84a8c4e5aba..78115aa2a9915 100644 --- a/third_party/sentencepiece/src/src/trainer_interface.h +++ b/third_party/sentencepiece/src/src/trainer_interface.h @@ -27,9 +27,9 @@ #include "sentencepiece_model.pb.h" #include "sentencepiece_processor.h" #include "sentencepiece_trainer.h" -#include "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/container/flat_hash_map.h" +#include "absl/status/status.h" +#include "absl/strings/string_view.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/trainer_interface_test.cc b/third_party/sentencepiece/src/src/trainer_interface_test.cc index 029290579dfdb..51103fd8add95 100644 --- a/third_party/sentencepiece/src/src/trainer_interface_test.cc +++ b/third_party/sentencepiece/src/src/trainer_interface_test.cc @@ -18,9 +18,9 @@ #include "filesystem.h" #include "testharness.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_format.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" +#include "absl/strings/string_view.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/unicode_script.cc b/third_party/sentencepiece/src/src/unicode_script.cc index c013b4ae76cb5..5e2b645dc6384 100644 --- a/third_party/sentencepiece/src/src/unicode_script.cc +++ b/third_party/sentencepiece/src/src/unicode_script.cc @@ -14,7 +14,7 @@ #include "unicode_script.h" -#include "third_party/absl/container/flat_hash_map.h" +#include "absl/container/flat_hash_map.h" #include "unicode_script_map.h" #include "util.h" diff --git a/third_party/sentencepiece/src/src/unicode_script_map.h b/third_party/sentencepiece/src/src/unicode_script_map.h index a9cf471f3da85..2abb706e77710 100644 --- a/third_party/sentencepiece/src/src/unicode_script_map.h +++ b/third_party/sentencepiece/src/src/unicode_script_map.h @@ -14,7 +14,7 @@ #ifndef UNICODE_SCRIPT_DATA_H_ #define UNICODE_SCRIPT_DATA_H_ -#include "third_party/absl/container/flat_hash_map.h" +#include "absl/container/flat_hash_map.h" namespace sentencepiece { namespace unicode_script { namespace { diff --git a/third_party/sentencepiece/src/src/unicode_script_test.cc b/third_party/sentencepiece/src/src/unicode_script_test.cc index e193a7249f87f..74b0e02282b2c 100644 --- a/third_party/sentencepiece/src/src/unicode_script_test.cc +++ b/third_party/sentencepiece/src/src/unicode_script_test.cc @@ -16,7 +16,7 @@ #include "common.h" #include "testharness.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/strings/string_view.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/unigram_model.cc b/third_party/sentencepiece/src/src/unigram_model.cc index 498a1d351d996..cd70a76e01a7c 100644 --- a/third_party/sentencepiece/src/src/unigram_model.cc +++ b/third_party/sentencepiece/src/src/unigram_model.cc @@ -26,12 +26,12 @@ #include #include -#include "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/random/random.h" -#include "third_party/absl/strings/str_split.h" -#include "third_party/absl/strings/string_view.h" -#include "third_party/absl/time/clock.h" -#include "third_party/absl/time/time.h" +#include "absl/container/flat_hash_map.h" +#include "absl/random/random.h" +#include "absl/strings/str_split.h" +#include "absl/strings/string_view.h" +#include "absl/time/clock.h" +#include "absl/time/time.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/unigram_model.h b/third_party/sentencepiece/src/src/unigram_model.h index 027b468813838..5204bda00e215 100644 --- a/third_party/sentencepiece/src/src/unigram_model.h +++ b/third_party/sentencepiece/src/src/unigram_model.h @@ -24,7 +24,7 @@ #include "freelist.h" #include "model_interface.h" #include "sentencepiece_model.pb.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/strings/string_view.h" #include "third_party/darts_clone/darts.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/unigram_model_test.cc b/third_party/sentencepiece/src/src/unigram_model_test.cc index b1492fccc7cf7..db66019587b43 100644 --- a/third_party/sentencepiece/src/src/unigram_model_test.cc +++ b/third_party/sentencepiece/src/src/unigram_model_test.cc @@ -22,9 +22,9 @@ #include "sentencepiece_model.pb.h" #include "sentencepiece_processor.h" #include "testharness.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_join.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_join.h" +#include "absl/strings/string_view.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/unigram_model_trainer.cc b/third_party/sentencepiece/src/src/unigram_model_trainer.cc index 13a637e752519..06ed2d1765012 100644 --- a/third_party/sentencepiece/src/src/unigram_model_trainer.cc +++ b/third_party/sentencepiece/src/src/unigram_model_trainer.cc @@ -28,12 +28,12 @@ #include "normalizer.h" #include "pretokenizer_for_training.h" #include "sentencepiece_trainer.h" -#include "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/numbers.h" -#include "third_party/absl/strings/str_replace.h" -#include "third_party/absl/strings/str_split.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/container/flat_hash_map.h" +#include "absl/status/status.h" +#include "absl/strings/numbers.h" +#include "absl/strings/str_replace.h" +#include "absl/strings/str_split.h" +#include "absl/strings/string_view.h" #include "third_party/esaxx/esa.hxx" // Suffix array library. #include "trainer_interface.h" #include "unicode_script.h" diff --git a/third_party/sentencepiece/src/src/unigram_model_trainer.h b/third_party/sentencepiece/src/src/unigram_model_trainer.h index 9c3b589ca2cd9..cee64f98b2c1b 100644 --- a/third_party/sentencepiece/src/src/unigram_model_trainer.h +++ b/third_party/sentencepiece/src/src/unigram_model_trainer.h @@ -21,8 +21,8 @@ #include #include "sentencepiece_model.pb.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/status/status.h" +#include "absl/strings/string_view.h" #include "trainer_interface.h" #include "unigram_model.h" #include "util.h" diff --git a/third_party/sentencepiece/src/src/unigram_model_trainer_test.cc b/third_party/sentencepiece/src/src/unigram_model_trainer_test.cc index 4705c623da611..9093d55d25a39 100644 --- a/third_party/sentencepiece/src/src/unigram_model_trainer_test.cc +++ b/third_party/sentencepiece/src/src/unigram_model_trainer_test.cc @@ -22,8 +22,8 @@ #include "sentencepiece_processor.h" #include "sentencepiece_trainer.h" #include "testharness.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_join.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_join.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/util.cc b/third_party/sentencepiece/src/src/util.cc index bd5ea1a16ca21..d5f5532a33a8c 100644 --- a/third_party/sentencepiece/src/src/util.cc +++ b/third_party/sentencepiece/src/src/util.cc @@ -18,11 +18,11 @@ #include #include -#include "third_party/absl/random/random.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/string_view.h" -#include "third_party/absl/synchronization/blocking_counter.h" -#include "third_party/absl/synchronization/mutex.h" +#include "absl/random/random.h" +#include "absl/status/status.h" +#include "absl/strings/string_view.h" +#include "absl/synchronization/blocking_counter.h" +#include "absl/synchronization/mutex.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/util.h b/third_party/sentencepiece/src/src/util.h index 07d9f37e3f240..63b4873817a12 100644 --- a/third_party/sentencepiece/src/src/util.h +++ b/third_party/sentencepiece/src/src/util.h @@ -32,21 +32,21 @@ #include "common.h" #include "config.h" #include "sentencepiece_processor.h" -#include "third_party/absl/base/internal/endian.h" -#include "third_party/absl/base/thread_annotations.h" -#include "third_party/absl/functional/any_invocable.h" -#include "third_party/absl/numeric/bits.h" -#include "third_party/absl/random/random.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/status/status_builder.h" -#include "third_party/absl/strings/ascii.h" -#include "third_party/absl/strings/numbers.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_format.h" -#include "third_party/absl/strings/str_join.h" -#include "third_party/absl/strings/string_view.h" -#include "third_party/absl/strings/strip.h" -#include "third_party/absl/synchronization/mutex.h" +#include "absl/base/internal/endian.h" +#include "absl/base/thread_annotations.h" +#include "absl/functional/any_invocable.h" +#include "absl/numeric/bits.h" +#include "absl/random/random.h" +#include "absl/status/status.h" +#include "absl/status/status_builder.h" +#include "absl/strings/ascii.h" +#include "absl/strings/numbers.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" +#include "absl/strings/str_join.h" +#include "absl/strings/string_view.h" +#include "absl/strings/strip.h" +#include "absl/synchronization/mutex.h" static constexpr uint32_t kUnicodeError = 0xFFFD; diff --git a/third_party/sentencepiece/src/src/util_test.cc b/third_party/sentencepiece/src/src/util_test.cc index 48695f566a504..b9014055ce000 100644 --- a/third_party/sentencepiece/src/src/util_test.cc +++ b/third_party/sentencepiece/src/src/util_test.cc @@ -18,11 +18,11 @@ #include "filesystem.h" #include "testharness.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/string_view.h" -#include "third_party/absl/time/clock.h" -#include "third_party/absl/time/time.h" +#include "absl/status/status.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" +#include "absl/time/clock.h" +#include "absl/time/time.h" namespace sentencepiece { namespace { diff --git a/third_party/sentencepiece/src/src/word_model.cc b/third_party/sentencepiece/src/src/word_model.cc index 3f5c79923494f..a09bcf5df2586 100644 --- a/third_party/sentencepiece/src/src/word_model.cc +++ b/third_party/sentencepiece/src/src/word_model.cc @@ -14,7 +14,7 @@ #include "word_model.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/strings/string_view.h" #include "util.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/word_model.h b/third_party/sentencepiece/src/src/word_model.h index be1d0348b434a..7ea554cb933eb 100644 --- a/third_party/sentencepiece/src/src/word_model.h +++ b/third_party/sentencepiece/src/src/word_model.h @@ -17,7 +17,7 @@ #include "model_interface.h" #include "sentencepiece_model.pb.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/strings/string_view.h" namespace sentencepiece { namespace word { diff --git a/third_party/sentencepiece/src/src/word_model_trainer.cc b/third_party/sentencepiece/src/src/word_model_trainer.cc index 4bea35e48776c..005a1620077d5 100644 --- a/third_party/sentencepiece/src/src/word_model_trainer.cc +++ b/third_party/sentencepiece/src/src/word_model_trainer.cc @@ -17,9 +17,9 @@ #include #include -#include "third_party/absl/container/flat_hash_map.h" -#include "third_party/absl/status/status.h" -#include "third_party/absl/strings/string_view.h" +#include "absl/container/flat_hash_map.h" +#include "absl/status/status.h" +#include "absl/strings/string_view.h" #include "util.h" #include "word_model.h" diff --git a/third_party/sentencepiece/src/src/word_model_trainer.h b/third_party/sentencepiece/src/src/word_model_trainer.h index 77f2457cfe038..19ff9f53317ae 100644 --- a/third_party/sentencepiece/src/src/word_model_trainer.h +++ b/third_party/sentencepiece/src/src/word_model_trainer.h @@ -16,7 +16,7 @@ #define WORD_MODEL_TRAINER_H_ #include "sentencepiece_model.pb.h" -#include "third_party/absl/status/status.h" +#include "absl/status/status.h" #include "trainer_interface.h" namespace sentencepiece { diff --git a/third_party/sentencepiece/src/src/word_model_trainer_test.cc b/third_party/sentencepiece/src/src/word_model_trainer_test.cc index 6491299213624..e8abf32f5108f 100644 --- a/third_party/sentencepiece/src/src/word_model_trainer_test.cc +++ b/third_party/sentencepiece/src/src/word_model_trainer_test.cc @@ -20,8 +20,8 @@ #include "filesystem.h" #include "sentencepiece_processor.h" #include "testharness.h" -#include "third_party/absl/strings/str_cat.h" -#include "third_party/absl/strings/str_join.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_join.h" #include "util.h" namespace sentencepiece { -- 2.54.0.1189.g8c84645362-goog