Compile defs: __EMSCRIPTEN__ -> WASM

browsermt · Mar 23, 2021 · 258f23e · 258f23e
1 parent 8c89581
commit 258f23e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/translator/batch_translator.h b/src/translator/batch_translator.h
@@ -12,7 +12,7 @@
 #include "translator/history.h"
 #include "translator/scorers.h"
 
-#ifndef __EMSCRIPTEN__
+#ifndef WASM
 #include "pcqueue.h"
 #endif
 

diff --git a/src/translator/batcher.h b/src/translator/batcher.h
@@ -7,7 +7,7 @@
 #include "definitions.h"
 #include "request.h"
 
-#ifndef __EMSCRIPTEN__
+#ifndef WASM
 #include "pcqueue.h"
 #endif
 

diff --git a/src/translator/service.cpp b/src/translator/service.cpp
@@ -32,7 +32,7 @@ Service::Service(Ptr<Options> options, const void *model_memory)
     : requestId_(0), vocabs_(std::move(loadVocabularies(options))),
       text_processor_(vocabs_, options), batcher_(options),
       numWorkers_(options->get<int>("cpu-threads")), model_memory_(model_memory)
-#ifndef __EMSCRIPTEN__
+#ifndef WASM
       // 0 elements in PCQueue is illegal and can lead to failures. Adding a
       // guard to have at least one entry allocated. In the single-threaded
       // case, while initialized pcqueue_ remains unused.
@@ -70,7 +70,7 @@ void Service::blocking_translate() {
   }
 }
 
-#ifndef __EMSCRIPTEN__
+#ifndef WASM
 void Service::initialize_async_translators() {
   workers_.reserve(numWorkers_);
 
@@ -100,15 +100,15 @@ void Service::async_translate() {
     pcqueue_.ProduceSwap(batch);
   }
 }
-#else  // __EMSCRIPTEN__
+#else  // WASM
 void Service::initialize_async_translators() {
   ABORT("Cannot run in async mode without multithreading.");
 }
 
 void Service::async_translate() {
   ABORT("Cannot run in async mode without multithreading.");
 }
-#endif // __EMSCRIPTEN__
+#endif // WASM
 
 std::future<Response> Service::translate(std::string &&input) {
   Segments segments;
@@ -132,7 +132,7 @@ std::future<Response> Service::translate(std::string &&input) {
 }
 
 Service::~Service() {
-#ifndef __EMSCRIPTEN__
+#ifndef WASM
   for (size_t workerId = 0; workerId < numWorkers_; workerId++) {
 
     Batch poison = Batch::poison();

diff --git a/src/translator/service.h b/src/translator/service.h
@@ -8,7 +8,7 @@
 #include "text_processor.h"
 #include "translator/parser.h"
 
-#ifndef __EMSCRIPTEN__
+#ifndef WASM
 #include "pcqueue.h"
 #endif
 
@@ -111,10 +111,10 @@ class Service {
 
   // The following constructs are available providing full capabilities on a non
   // WASM platform, where one does not have to hide threads.
-#ifndef __EMSCRIPTEN__
+#ifndef WASM
   PCQueue<Batch> pcqueue_; // ORDER DEPENDENCY (numWorkers_)
   std::vector<std::thread> workers_;
-#endif // __EMSCRIPTEN__
+#endif // WASM
 };
 
 } // namespace bergamot