Caching translations implementation

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "bergamot-translator-tests"]
 	path = bergamot-translator-tests
 	url = https://github.com/browsermt/bergamot-translator-tests
+[submodule "3rd_party/L4"]
+	path = 3rd_party/L4
+	url = https://github.com/browsermt/L4

3rd_party/CMakeLists.txt

@@ -9,6 +9,9 @@ endif(COMPILE_WASM)
 
 add_subdirectory(ssplit-cpp)
 
+set(L4_COMPILE_UNIT_TESTS OFF)
+add_subdirectory(L4)
+
 # Add include directories for 3rd party targets to be able to use it anywhere in the
 # project without explicitly specifying their include directories. Once they
 # fixe this problem, it can be removed.
@@ -18,7 +21,10 @@ target_include_directories(marian PUBLIC ${INCDIRS})
 get_property(INCLUDE_DIRECTORIES DIRECTORY ssplit-cpp/src PROPERTY INCLUDE_DIRECTORIES)
 target_include_directories(ssplit PUBLIC ${INCLUDE_DIRECTORIES})
 
+get_property(L4_INCLUDE_DIRECTORIES DIRECTORY L4 PROPERTY INCLUDE_DIRECTORIES)
+target_include_directories(L4 PUBLIC ${L4_INCLUDE_DIRECTORIES})
 # Compilation flags 
+
 get_directory_property(CMAKE_C_FLAGS DIRECTORY marian-dev DEFINITION CMAKE_C_FLAGS) 
 get_directory_property(CMAKE_CXX_FLAGS DIRECTORY marian-dev DEFINITION CMAKE_CXX_FLAGS) 
 set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} PARENT_SCOPE)    

app/bergamot.cpp

@@ -1,22 +1,28 @@
-#include "cli.h"
+#include "translator/byte_array_util.h"
+#include "translator/parser.h"
+#include "translator/response.h"
+#include "translator/response_options.h"
+#include "translator/service.h"
+#include "translator/utils.h"
 
 int main(int argc, char *argv[]) {
-  marian::bergamot::ConfigParser configParser;
+  using namespace marian::bergamot;
+  ConfigParser<AsyncService> configParser;
   configParser.parseArgs(argc, argv);
   auto &config = configParser.getConfig();
-  using namespace marian::bergamot;
-  switch (config.opMode) {
-    case OpMode::APP_WASM:
-      app::wasm(config);
-      break;
-    case OpMode::APP_NATIVE:
-      app::native(config);
-      break;
-    case OpMode::APP_DECODER:
-      app::decoder(config);
-      break;
-    default:
-      break;
-  }
+
+  AsyncService service(config.serviceConfig);
+
+  // Construct a model.
+  auto options = parseOptionsFromFilePath(config.modelConfigPaths.front());
+
+  MemoryBundle memoryBundle;
+  std::shared_ptr<TranslationModel> model = service.createCompatibleModel(options, std::move(memoryBundle));
+
+  ResponseOptions responseOptions;
+  std::string input = readFromStdin();
+  Response response = TranslateForResponse<AsyncService>()(service, model, std::move(input), responseOptions);
+
+  std::cout << response.target.text;
   return 0;
 }

src/tests/CMakeLists.txt

@@ -14,15 +14,25 @@ endif (COMPILE_UNIT_TESTS)
 if(NOT MSVC)
   # Testing apps
   set(APP_TESTS)
-  add_executable("bergamot-test" "cli.cpp" "apps.cpp")
+  add_executable("bergamot-test-native" "native-cli.cpp")
 
   if(CUDA_FOUND)
-    target_link_libraries("bergamot-test" bergamot-translator)
+    target_link_libraries("bergamot-test-native" bergamot-translator)
   else(CUDA_FOUND)
-    target_link_libraries("bergamot-test" bergamot-translator)
+    target_link_libraries("bergamot-test-native" bergamot-translator)
   endif(CUDA_FOUND)
 
-  set_target_properties("bergamot-test" PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+  set_target_properties("bergamot-test-native" PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+
+  add_executable("bergamot-test-wasm" "wasm-cli.cpp")
+
+  if(CUDA_FOUND)
+    target_link_libraries("bergamot-test-wasm" bergamot-translator)
+  else(CUDA_FOUND)
+    target_link_libraries("bergamot-test-wasm" bergamot-translator)
+  endif(CUDA_FOUND)
+
+  set_target_properties("bergamot-test-wasm" PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 
   # Adding an intgemm_resolve cmdline
   add_executable(intgemm-resolve intgemm_resolve.cpp)