Skip to content

Commit a9b2309

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

17 files changed

+52
-52
lines changed

‎mozolm/models/BUILD.bazel‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -231,12 +231,12 @@ cc_library(
231231
":language_model",
232232
":model_storage_cc_proto",
233233
"//mozolm/stubs:integral_types",
234+
"//nlp/fst/lib",
235+
"//nlp/fst/lib:symbol-table",
234236
"@com_google_absl//absl/memory",
235237
"@com_google_absl//absl/status",
236238
"@com_google_absl//absl/strings",
237239
"@com_google_protobuf//:protobuf",
238-
"@org_openfst//:fst",
239-
"@org_openfst//:symbol-table",
240240
"@org_opengrm_ngram//:opengrm-ngram-lib",
241241
],
242242
)
@@ -251,15 +251,15 @@ cc_library(
251251
":ngram_fst_model",
252252
":ngram_word_fst_options_cc_proto",
253253
"//mozolm/stubs:integral_types",
254+
"//nlp/fst/lib",
255+
"//nlp/fst/lib:symbol-table",
254256
"@com_google_absl//absl/container:flat_hash_map",
255257
"@com_google_absl//absl/memory",
256258
"@com_google_absl//absl/status",
257259
"@com_google_absl//absl/status:statusor",
258260
"@com_google_nisaba//nisaba/port:status_macros",
259261
"@com_google_nisaba//nisaba/port:utf8_util",
260262
"@com_google_protobuf//:protobuf",
261-
"@org_openfst//:fst",
262-
"@org_openfst//:symbol-table",
263263
"@org_opengrm_ngram//:opengrm-ngram-lib",
264264
],
265265
)
@@ -275,14 +275,14 @@ cc_test(
275275
":model_test_utils",
276276
":ngram_word_fst_model",
277277
"//mozolm/stubs:integral_types",
278+
"//nlp/fst/lib",
279+
"//nlp/fst/lib:symbol-table",
278280
"@com_github_protobuf_matchers//protobuf-matchers",
279281
"@com_google_googletest//:gtest_main",
280282
"@com_google_nisaba//nisaba/port:file_util",
281283
"@com_google_nisaba//nisaba/port:status-matchers",
282284
"@com_google_nisaba//nisaba/port:test_utils",
283285
"@com_google_nisaba//nisaba/port:utf8_util",
284-
"@org_openfst//:fst",
285-
"@org_openfst//:symbol-table",
286286
],
287287
)
288288

@@ -294,11 +294,11 @@ cc_library(
294294
deps = [
295295
":ngram_fst_model",
296296
"//mozolm/stubs:integral_types",
297+
"//nlp/fst/lib",
297298
"@com_google_absl//absl/memory",
298299
"@com_google_absl//absl/status",
299300
"@com_google_nisaba//nisaba/port:utf8_util",
300301
"@com_google_protobuf//:protobuf",
301-
"@org_openfst//:fst",
302302
],
303303
)
304304

@@ -314,14 +314,14 @@ cc_test(
314314
":model_storage_cc_proto",
315315
":model_test_utils",
316316
":ngram_char_fst_model",
317+
"//nlp/fst/lib",
317318
"@com_github_protobuf_matchers//protobuf-matchers",
318319
"@com_google_absl//absl/flags:flag",
319320
"@com_google_absl//absl/strings",
320321
"@com_google_googletest//:gtest_main",
321322
"@com_google_nisaba//nisaba/port:status-matchers",
322323
"@com_google_nisaba//nisaba/port:test_utils",
323324
"@com_google_nisaba//nisaba/port:utf8_util",
324-
"@org_openfst//:fst",
325325
],
326326
)
327327

