Merge pull request #1 from CodeSmithDSMLProjects/davidkim

Updates

Author: dydavidkim

.github/workflows/deploy-benchmark-prod.yml

@@ -7,8 +7,13 @@ on:
     paths:
     - "e2e/benchmarks/**"
 
+permissions:
+  contents: read
+
 jobs:
   deploy_live_website:
+    permissions:
+      pull-requests: write # for FirebaseExtended/action-hosting-deploy to comment on PRs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

tfjs-layers/src/BUILD.bazel

@@ -78,9 +78,7 @@ ts_library(
 
 ts_library(
     name = "tfjs-layers_test_lib",
-    # disable testonly for the issue in the nodejs build target.
-    # https://github.com/bazelbuild/rules_nodejs/pull/2984
-    #testonly = True,
+    testonly = True,
     srcs = glob(TEST_SRCS) + [":tests"],
     module_name = "@tensorflow/tfjs-layers/dist",
     deps = [

tfjs-layers/src/setup_tests.ts

@@ -28,7 +28,8 @@ import '@tensorflow/tfjs-backend-webgl';
 // tslint:disable-next-line: no-imports-from-dist
 import {parseTestEnvFromKarmaFlags, registerTestEnv, setTestEnvs, TEST_ENVS} from '@tensorflow/tfjs-core/dist/jasmine_util';
 
-registerTestEnv({
+// Register test environments.
+const webgl1TestEnv = {
   name: 'webgl1',
   backendName: 'webgl',
   flags: {
@@ -37,15 +38,31 @@ registerTestEnv({
     'WEBGL_SIZE_UPLOAD_UNIFORM': 0
   },
   isDataSync: true
+};
+registerTestEnv(webgl1TestEnv);
+registerTestEnv({name: 'cpu', backendName: 'cpu'});
+registerTestEnv({
+  name: 'webgl2',
+  backendName: 'webgl',
+  flags: {
+    'WEBGL_VERSION': 2,
+    'WEBGL_CPU_FORWARD': false,
+    'WEBGL_SIZE_UPLOAD_UNIFORM': 0
+  }
 });
 
 // Allow flags to override test envs
 // tslint:disable-next-line:no-any
 declare let __karma__: any;
 if (typeof __karma__ !== 'undefined') {
   const testEnv = parseTestEnvFromKarmaFlags(__karma__.config.args, TEST_ENVS);
+
   if (testEnv != null) {
     setTestEnvs([testEnv]);
+  } else {
+    // Exclude webgl1 unless it is specifically requested because it causes
+    // test flakiness when switching between webgl1 and webgl2.
+    setTestEnvs(TEST_ENVS.filter(env => env !== webgl1TestEnv));
   }
 }
 

tfjs-layers/src/utils/test_utils.ts

@@ -14,22 +14,10 @@
 
 import {memory, Tensor, test_util, util} from '@tensorflow/tfjs-core';
 // tslint:disable-next-line: no-imports-from-dist
-import {ALL_ENVS, describeWithFlags, registerTestEnv} from '@tensorflow/tfjs-core/dist/jasmine_util';
+import {ALL_ENVS, describeWithFlags} from '@tensorflow/tfjs-core/dist/jasmine_util';
 
 import {ValueError} from '../errors';
 
-// Register backends.
-registerTestEnv({name: 'cpu', backendName: 'cpu'});
-registerTestEnv({
-  name: 'webgl2',
-  backendName: 'webgl',
-  flags: {
-    'WEBGL_VERSION': 2,
-    'WEBGL_CPU_FORWARD': false,
-    'WEBGL_SIZE_UPLOAD_UNIFORM': 0
-  }
-});
-
 /**
  * Expect values are close between a Tensor or number array.
  * @param actual