Resolve conflict

Author: syt123450

.gitignore

@@ -13,3 +13,6 @@ bazel-out/
 yalc.lock
 .rpt2_cache/
 package/
+
+tfjs-backend-wasm/dist
+tfjs-backend-wasm/wasm-out

.npmignore

@@ -1,9 +1,13 @@
+# Ignore other packages in the mono-repo.
+tfjs-webgpu/
+tfjs-backend-nodegl/
+tfjs-react-native/
+
 .vscode/
 .rpt2_cache/
 src/**/*_test.ts
 integration_tests/
-src/backends/webgpu/
-dist/backends/webgpu/
+
 dist/backends/**/*_test.js
 models/
 coverage/
@@ -23,3 +27,5 @@ rollup.config.js
 tsconfig.json
 .yalc/
 yalc.lock
+tfjs-react-native/
+tfjs-backend-nodegl/

.vscode/c_cpp_properties.json

@@ -0,0 +1,20 @@
+{
+    "configurations": [
+        {
+            "name": "Mac",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "~/emsdk/fastcomp/emscripten/system/include/**"
+            ],
+            "defines": [],
+            "macFrameworkPath": [
+                "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks"
+            ],
+            "compilerPath": "/usr/bin/clang",
+            "cStandard": "c11",
+            "cppStandard": "c++11",
+            "intelliSenseMode": "clang-x64"
+        }
+    ],
+    "version": 4
+}

.vscode/settings.json

@@ -8,8 +8,6 @@
     "**/.rpt2_cache/": true,
     "**/.yalc/**/*": true
   },
-  "tslint.enable": true,
-  "tslint.run": "onType",
   "tslint.configFile": "tslint.json",
   "files.trimTrailingWhitespace": true,
   "editor.tabSize": 2,

benchmarks/index.html

@@ -169,39 +169,160 @@ <h2>TensorFlow.js Model Benchmark</h2>
       <tbody></tbody>
     </table>
   </div>
-  <script src="https://unpkg.com/@tensorflow/tfjs-core/dist/tf-core.js"></script>
-  <script src="https://unpkg.com/@tensorflow/tfjs-layers/dist/tf-layers.js"></script>
-  <script src="https://unpkg.com/@tensorflow/tfjs-converter/dist/tf-converter.js"></script>
-  <script>
-    'use strict';
-    async function load() {
-      //////////////////////////////////
-      // Place model loading code here.
-      //////////////////////////////////
-      return await tf.loadGraphModel(
-        'https://tfhub.dev/google/imagenet/mobilenet_v2_050_224/classification/2', { fromTFHub: true });
-    }
-
-    const zeros = tf.zeros([1, 224, 224, 3]);
-    function predict(model) {
-      //////////////////////////////////
-      // Place model prediction code here.
-      //////////////////////////////////
-      if (isAsync) {
-        return model.executeAsync(zeros);
-      }
-      return model.predict(zeros);
-    }
-  </script>
+  <script src="https://unpkg.com/@tensorflow/tfjs-core@latest/dist/tf-core.js"></script>
+  <script src="https://unpkg.com/@tensorflow/tfjs-layers@latest/dist/tf-layers.js"></script>
+  <script src="https://unpkg.com/@tensorflow/tfjs-converter@latest/dist/tf-converter.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@tensorflow-models/universal-sentence-encoder"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@tensorflow-models/[email protected]/dist/posenet.min.js"></script>
   <script>
     'use strict';
