fix import path in kernel_names (#3653)

BUG

Also adds a custom lint rule to disable such imports.

Fixes #3617

Author: tafsiri

.tslint/noImportsWithRegexRule.js

@@ -0,0 +1,46 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+exports.__esModule = true;
+var Lint = require("tslint");
+var Rule = /** @class */ (function (_super) {
+    __extends(Rule, _super);
+    function Rule() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Rule.prototype.apply = function (sourceFile) {
+        return this.applyWithWalker(new NoImportsWithRegexWalker(sourceFile, this.getOptions()));
+    };
+    return Rule;
+}(Lint.Rules.AbstractRule));
+exports.Rule = Rule;
+var NoImportsWithRegexWalker = /** @class */ (function (_super) {
+    __extends(NoImportsWithRegexWalker, _super);
+    function NoImportsWithRegexWalker() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    NoImportsWithRegexWalker.prototype.visitImportDeclaration = function (node) {
+        var options = this.getOptions();
+        for (var _i = 0, options_1 = options; _i < options_1.length; _i++) {
+            var regStr = options_1[_i];
+            var importFrom = node.moduleSpecifier.getText();
+            var reg = new RegExp(regStr);
+            if (importFrom.match(reg)) {
+                this.addFailure(this.createFailure(node.moduleSpecifier.getStart(), node.moduleSpecifier.getWidth(), "importing from " + regStr + " is prohibited."));
+            }
+        }
+        _super.prototype.visitImportDeclaration.call(this, node);
+    };
+    return NoImportsWithRegexWalker;
+}(Lint.RuleWalker));

.tslint/noImportsWithRegexRule.ts

@@ -0,0 +1,26 @@
+import * as Lint from 'tslint';
+import * as ts from 'typescript';
+
+export class Rule extends Lint.Rules.AbstractRule {
+  public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
+    return this.applyWithWalker(
+        new NoImportsWithRegexWalker(sourceFile, this.getOptions()));
+  }
+}
+
+class NoImportsWithRegexWalker extends Lint.RuleWalker {
+  public visitImportDeclaration(node: ts.ImportDeclaration) {
+    const options = this.getOptions();
+    for (const regStr of options) {
+      const importFrom = node.moduleSpecifier.getText();
+      const reg = new RegExp(regStr);
+      if (importFrom.match(reg)) {
+        this.addFailure(this.createFailure(
+            node.moduleSpecifier.getStart(), node.moduleSpecifier.getWidth(),
+            `importing from ${regStr} is prohibited.`));
+      }
+    }
+
+    super.visitImportDeclaration(node);
+  }
+}

tfjs-backend-webgpu/src/kernels/reduce_webgpu.ts

@@ -16,8 +16,6 @@
  */
 
 import {backend_util, util} from '@tensorflow/tfjs-core';
-// TODO : use backend_util.reduce_util with the next release of tfjs-core.
-import {ReduceInfo} from '@tensorflow/tfjs-core/src/ops/reduce_util';
 import {getCoordsDataType} from '../shader_preprocessor';
 import {computeDispatch} from '../webgpu_util';
 import {WebGPUProgram} from './webgpu_program';
@@ -32,7 +30,8 @@ export class ReduceProgram implements WebGPUProgram {
   variableNames = ['x'];
   needsShapesUniforms = true;
 
-  constructor(reduceInfo: ReduceInfo, reduceType: 'max'|'min'|'sum') {
+  constructor(
+      reduceInfo: backend_util.ReduceInfo, reduceType: 'max'|'min'|'sum') {
     const inputShape = [reduceInfo.batchSize, reduceInfo.inSize];
     const [outputShape, reduceShape] =
         backend_util.computeOutAndReduceShapes(inputShape, [1]);

tfjs-core/src/kernel_names.ts

@@ -18,9 +18,8 @@
 // tslint:disable: variable-name
 // Unfortunately just enabling PascalCase per file (tslint:enable:
 // allow-pascal-case) doesn't work.
-import {ExplicitPadding} from '../src/ops/conv_util';
-
 import {NamedTensorInfoMap, TensorInfo} from './kernel_registry';
+import {ExplicitPadding} from './ops/conv_util';
 import {Activation} from './ops/fused_types';
 import {DataType, PixelData} from './types';
 

tslint.json

@@ -38,6 +38,7 @@
     "no-debugger": true,
     "no-default-export": true,
     "no-imports-from-dist": true,
+    "no-imports-with-regex": [true, "src"],
     "no-inferrable-types": true,
     "no-namespace": [true, "allow-declarations"],
     "no-reference": true,