Skip to content

No public description #249

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

Merged
copybara-service merged 1 commit into from
May 5, 2026
Merged

No public description #249

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
2 changes: 1 addition & 1 deletion mozolm/models/language_model.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#include <algorithm>

#include "ngram/ngram-model.h"
#include "absl/strings/str_cat.h"
#include "nisaba/port/utf8_util.h"
#include "ngram/ngram-model.h"

namespace mozolm {
namespace models {
Expand Down
2 changes: 1 addition & 1 deletion mozolm/models/language_model_hub.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <cmath>

#include "google/protobuf/stubs/logging.h"
#include "ngram/ngram-model.h"
#include "nisaba/port/utf8_util.h"
#include "ngram/ngram-model.h"
#include "nisaba/port/status_macros.h"

namespace mozolm {
Expand Down
2 changes: 1 addition & 1 deletion mozolm/models/ngram_fst_model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
#include <memory>
#include <vector>

#include "ngram/ngram-model.h"
#include "absl/status/status.h"
#include "mozolm/models/language_model.h"
#include "mozolm/models/model_storage.pb.h"
#include "fst/vector-fst.h"
#include "ngram/ngram-model.h"

namespace mozolm {
namespace models {
Expand Down
2 changes: 1 addition & 1 deletion mozolm/models/ngram_word_fst_model.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
#include <memory>

#include "google/protobuf/stubs/logging.h"
#include "ngram/ngram-model.h"
#include "absl/memory/memory.h"
#include "mozolm/models/model_storage.pb.h"
#include "mozolm/models/ngram_word_fst_options.pb.h"
#include "nisaba/port/utf8_util.h"
#include "fst/fst.h"
#include "fst/matcher.h"
#include "fst/symbol-table.h"
#include "ngram/ngram-model.h"
#include "nisaba/port/status_macros.h"

using nisaba::utf8::DecodeSingleUnicodeChar;
Expand Down
4 changes: 2 additions & 2 deletions mozolm/models/ppm_as_fst_model.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
#include <memory>

#include "google/protobuf/stubs/logging.h"
#include "ngram/ngram-count.h"
#include "ngram/ngram-model.h"
#include "absl/container/flat_hash_set.h"
#include "absl/memory/memory.h"
#include "absl/status/statusor.h"
Expand All @@ -30,6 +28,8 @@
#include "fst/arcsort.h"
#include "fst/symbol-table.h"
#include "fst/vector-fst.h"
#include "ngram/ngram-count.h"
#include "ngram/ngram-model.h"
#include "nisaba/port/status_macros.h"

namespace mozolm {
Expand Down
2 changes: 1 addition & 1 deletion mozolm/models/ppm_as_fst_model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@
#include <string>
#include <vector>

#include "ngram/ngram-count.h"
#include "absl/status/statusor.h"
#include "mozolm/models/language_model.h"
#include "mozolm/models/model_storage.pb.h"
#include "mozolm/models/ppm_as_fst_options.pb.h"
#include "fst/symbol-table.h"
#include "fst/vector-fst.h"
#include "ngram/ngram-count.h"

namespace mozolm {
namespace models {
Expand Down
4 changes: 2 additions & 2 deletions mozolm/utils/ngram_utils.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def ngram_convert_arpa_to_fst(
)

# Convert from ARPA to FST format.
converter_rule = "//third_party/opengrm/ngram:ngramread"
converter_rule = "@org_opengrm_ngram//:ngramread"
original_output_name = output_name
if relabel_to_codepoints:
# This is going to be an intermediate target.
Expand All @@ -57,7 +57,7 @@ def ngram_convert_arpa_to_fst(
name = output_name + "_fst",
srcs = [":%s_uncompress" % name],
outs = [output_name + ".fst"],
cmd = "$(location //third_party/opengrm/ngram:ngramread) --ARPA $< $@",
cmd = "$(location @org_opengrm_ngram//:ngramread) --ARPA $< $@",
tools = [
converter_rule,
],
Expand Down
Loading