+
+    const sentences = [
+      'add clem burke in my playlist Pre-Party R&B Jams',
+      'Add Live from Aragon Ballroom to Trapeo',
+      'add Unite and Win to my night out',
+      'Add track to my Digster Future Hits',
+      'add the piano bar to my Cindy Wilson',
+      'Add Spanish Harlem Incident to cleaning the house',
+      'add The Greyest of Blue Skies in Indie Español my playlist',
+      'Add the name kids in the street to the plylist New Indie Mix',
+      'add album radar latino',
+      'Add Tranquility to the Latin Pop Rising playlist.',
+      'play something from the twenties',
+      'Play The View From The Afternoon by Malese Jow on Last Fm',
+      'play songs by Sammy Fain',
+      'Play music from the year 1964',
+      'Play the heinz strobl ep from 2016 on Groove Shark',
+      'Play me Leonid Soybelman on Vimeo.',
+      'Play a song from my workout playlist on Groove Shark',
+      'play some Alte Kameraden music',
+      'Will it be warm 1 week from now in DC',
+      'what is the forecast for temperate conditions in Thailand in Lopeno',
+      'Is the weather colder in Costa Rica',
+      'Will it be colder in Delaware?',
+      '"I need to know the weather for Hamorton, TN"',
+      'What will the weather be in Albania at 11:56.',
+      'Is it going to hail in Mount San Jacinto State Park',
+      'What\'s the forecast for Walker Bay Nature Reserve for next year ? ',
+      'is it supposed to be sunny here?',
+      'in California will it be cold in East Trenton Heights',
+      'What is the weather like in Wallis and Futuna? What will the weather be in Romania at 4?',
+      'What is the weather going to be like in Reidland New Mexico next Jun.?',
+      'How cold is it in Cargray, Argentina?',
+      'Is the forecast chillier in 1 hour in Mali',
+      'Tell me if there will be wind in NE Will it be cloudy not far  from Allenton Will there be a blizzard in AR what is the New Caledonia forecast for Bagnell on sep. the 5th Weather for apr. the thirteenth in Djibouti',
+      'Can you give me the weather forecast in Tajikistan? How cold is it going to be in San Marcial, AK in one second? What will the weather be in a month from now at my current location?',
+      'What is the weather like in IA in april How windy is it in Anderson Lake State Fish and Wildlife Area? Is it going to be stormy in Austin Creek State Recreation Area at 09:42?',
+      'When will the weather be temperate like it is now in Stansbury Park in Tuvalu, What is the weather in neighboring OH, What\'s the weather forecast for Spain ? ',
+      'Play the music Hands Up',
+      'Play some twenties theme music on Google Music.',
+      'How will the weather be in New Mexico around 00:09:07 am?',
+      'What will the humidity be in AR in 49 weeks and a half from now',
+      'Is it humid in Parc national de Killarney',
+      'is it supposed to get colder here on 12/28/2019',
+      'How is the forecast for OK?',
+      'what is the Posey Island State Park forecast for colder temps at meal time',
+      'Is it supposed to be chilly in Kuwait?',
+      'Tell me if it\'ll be chilly here at 0 pm',
+      'what is the forecast for colder conditions within the same area of this current place',
+      'Will it hail today in West Point at 11:36:48',
+      'Is it overcast in South Carolina',
+      'Will the sun be out close-by Admiralty Island National Monument?',
+      'What will the weather be in Wakarusa',
+      'How temperate will it be here this week?',
+      'what is the forecast for here at tea time',
+    ];
+
+    const benchmarks = {
+      'mobilenet': {
+        load: async () => {
+          const url = 'https://tfhub.dev/google/imagenet/mobilenet_v2_100_224/classification/2'
+          return tf.loadGraphModel(url, { fromTFHub: true });
+        },
+        predictFunc: () => {
+          const zeros = tf.zeros([1, 224, 224, 3]);
+          return (model) => {
+            if (isAsync) {
+              return model.executeAsync(zeros);
+            }
+            return model.predict(zeros);
+          }
+        }
+      },
+      'USE - batchsize 30': {
+        load: async () => {
+          return use.load();
+        },
+        predictFunc: () => {
+          const sentences30 = sentences.slice(0, 30);
+          return async (model) => {
+            const res = await model.embed(sentences30);
+            return await res.data();
+          }
+
+        }
+      },
+      'USE - batchsize 1': {
+        load: async () => {
+          return use.load();
+        },
+        predictFunc: () => {
+          let nextIdx = 0;
+
+          return async () => {
+            const next = [sentences[(nextIdx % sentences.length)]];
+            const res = await model.embed(next);
+            nextIdx += 1;
+            return await res.data();
+          }
+        }
+      },
+      'posenet': {
+        load: async () => {
+          const imageBucket =
+            'https://storage.googleapis.com/tfjs-models/assets/posenet/';
+
+          async function loadImage(imagePath) {
+            const image = new Image();
+            const promise = new Promise((resolve, reject) => {
+              image.crossOrigin = '';
+              image.onload = () => {
+                resolve(image);
+              };
+            });
+
+            image.src = `${imageBucket}${imagePath}`;
+            return promise;
+          }
+
+          const posenetModel = await posenet.load();
+          const image = await loadImage('tennis_standing.jpg');
+
+          posenetModel.benchmarkImage = image;
+          return posenetModel;
+        },
+        predictFunc: () => {
+          return async (model) => {
+            const image = model.benchmarkImage;
+            const pose = await model.estimateSinglePose(image);
+            return pose;
+          }
+        }
+      },
+    };
+
     const state = {
       numRuns: 50,
+      benchmark: 'mobilenet',
+      run: (v) => {
+        runBenchmark();
+      },
     };
