Skip to content

Commit 6c686e6

Browse files
agutkincopybara-github
agutkin
authored and
copybara-github
committed
No public description
PiperOrigin-RevId: 827472215
1 parent 48939c1 commit 6c686e6

15 files changed

Lines changed: 34 additions & 34 deletions

‎mozolm/models/ngram_char_fst_model.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
#include <cmath>
1818

1919
#include "google/protobuf/stubs/logging.h"
20-
#include "fst/fst.h"
21-
#include "fst/matcher.h"
2220
#include "absl/memory/memory.h"
2321
#include "nisaba/port/utf8_util.h"
22+
#include "fst/fst.h"
23+
#include "fst/matcher.h"
2424

2525
using fst::MATCH_INPUT;
2626
using fst::Matcher;

‎mozolm/models/ngram_char_fst_model.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include <memory>
2121
#include <vector>
2222

23-
#include "fst/vector-fst.h"
2423
#include "absl/status/status.h"
2524
#include "mozolm/models/ngram_fst_model.h"
25+
#include "fst/vector-fst.h"
2626

2727
namespace mozolm {
2828
namespace models {

‎mozolm/models/ngram_char_fst_model_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <string>
2323
#include <vector>
2424

25-
#include "fst/vector-fst.h"
2625
#include "gmock/gmock.h"
2726
#include "nisaba/port/status-matchers.h"
2827
#include "protobuf-matchers/protocol-buffer-matchers.h"
@@ -31,8 +30,9 @@
3130
#include "absl/strings/str_join.h"
3231
#include "mozolm/models/model_storage.pb.h"
3332
#include "mozolm/models/model_test_utils.h"
34-
#include "nisaba/port/utf8_util.h"
3533
#include "nisaba/port/test_utils.h"
34+
#include "nisaba/port/utf8_util.h"
35+
#include "fst/vector-fst.h"
3636

3737
using fst::StdArc;
3838
using nisaba::testing::TestFilePath;

‎mozolm/models/ngram_fst_model.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
#include <memory>
1818

1919
#include "google/protobuf/stubs/logging.h"
20+
#include "absl/memory/memory.h"
21+
#include "absl/strings/str_cat.h"
2022
#include "fst/fst.h"
2123
#include "fst/matcher.h"
2224
#include "fst/symbol-table.h"
23-
#include "absl/memory/memory.h"
24-
#include "absl/strings/str_cat.h"
2525

2626
using fst::MATCH_INPUT;
2727
using fst::Matcher;

‎mozolm/models/ngram_fst_model.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
#include <memory>
2121
#include <vector>
2222

23-
#include "fst/vector-fst.h"
2423
#include "ngram/ngram-model.h"
2524
#include "absl/status/status.h"
2625
#include "mozolm/models/language_model.h"
2726
#include "mozolm/models/model_storage.pb.h"
27+
#include "fst/vector-fst.h"
2828

2929
namespace mozolm {
3030
namespace models {

‎mozolm/models/ngram_word_fst_model.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
#include <memory>
2020

2121
#include "google/protobuf/stubs/logging.h"
22-
#include "fst/fst.h"
23-
#include "fst/matcher.h"
24-
#include "fst/symbol-table.h"
2522
#include "ngram/ngram-model.h"
2623
#include "absl/memory/memory.h"
2724
#include "mozolm/models/model_storage.pb.h"
2825
#include "mozolm/models/ngram_word_fst_options.pb.h"
2926
#include "nisaba/port/utf8_util.h"
27+
#include "fst/fst.h"
28+
#include "fst/matcher.h"
29+
#include "fst/symbol-table.h"
3030
#include "nisaba/port/status_macros.h"
3131

3232
using nisaba::utf8::DecodeSingleUnicodeChar;

‎mozolm/models/ngram_word_fst_model.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
#include <utility>
2323
#include <vector>
2424

25-
#include "fst/vector-fst.h"
2625
#include "absl/container/flat_hash_map.h"
2726
#include "absl/status/status.h"
2827
#include "absl/status/statusor.h"
2928
#include "mozolm/models/ngram_fst_model.h"
29+
#include "fst/vector-fst.h"
3030

3131
namespace mozolm {
3232
namespace models {

‎mozolm/models/ngram_word_fst_model_test.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
#include <vector>
2222

2323
#include "mozolm/stubs/integral_types.h"
24-
#include "fst/arcsort.h"
25-
#include "fst/symbol-table.h"
26-
#include "fst/vector-fst.h"
2724
#include "gmock/gmock.h"
2825
#include "nisaba/port/status-matchers.h"
2926
#include "protobuf-matchers/protocol-buffer-matchers.h"
@@ -33,6 +30,9 @@
3330
#include "nisaba/port/file_util.h"
3431
#include "nisaba/port/test_utils.h"
3532
#include "nisaba/port/utf8_util.h"
33+
#include "fst/arcsort.h"
34+
#include "fst/symbol-table.h"
35+
#include "fst/vector-fst.h"
3636

3737
using ::fst::ArcSort;
3838
using ::fst::ILabelCompare;

‎mozolm/models/ppm_as_fst_model.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
#include <memory>
1919

2020
#include "google/protobuf/stubs/logging.h"
21-
#include "fst/arcsort.h"
22-
#include "fst/symbol-table.h"
23-
#include "fst/vector-fst.h"
2421
#include "ngram/ngram-count.h"
2522
#include "ngram/ngram-model.h"
2623
#include "absl/container/flat_hash_set.h"
@@ -30,6 +27,9 @@
3027
#include "nisaba/port/file_util.h"
3128
#include "nisaba/port/timer.h"
3229
#include "nisaba/port/utf8_util.h"
30+
#include "fst/arcsort.h"
31+
#include "fst/symbol-table.h"
32+
#include "fst/vector-fst.h"
3333
#include "nisaba/port/status_macros.h"
3434

3535
namespace mozolm {

‎mozolm/models/ppm_as_fst_model.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@
6666
#include <string>
6767
#include <vector>
6868

69-
#include "fst/symbol-table.h"
70-
#include "fst/vector-fst.h"
7169
#include "ngram/ngram-count.h"
7270
#include "absl/status/statusor.h"
7371
#include "mozolm/models/language_model.h"
7472
#include "mozolm/models/model_storage.pb.h"
7573
#include "mozolm/models/ppm_as_fst_options.pb.h"
74+
#include "fst/symbol-table.h"
75+
#include "fst/vector-fst.h"
7676

7777
namespace mozolm {
7878
namespace models {

0 commit comments

Comments
 (0)