Use the supplemental model in converter_main.

Now the rescorer is managed by the supplemental model, we can use it.

PiperOrigin-RevId: 634578253

Author: Noriyuki Takahashi

Diff for: src/converter/BUILD.bazel

@@ -33,7 +33,6 @@ load(
     "mozc_cc_library",
     "mozc_cc_test",
     "mozc_py_binary",
-    "mozc_select_enable_neural_language_model",
     "mozc_select_enable_supplemental_model",
 )
 load("//bazel:stubs.bzl", "bzl_library")
@@ -568,8 +567,10 @@ mozc_cc_binary(
         "//data_manager",
         "//engine",
         "//engine:engine_interface",
+        "//engine:supplemental_model_interface",
         "//protocol:commands_cc_proto",
         "//protocol:config_cc_proto",
+        "//protocol:engine_builder_cc_proto",
         "//request:conversion_request",
         "//request:request_test_util",
         "@com_google_absl//absl/flags:flag",
@@ -578,7 +579,9 @@ mozc_cc_binary(
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
-    ] + mozc_select_enable_neural_language_model([
+    ] + mozc_select_enable_supplemental_model([
+        "//supplemental_model:supplemental_model_factory",
+        "//supplemental_model:supplemental_model_registration",
     ]),
 )
 

Diff for: src/converter/converter_main.cc

@@ -64,8 +64,10 @@
 #include "data_manager/data_manager.h"
 #include "engine/engine.h"
 #include "engine/engine_interface.h"
+#include "engine/supplemental_model_interface.h"
 #include "protocol/commands.pb.h"
 #include "protocol/config.pb.h"
+#include "protocol/engine_builder.pb.h"
 #include "request/conversion_request.h"
 #include "request/request_test_util.h"
 

Diff for: src/engine/BUILD.bazel

@@ -185,7 +185,6 @@ mozc_cc_library(
         "//prediction:dictionary_predictor",
         "//prediction:predictor",
         "//prediction:predictor_interface",
-        "//prediction:rescorer_interface",
         "//prediction:user_history_predictor",
         "//protocol:engine_builder_cc_proto",
         "//rewriter",

Diff for: src/engine/engine.h

@@ -52,7 +52,6 @@
 #include "engine/supplemental_model_interface.h"
 #include "engine/user_data_manager_interface.h"
 #include "prediction/predictor_interface.h"
-#include "prediction/rescorer_interface.h"
 #include "rewriter/rewriter_interface.h"
 
 namespace mozc {
@@ -148,11 +147,6 @@ class Engine : public EngineInterface {
     modules_->SetSupplementalModel(supplemental_model);
   }
 
-  void SetRescorer(
-      std::unique_ptr<const prediction::RescorerInterface> rescorer) override {
-    modules_->SetRescorer(std::move(rescorer));
-  }
-
   // For testing only.
   engine::Modules *GetModulesForTesting() const { return modules_.get(); }
 

Diff for: src/engine/modules.h

@@ -118,10 +118,6 @@ class Modules {
   const prediction::RescorerInterface *GetRescorer() const {
     return rescorer_.get();
   }
-  void SetRescorer(
-      std::unique_ptr<const prediction::RescorerInterface> rescorer) {
-    rescorer_ = std::move(rescorer);
-  }
 
 
   const engine::SupplementalModelInterface *GetSupplementalModel() const {