+
     const modalDiv = document.getElementById('modal-msg');
     const timeTable = document.querySelector('#timings tbody');
     const envDiv = document.getElementById('env');
-    let model, isAsync;
+    let model, isAsync, predict;
 
     async function showMsg(message) {
       if (message != null) {
@@ -248,7 +369,7 @@ <h2>TensorFlow.js Model Benchmark</h2>
         if (c instanceof HTMLElement) {
           td.appendChild(c);
         } else {
-          td.textContent = c;
+          td.innerHTML = c;
         }
         tr.appendChild(td);
       });
@@ -276,14 +397,19 @@ <h2>TensorFlow.js Model Benchmark</h2>
       return new Promise(resolve => setTimeout(resolve, timeMs));
     }
 
-    async function loadAndRecordTime() {
+    async function loadAndRecordTime(benchmark) {
       await showMsg('Loading the model');
       const start = performance.now();
-      model = await load();
+      model = await benchmark.load();
+      predict = benchmark.predictFunc();
       isAsync = model.executor != null && model.executor.isControlFlowModel;
 
       const elapsed = performance.now() - start;
       await showMsg(null);
+
+      appendRow(timeTable, `<b>Benchmark:</b> ${state.benchmark}`,
+        `<b>Runs:</b> ${state.numRuns}`);
+
       appendRow(timeTable, 'Model load', printTime(elapsed));
     }
 
@@ -300,7 +426,7 @@ <h2>TensorFlow.js Model Benchmark</h2>
         const start = performance.now();
         let res = predict(model);
         if (res instanceof Promise) {
-          res = await res;
+          await res;
         }
 
         if (res instanceof tf.Tensor) {
@@ -354,7 +480,7 @@ <h2>TensorFlow.js Model Benchmark</h2>
 
     async function profileKernelTime() {
       await showMsg('Profiling kernels');
-      tf.ENV.set('DEBUG', true);
+      _tfengine.ENV.set('DEBUG', true);
       const oldLog = console.log;
       let kernels = [];
       console.log = msg => {
@@ -393,25 +519,23 @@ <h2>TensorFlow.js Model Benchmark</h2>
       await sleep(10);
       kernels = kernels.sort((a, b) => b.time - a.time);
       appendRow(timeTable, 'Number of kernels', kernels.length);
+
+      // Add an empty row at the end of a benchmark run
+      appendRow(timeTable, '', '');
       showKernelTime(kernels);
-      tf.ENV.set('DEBUG', false);
+      _tfengine.ENV.set('DEBUG', false);
       // Switch back to the old log;
       console.log = oldLog;
     }
 
     function queryTimerIsEnabled() {
-      return tf.ENV.getNumber('WEBGL_DISJOINT_QUERY_TIMER_EXTENSION_VERSION') > 0;
+      return _tfengine.ENV.getNumber('WEBGL_DISJOINT_QUERY_TIMER_EXTENSION_VERSION') > 0;
     }
 
-    async function onPageLoad() {
-      var gui = new dat.gui.GUI();
-      //gui.remember(obj);
-      gui.add(state, 'numRuns').onChange(v => {
-        measureAveragePredictTime();
-      });
-      showVersions();
-      await showEnvironment();
-      await loadAndRecordTime();
+
+    async function runBenchmark() {
+      const benchmark = benchmarks[state.benchmark];
+      await loadAndRecordTime(benchmark);
       await warmUpAndRecordTime();
       await showMsg('Waiting for GC');
       await sleep(1000);
@@ -426,8 +550,23 @@ <h2>TensorFlow.js Model Benchmark</h2>
           'available. <br/> Use Chrome 70+.');
       };
     }
+
+    async function onPageLoad() {
+      var gui = new dat.gui.GUI();
+
+      gui.add(state, 'numRuns');
+      gui.add(state, 'benchmark', ['', ...Object.keys(benchmarks)]);
+      gui.add(state, 'run');
+
+      showVersions();
+      await showEnvironment();
+
+      // Run first benchmark by default on page load.
+      runBenchmark();
+    }
+
     onPageLoad();
   </script>
 </body>
 
-</html>
+</html>