Commit Graph

33 Commits

Author SHA1 Message Date
Nikolay Bogoychev
10131c731a
Marian submodule with unified loading (#157) 2021-05-18 12:45:22 +01:00
Kenneth Heafield
ce01de939d
Change USE_WASM_COMPATIBLE_SOURCE =OFF by default on native, force on for WASM (#138)
* Change WASM_COMPATIBLE_SOURCE=OFF by default

The default was WASN_COMPATIBLE_SOURCE=ON COMPILE_WASM=OFF which is a
testing configuration, not a sensible default for native or wasm.

* Always USE_WASM_COMPATIBLE_SOURCE with COMPILE_WASM

* Set CMP0077 to fix variable handling
2021-05-10 12:28:37 +02:00
Nikolay Bogoychev
87adb5d60a Target master of ssplit-cpp 2021-05-07 18:41:08 +01:00
Nikolay Bogoychev
21c1cae472
Update ssplit submodule, removing absl (#132)
* Update ssplit submodule, removing absl

* Fix ssplit variables

* Update ssplit branch

* Fix emscripten compilaiton

* Update tests
2021-05-07 17:58:58 +01:00
Qianqian Zhu
5b02008a97
Enable vocabs pass as byte arrays (#122)
* first attempt to enable vocabs pass as byte arrays

* pass vocabs bytes as AlignedMemory

* add vocabIndices to avoid double loading

* small fix on parameter names and documentation

* fix windows build plus tiny update on documentation

* update marian-dev submodule

* move validate model bytearray in BatchTranslator

* small refactors on validateBinaryModel()

* switch vocab memories to std::vector<marian::Ptr<AlignedMemory>>

* update marian-dev submodule

* replace marian::Ptr to std::shared_ptr for vocab memories

* add note for vocab memories
2021-05-07 14:54:48 +01:00
Nikolay Bogoychev
d82e01eda4
Full windows support with ssplit from browsermt, not a fork (#109)
* Update marian-dev to the newest mac version

* Attempt windows workflow

* force workflow rerun

* Separate id

* Attempt 3 at github action

* Marian dev submodule now compiles with apple clang

* Updated ssplit version to something more recent

* Attempt to fix compile on wasm

* Do not compile subproject tests

* Fix emscripten compilation on Mac

* 99% on the way to windows compile

* Try with a different generator

* Build release not debug

* Revert CMakeLists.txt hacks

* Fix sse2 compilation failure

* MSVC settings for WIN32

* Add nodefaultlib LIBCMT

* Do not compile ssplit.cpp as it contains sys/mman.h

* Revert ab56b9aa4f

* Update paths

* Set the build type to release if not set previously

* Attempt to build release with the windows workflow

* Attempt 5 at VS studio release build

* Attempt 6 at getting release build on MSVC generator

* The windows build is debug at the moment...

* fix ssplit for ubuntu 16.04

* Fix compilation with clang

* Compile on ubuntu16.04

* Explain what is going on

* Updated ssplit and workflow
2021-05-01 00:29:23 +01:00
Nikolay Bogoychev
e286533164 Update to marian-dev master 2021-04-30 22:34:44 +01:00
Nikolay Bogoychev
fdf9e66cef
Windows workflows and mac framework accelerate (#108)
Windows still failing but getting closer
2021-04-26 18:59:20 +01:00
abhi-agg
2e5daac978
Marian submodule update (#74)
* Updated marian-dev submodule

 - cmake changes required after the submodule update

* Added workflows for building custom marian on mac and ubuntu

* Renamed cmake option

 - Renamed USE_WASM_COMPATIBLE_SOURCES to USE_WASM_COMPATIBLE_SOURCE
 - Use proper compile defnitions
2021-04-01 16:29:02 +01:00
Abhishek Aggarwal
fdbce5705b Update marian-dev submodule to master
- Earlier it was using 'wasm' branch
 - CMakefile changes
 - Github workflow change
2021-03-26 10:02:13 +01:00
Nikolay Bogoychev
d75dd85def
Load mode as a byte array (#55)
* Switch to wasm branch for this example

* Load marian model from a byte array

* Sanitise executable names

* Change marian branch

* Update marian branch that loads binary models

* Example of loading model as a byte array

* Add the byte array loading files

* Die on misaligned memory

* Remove the unused argument

* Allow loading without a ptr parameter so that we don't break emc workflow
2021-03-22 14:22:56 +00:00
Abhishek Aggarwal
d3ef1a9bc3 Updated marian submodule
- This fixes the binary model loading problem for wasm
2021-03-10 15:50:27 +01:00
Ulrich Germann
f17f02a544
Update submodule ssplit-cpp 2021-03-03 11:48:56 +01:00
Abhishek Aggarwal
b845ed3693 Update marian submodule
- Fixes the compilation while building with full blown marian
2021-02-24 19:54:38 +01:00
Abhishek Aggarwal
5dcbb721fa Update ssplit submodule to master branch
- This submodule brings pcre2 lib compiled from sources
2021-02-22 18:03:53 +01:00
Jerin Philip
fbff7389d1 Temporary: Switch to abhi-agg/ssplit-cpp@wasm 2021-02-18 11:20:01 +00:00
Jerin Philip
b9d081dd45 Temporary: Updating marian-dev to wasm branch 2021-02-17 19:51:57 +00:00
Jerin Philip
10dcb8f548 Merge remote-tracking branch 'origin/wasm-integration' into jp/absorb-batch-translator
Merging wasm-integration. Single thread codepath seems functional.
Multithreading is broken.
2021-02-17 13:08:58 +00:00
Abhishek Aggarwal
0374ac4696 Updated marian submodule
- Includes try/catch free builds
 - Has ASSERTION=0 and DISABLE_EXCEPTION_CATCHING=1 for wasm builds
2021-02-15 16:36:26 +01:00
Jerin Philip
38e8b3cd6d Updates: marian-dev, ssplit for marian-decoder-new
Updates marian-dev and ssplit submodules to point to the upstream
commits which implements the following:

 - marian-dev: encodeWithByteRanges(...) to get source token byte-ranges
 - ssplit: Has a trivial sentencesplitter functionality implemented, and
   now is faster to benchmark with marian-decoder.

This enables a marian-decoder replacement written through ssplit in this
source to be benchmarked constantly with existing marian-decoder.

Nits: Removes logging introduced for multiple workers, and respective
log statements.
2021-02-12 14:23:24 +00:00
Abhishek Aggarwal
3b7673bf15 Updated marian-dev submodule
- This fixes the issue of sentencepiece not being able to checkout
   properly
2021-02-12 14:38:16 +01:00
Abhishek Aggarwal
28dcf55b41 Improved cmake to use wasm compilation flags across project 2021-02-12 11:36:33 +01:00
Abhishek Aggarwal
a2d3269344 Updated ssplit submodule 2021-02-10 11:27:16 +01:00
Abhishek Aggarwal
5683168a8d Updated ssplit submodule to a different repository
- Added abhi-agg/ssplit-cpp
 - Added its wasm branch in bergamot-translator
 - Native builds of bergamot-translator are successful
   -- Sentence splitting is NOT WORKING
   -- Only translation is working
2021-02-10 10:33:01 +01:00
Abhishek Aggarwal
9a54d2116c Updated marian-dev submodule
- Switch to "wasm" branch of browsermt/marian-dev
2021-02-08 13:46:59 +01:00
Jerin Philip
7e2eb02e18 CI and Associated Changes
Enables Mac and Ubuntu CPU only builds through GitHub CI. CI scripts are
copied from marian-dev with necessary changes.

3rd-party/marian-dev is modified to meet C++17 requirements modifying
for half_float.
2021-01-23 13:34:04 +00:00
Abhishek Aggarwal
c8fc004452 Improved 3rd party header inclusion and library linking 2021-01-22 15:47:36 +01:00
Jerin Philip
bde9094728 Updating CMakeLists to build main
CMakeLists have been modified with the necessary includes to add
browsermt/mts@nuke files to the bergamot-translator library. In
addition, adds the ssplit dependency, corresponding includes.

Intel MKL fails on compilation, unable to find libraries. To solve this
3rd_party/CMakeLists.txt is modified with @ug's fixes to propogate
variables (EXT_LIBS, etc) at a library level.
2021-01-20 19:52:34 +00:00
Jerin Philip
d786f2554e Bumping marian with sentencepiece capable fork
Modifications to SentencePiece are necessary to provide token level
string_views. This commit changes marian to an alternate branch which
has the feature incorporated.
2021-01-20 19:14:40 +00:00
Abhishek Aggarwal
358d76871f Small change: Added New line endings 2020-11-11 17:18:12 +01:00
Abhishek Aggarwal
a220f915fc Compile marian submodule in the project
- marian compiles successfully and is ready to be used
   in the project
2020-11-11 16:19:54 +01:00
Abhishek Aggarwal
e8716f7fd1 Added "browsermt/marian-dev" as submodule 2020-11-09 12:02:51 +01:00
Abhishek Aggarwal
7a695a08cb Added "ugermann/ssplit-cpp" as a submodule 2020-11-09 12:01:54 +01:00