@@ -335,6 +335,8 @@ cc_library(
335335
":model_storage_cc_proto",
336336
":ppm_as_fst_options_cc_proto",
337337
"//mozolm/stubs:integral_types",
338+
"//nlp/fst/lib",
339+
"//nlp/fst/lib:symbol-table",
338340
"@com_google_absl//absl/container:flat_hash_set",
339341
"@com_google_absl//absl/memory",
340342
"@com_google_absl//absl/status:statusor",
@@ -344,8 +346,6 @@ cc_library(
344346
"@com_google_nisaba//nisaba/port:timer",
345347
"@com_google_nisaba//nisaba/port:utf8_util",
346348
"@com_google_protobuf//:protobuf",
347-
"@org_openfst//:fst",
348-
"@org_openfst//:symbol-table",
349349
"@org_opengrm_ngram//:opengrm-ngram-lib",
350350
],
351351
)
@@ -359,14 +359,14 @@ cc_test(
359359
":model_storage_cc_proto",
360360
":ppm_as_fst_model",
361361
"//mozolm/stubs:integral_types",
362+
"//nlp/fst/lib",
363+
"//nlp/fst/lib:symbol-table",
362364
"@com_github_protobuf_matchers//protobuf-matchers",
363365
"@com_google_absl//absl/strings",
364366
"@com_google_googletest//:gtest_main",
365367
"@com_google_nisaba//nisaba/port:file_util",
366368
"@com_google_nisaba//nisaba/port:status-matchers",
367369
"@com_google_nisaba//nisaba/port:utf8_util",
368-
"@org_openfst//:fst",
369-
"@org_openfst//:symbol-table",
370370
],
371371
)
372372

‎mozolm/models/ngram_char_fst_model.cc‎

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

1919
#include "google/protobuf/stubs/logging.h"
20-
#include "fst/fst.h"
21-
#include "fst/matcher.h"
20+
#include "nlp/fst/lib/fst.h"
21+
#include "nlp/fst/lib/matcher.h"
2222
#include "absl/memory/memory.h"
2323
#include "nisaba/port/utf8_util.h"
2424

‎mozolm/models/ngram_char_fst_model.h‎

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

23-
#include "fst/vector-fst.h"
23+
#include "nlp/fst/lib/vector-fst.h"
2424
#include "absl/status/status.h"
2525
#include "mozolm/models/ngram_fst_model.h"
2626

‎mozolm/models/ngram_char_fst_model_test.cc‎

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

25-
#include "fst/vector-fst.h"
25+
#include "nlp/fst/lib/vector-fst.h"
2626
#include "gmock/gmock.h"
2727
#include "nisaba/port/status-matchers.h"
2828
#include "protobuf-matchers/protocol-buffer-matchers.h"

‎mozolm/models/ngram_fst_model.cc‎

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

1919
#include "google/protobuf/stubs/logging.h"
20-
#include "fst/fst.h"
21-
#include "fst/matcher.h"
22-
#include "fst/symbol-table.h"
20+
#include "nlp/fst/lib/fst.h"
21+
#include "nlp/fst/lib/matcher.h"
22+
#include "nlp/fst/lib/symbol-table.h"
2323
#include "absl/memory/memory.h"
2424
#include "absl/strings/str_cat.h"
2525

‎mozolm/models/ngram_fst_model.h‎

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

23-
#include "fst/vector-fst.h"
23+
#include "nlp/fst/lib/vector-fst.h"
2424
#include "ngram/ngram-model.h"
2525
#include "absl/status/status.h"
2626
#include "mozolm/models/language_model.h"

‎mozolm/models/ngram_word_fst_model.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
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"
22+
#include "nlp/fst/lib/fst.h"
23+
#include "nlp/fst/lib/matcher.h"
24+
#include "nlp/fst/lib/symbol-table.h"
2525
#include "ngram/ngram-model.h"
2626
#include "absl/memory/memory.h"
2727
#include "mozolm/models/model_storage.pb.h"

‎mozolm/models/ngram_word_fst_model.h‎

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

25-
#include "fst/vector-fst.h"
25+
#include "nlp/fst/lib/vector-fst.h"
2626
#include "absl/container/flat_hash_map.h"
2727
#include "absl/status/status.h"
2828
#include "absl/status/statusor.h"

‎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,9 @@
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"
24+
#include "nlp/fst/lib/arcsort.h"
25+
#include "nlp/fst/lib/symbol-table.h"
26+
#include "nlp/fst/lib/vector-fst.h"
2727
#include "gmock/gmock.h"
2828
#include "nisaba/port/status-matchers.h"
2929
#include "protobuf-matchers/protocol-buffer-matchers.h"

‎mozolm/models/ppm_as_fst_model.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
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"
21+
#include "nlp/fst/lib/arcsort.h"
22+
#include "nlp/fst/lib/symbol-table.h"
23+
#include "nlp/fst/lib/vector-fst.h"
2424
#include "ngram/ngram-count.h"
2525
#include "ngram/ngram-model.h"
2626
#include "absl/container/flat_hash_set.h"

0 commit comments

Comments
 (0)