Updated scheduler examples per #801 (#803)

naptha · Jul 26, 2023 · 6f90bc9 · 6f90bc9
1 parent 67b982e
commit 6f90bc9
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 8 deletions.
diff --git a/examples/browser/basic-efficient.html b/examples/browser/basic-efficient.html
@@ -4,7 +4,7 @@
     <script src="/dist/tesseract.dev.js"></script>
   </head>
   <body>
-    <input type="file" id="uploader">
+    <input type="file" id="uploader" multiple>
     <script type="module">
 
       // This is a basic example more efficient than "basic.html".
@@ -22,10 +22,11 @@
 
       const recognize = async function(evt){
         const files = evt.target.files;
-
-        const ret = await worker.recognize(files[0]);
-        console.log(ret.data.text);
-
+
+        for (let i=0; i<files.length; i++) {
+          const ret = await worker.recognize(files[i]);
+          console.log(ret.data.text);
+        }
       }
       const elm = document.getElementById('uploader');
       elm.addEventListener('change', recognize);

diff --git a/examples/browser/basic-scheduler.html b/examples/browser/basic-scheduler.html
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <script src="/dist/tesseract.dev.js"></script>
+  </head>
+  <body>
+    <input type="file" id="uploader" multiple>
+    <script type="module">
+
+      // This example builds on "basic-efficient.html".
+      // Rather than using a single worker, a scheduler manages a pool of multiple workers. 
+      // While performance is similar for a single file, this parallel processing results in significantly
+      // faster speeds when used with multiple files.
+
+      const scheduler = Tesseract.createScheduler();
+
+      // Creates worker and adds to scheduler
+      const workerGen = async () => {
+        const worker = await Tesseract.createWorker({
+          corePath: '../../node_modules/tesseract.js-core',
+          workerPath: "/dist/worker.dev.js",
+          logger: function(m){console.log(m);}
+        });
+        await worker.loadLanguage('eng');
+        await worker.initialize('eng');
+        scheduler.addWorker(worker);
+      }
+
+      const workerN = 4;
+      (async () => {
+        const resArr = Array(workerN);
+        for (let i=0; i<workerN; i++) {
+          resArr[i] = await workerGen();
+        }
+      })();
+
+      const recognize = async function(evt){
+        const files = evt.target.files;
+
+        for (let i=0; i<files.length; i++) {
+          scheduler.addJob('recognize', files[i]).then((x) => console.log(x.data.text))
+        }
+      }
+
+      const elm = document.getElementById('uploader');
+      elm.addEventListener('change', recognize);
+    </script>
+  </body>
+</html>
diff --git a/examples/node/scheduler.js b/examples/node/scheduler.js
@@ -4,8 +4,7 @@ const scheduler = createScheduler();
 
 // Creates worker and adds to scheduler
 const workerGen = async () => {
-  const worker = createWorker({cachePath: "."});
-  await worker.load();
+  const worker = await createWorker({cachePath: "."});
   await worker.loadLanguage('eng');
   await worker.initialize('eng');
   scheduler.addWorker(worker);
@@ -15,7 +14,7 @@ const workerN = 4;
 (async () => {
   const resArr = Array(workerN);
   for (let i=0; i<workerN; i++) {
-    resArr[i] = workerGen();
+    resArr[i] = await workerGen();
   }
   await Promise.all(resArr);
   /** Add 4 recognition jobs */