diff --git a/tfjs-core/src/kernel_names.ts b/tfjs-core/src/kernel_names.ts index a58985e5028..deccb85147e 100644 --- a/tfjs-core/src/kernel_names.ts +++ b/tfjs-core/src/kernel_names.ts @@ -64,6 +64,9 @@ export type IdentityInputs = Pick; export const Less = 'Less'; export type LessInputs = BinaryInputs; +export const LessEqual = 'LessEqual'; +export type LessEqualInputs = BinaryInputs; + export const MaxPoolWithArgmax = 'MaxPoolWithArgmax'; export type MaxPoolWithArgmaxInputs = Pick; export interface MaxPoolWithArgmaxAttrs { diff --git a/tfjs-core/src/ops/compare.ts b/tfjs-core/src/ops/compare.ts index ae927c22968..c09f2ff7f21 100644 --- a/tfjs-core/src/ops/compare.ts +++ b/tfjs-core/src/ops/compare.ts @@ -63,37 +63,6 @@ function equalStrict_(a: T|TensorLike, b: T|TensorLike): T { return $a.equal($b); } -/** - * Returns the truth value of (a <= b) element-wise. Supports broadcasting. - * - * We also expose `tf.lessEqualStrict` which has the same signature as this op - * and asserts that `a` and `b` are the same shape (does not broadcast). - * - * ```js - * const a = tf.tensor1d([1, 2, 3]); - * const b = tf.tensor1d([2, 2, 2]); - * - * a.lessEqual(b).print(); - * ``` - * - * @param a The first input tensor. - * @param b The second input tensor. Must have the same dtype as `a`. - */ -/** @doc {heading: 'Operations', subheading: 'Logical'} */ -function lessEqual_( - a: Tensor|TensorLike, b: Tensor|TensorLike): T { - let $a = convertToTensor(a, 'a', 'lessEqual'); - let $b = convertToTensor(b, 'b', 'lessEqual'); - [$a, $b] = makeTypesMatch($a, $b); - assertAndGetBroadcastShape($a.shape, $b.shape); - - return ENGINE.runKernelFunc((backend, save) => { - const res = backend.lessEqual($a, $b); - save([$a, $b]); - return res; - }, {a: $a, b: $b}, null /* grad */, 'LessEqual') as T; -} - function lessEqualStrict_( a: T|TensorLike, b: T|TensorLike): T { const $a = convertToTensor(a, 'a', 'lessEqualStrict'); @@ -156,7 +125,6 @@ export const equalStrict = op({equalStrict_}); export const greaterEqual = op({greaterEqual_}); export const greaterEqualStrict = op({greaterEqualStrict_}); export const greaterStrict = op({greaterStrict_}); -export const lessEqual = op({lessEqual_}); export const lessEqualStrict = op({lessEqualStrict_}); export const lessStrict = op({lessStrict_}); export const notEqualStrict = op({notEqualStrict_}); diff --git a/tfjs-core/src/ops/compare_ops_test.ts b/tfjs-core/src/ops/compare_ops_test.ts index 4f0b95973b3..d56bc652ed9 100644 --- a/tfjs-core/src/ops/compare_ops_test.ts +++ b/tfjs-core/src/ops/compare_ops_test.ts @@ -514,329 +514,63 @@ describeWithFlags('lessStrict', ALL_ENVS, () => { }); }); -describeWithFlags('lessEqual', ALL_ENVS, () => { - it('Tensor1D - int32', async () => { - let a = tf.tensor1d([1, 4, 5], 'int32'); - let b = tf.tensor1d([2, 3, 5], 'int32'); - let res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 0, 1]); - - a = tf.tensor1d([2, 2, 2], 'int32'); - b = tf.tensor1d([2, 2, 2], 'int32'); - res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1]); - - a = tf.tensor1d([0, 0], 'int32'); - b = tf.tensor1d([3, 3], 'int32'); - res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1]); - }); - it('Tensor1D - float32', async () => { - let a = tf.tensor1d([1.1, 4.1, 5.1], 'float32'); - let b = tf.tensor1d([2.2, 3.2, 5.1], 'float32'); - let res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 0, 1]); - - a = tf.tensor1d([2.31, 2.31, 2.31], 'float32'); - b = tf.tensor1d([2.31, 2.31, 2.31], 'float32'); - res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1]); - - a = tf.tensor1d([0.45, 0.123], 'float32'); - b = tf.tensor1d([3.123, 3.321], 'float32'); - res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1]); - }); - - it('upcasts when dtypes dont match', async () => { - const a = [1.1, 4.1, 5]; - const b = [2.2, 3.2, 5]; - - let res = - tf.lessEqual(tf.tensor(a, [3], 'float32'), tf.tensor(b, [3], 'int32')); - expect(res.dtype).toBe('bool'); - expect(res.shape).toEqual([3]); - expectArraysClose(await res.data(), [1, 0, 1]); - - res = tf.lessEqual(tf.tensor(a, [3], 'int32'), tf.tensor(b, [3], 'bool')); - expect(res.dtype).toBe('bool'); - expect(res.shape).toEqual([3]); - expectArraysClose(await res.data(), [1, 0, 0]); - }); - - it('TensorLike', async () => { - const a = [1.1, 4.1, 5.1]; - const b = [2.2, 3.2, 5.1]; - const res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 0, 1]); - }); - it('TensorLike Chained', async () => { - const a = tf.tensor1d([1.1, 4.1, 5.1], 'float32'); - const b = [2.2, 3.2, 5.1]; - const res = a.lessEqual(b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 0, 1]); - }); - it('mismatched Tensor1D shapes - int32', () => { - const a = tf.tensor1d([1, 2], 'int32'); - const b = tf.tensor1d([1, 2, 3], 'int32'); - const f = () => { - tf.lessEqual(a, b); - }; - expect(f).toThrowError(); - }); - it('mismatched Tensor1D shapes - float32', () => { - const a = tf.tensor1d([1.1, 2.1], 'float32'); - const b = tf.tensor1d([1.1, 2.1, 3.1], 'float32'); - const f = () => { - tf.lessEqual(a, b); - }; - expect(f).toThrowError(); - }); - it('NaNs in Tensor1D - float32', async () => { - const a = tf.tensor1d([1.1, NaN, 2.1], 'float32'); - const b = tf.tensor1d([2.1, 3.1, NaN], 'float32'); - const res = tf.lessEqual(a, b); +describeWithFlags('lessEqualStrict', ALL_ENVS, () => { + it('Tensor1D - strict version throws when a and b are different shape', + () => { + const a = tf.tensor1d([2]); + const b = tf.tensor1d([4, 2, -1]); - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 0, 0]); - }); + expect(() => tf.lessEqualStrict(a, b)).toThrowError(); + expect(() => tf.lessEqualStrict(b, a)).toThrowError(); + }); // Tensor2D: - it('Tensor2D - int32', async () => { - let a = tf.tensor2d([[1, 4, 5], [8, 9, 12]], [2, 3], 'int32'); - let b = tf.tensor2d([[2, 3, 6], [7, 10, 11]], [2, 3], 'int32'); - let res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 0, 1, 0, 1, 0]); - - a = tf.tensor2d([[0, 0], [1, 1]], [2, 2], 'int32'); - b = tf.tensor2d([[0, 0], [1, 1]], [2, 2], 'int32'); - res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1, 1]); - }); - it('Tensor2D - float32', async () => { - let a = tf.tensor2d([[1.1, 4.1, 5.1], [8.1, 9.1, 12.1]], [2, 3], 'float32'); - let b = - tf.tensor2d([[2.1, 3.1, 6.1], [7.1, 10.1, 11.1]], [2, 3], 'float32'); - let res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 0, 1, 0, 1, 0]); - - a = tf.tensor2d([[0.2, 0.2], [1.2, 1.2]], [2, 2], 'float32'); - b = tf.tensor2d([[0.2, 0.2], [1.2, 1.2]], [2, 2], 'float32'); - res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1, 1]); - }); - it('broadcasting Tensor2D shapes - int32', async () => { - const a = tf.tensor2d([[3], [7]], [2, 1], 'int32'); - const b = tf.tensor2d([[2, 3, 4], [7, 8, 9]], [2, 3], 'int32'); - const res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [0, 1, 1, 1, 1, 1]); - }); - it('broadcasting Tensor2D shapes - float32', async () => { - const a = tf.tensor2d([[1.1], [7.1]], [2, 1], 'float32'); - const b = - tf.tensor2d([[0.1, 1.1, 2.1], [7.1, 8.1, 9.1]], [2, 3], 'float32'); - const res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [0, 1, 1, 1, 1, 1]); - }); - it('NaNs in Tensor2D - float32', async () => { - const a = tf.tensor2d([[1.1, NaN], [0.1, NaN]], [2, 2], 'float32'); - const b = tf.tensor2d([[0.1, NaN], [1.1, NaN]], [2, 2], 'float32'); - const res = tf.lessEqual(a, b); + it('Tensor2D - strict version throws when a and b are different shape', + () => { + const a = tf.tensor2d([[1.1], [7.1]], [2, 1], 'float32'); + const b = + tf.tensor2d([[0.1, 1.1, 2.1], [7.1, 8.1, 9.1]], [2, 3], 'float32'); - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [0, 0, 1, 0]); - }); + expect(() => tf.lessEqualStrict(a, b)).toThrowError(); + expect(() => tf.lessEqualStrict(b, a)).toThrowError(); + }); // Tensor3D: - it('Tensor3D - int32', async () => { - let a = - tf.tensor3d([[[1], [4], [5]], [[8], [9], [12]]], [2, 3, 1], 'int32'); - let b = - tf.tensor3d([[[2], [3], [6]], [[7], [10], [11]]], [2, 3, 1], 'int32'); - let res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 0, 1, 0, 1, 0]); - - a = tf.tensor3d([[[0], [0], [0]], [[1], [1], [1]]], [2, 3, 1], 'int32'); - b = tf.tensor3d([[[0], [0], [0]], [[1], [1], [1]]], [2, 3, 1], 'int32'); - res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1, 1, 1, 1]); - }); - it('Tensor3D - float32', async () => { - let a = tf.tensor3d( - [[[1.1], [4.1], [5.1]], [[8.1], [9.1], [12.1]]], [2, 3, 1], 'float32'); - let b = tf.tensor3d( - [[[2.1], [3.1], [6.1]], [[7.1], [10.1], [11.1]]], [2, 3, 1], 'float32'); - let res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 0, 1, 0, 1, 0]); - - a = tf.tensor3d( - [[[0.1], [0.1], [0.1]], [[1.1], [1.1], [1.2]]], [2, 3, 1], 'float32'); - b = tf.tensor3d( - [[[0.1], [0.1], [0.1]], [[1.1], [1.1], [1.1]]], [2, 3, 1], 'float32'); - res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1, 1, 1, 0]); - }); - it('broadcasting Tensor3D shapes - int32', async () => { - const a = tf.tensor3d( - [[[1, 0], [2, 3], [4, 5]], [[6, 7], [9, 8], [10, 11]]], [2, 3, 2], - 'int32'); - const b = - tf.tensor3d([[[1], [2], [3]], [[7], [10], [9]]], [2, 3, 1], 'int32'); - const res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0]); - }); - it('broadcasting Tensor3D float32', async () => { - const a = tf.tensor3d( - [ - [[1.1, 0.1], [2.1, 3.1], [4.1, 5.1]], - [[6.1, 7.1], [9.1, 8.1], [10.1, 11.1]] - ], - [2, 3, 2], 'float32'); - const b = tf.tensor3d( - [[[1.1], [2.1], [3.1]], [[7.1], [10.1], [9.1]]], [2, 3, 1], 'float32'); - const res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0]); - }); - it('NaNs in Tensor3D - float32', async () => { - const a = tf.tensor3d( - [[[1.1], [NaN], [1.1]], [[0.1], [0.1], [0.1]]], [2, 3, 1], 'float32'); - const b = tf.tensor3d( - [[[0.1], [0.1], [1.1]], [[1.1], [0.1], [NaN]]], [2, 3, 1], 'float32'); - const res = tf.lessEqual(a, b); + it('Tensor3D - strict version throws when a and b are different shape', + () => { + const a = tf.tensor3d( + [ + [[1.1, 0.1], [2.1, 3.1], [4.1, 5.1]], + [[6.1, 7.1], [9.1, 8.1], [10.1, 11.1]] + ], + [2, 3, 2], 'float32'); + const b = tf.tensor3d( + [[[1.1], [2.1], [3.1]], [[7.1], [10.1], [9.1]]], [2, 3, 1], + 'float32'); - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [0, 0, 1, 1, 1, 0]); - }); + expect(() => tf.lessEqualStrict(a, b)).toThrowError(); + expect(() => tf.lessEqualStrict(b, a)).toThrowError(); + }); // Tensor4D: - it('Tensor4D - int32', async () => { - let a = tf.tensor4d([1, 4, 5, 8], [2, 2, 1, 1], 'int32'); - let b = tf.tensor4d([2, 3, 6, 7], [2, 2, 1, 1], 'int32'); - let res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 0, 1, 0]); - - a = tf.tensor4d([0, 1, 2, 3], [2, 2, 1, 1], 'int32'); - b = tf.tensor4d([0, 1, 2, 3], [2, 2, 1, 1], 'int32'); - res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1, 1]); - - a = tf.tensor4d([1, 1, 1, 1], [2, 2, 1, 1], 'int32'); - b = tf.tensor4d([2, 2, 2, 2], [2, 2, 1, 1], 'int32'); - res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1, 1]); - }); - it('Tensor4D - float32', async () => { - let a = tf.tensor4d([1.1, 4.1, 5.1, 8.1], [2, 2, 1, 1], 'float32'); - let b = tf.tensor4d([2.1, 3.1, 6.1, 7.1], [2, 2, 1, 1], 'float32'); - let res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 0, 1, 0]); - - a = tf.tensor4d([0.1, 1.1, 2.2, 3.3], [2, 2, 1, 1], 'float32'); - b = tf.tensor4d([0.1, 1.1, 2.2, 3.3], [2, 2, 1, 1], 'float32'); - res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1, 1]); - - a = tf.tensor4d([0.1, 0.1, 0.1, 0.1], [2, 2, 1, 1], 'float32'); - b = tf.tensor4d([1.1, 1.1, 1.1, 1.1], [2, 2, 1, 1], 'float32'); - res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1, 1]); - }); - it('broadcasting Tensor4D shapes - int32', async () => { - const a = tf.tensor4d([1, 2, 5, 9], [2, 2, 1, 1], 'int32'); - const b = tf.tensor4d( - [[[[1, 2]], [[3, 4]]], [[[5, 6]], [[7, 8]]]], [2, 2, 1, 2], 'int32'); - const res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1, 1, 1, 1, 0, 0]); - }); - it('broadcasting Tensor4D shapes - float32', async () => { - const a = tf.tensor4d([1.1, 2.1, 5.1, 9.1], [2, 2, 1, 1], 'float32'); - const b = tf.tensor4d( - [[[[1.1, 2.1]], [[3.1, 4.1]]], [[[5.1, 6.1]], [[7.1, 8.1]]]], - [2, 2, 1, 2], 'float32'); - const res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 1, 1, 1, 1, 1, 0, 0]); - }); - it('NaNs in Tensor4D - float32', async () => { - const a = tf.tensor4d([1.1, NaN, 0.1, 0.1], [2, 2, 1, 1], 'float32'); - const b = tf.tensor4d([0.1, 1.1, 1.1, NaN], [2, 2, 1, 1], 'float32'); - const res = tf.lessEqual(a, b); - - expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [0, 0, 1, 0]); - }); + it('Tensor4D - strict version throws when a and b are different shape', + () => { + const a = tf.tensor4d([1.1, 2.1, 5.1, 9.1], [2, 2, 1, 1], 'float32'); + const b = tf.tensor4d( + [[[[1.1, 2.1]], [[3.1, 4.1]]], [[[5.1, 6.1]], [[7.1, 8.1]]]], + [2, 2, 1, 2], 'float32'); - it('throws when passed a as a non-tensor', () => { - expect(() => tf.lessEqual({} as tf.Tensor, tf.scalar(1))) - .toThrowError(/Argument 'a' passed to 'lessEqual' must be a Tensor/); - }); - it('throws when passed b as a non-tensor', () => { - expect(() => tf.lessEqual(tf.scalar(1), {} as tf.Tensor)) - .toThrowError(/Argument 'b' passed to 'lessEqual' must be a Tensor/); - }); + expect(() => tf.lessEqualStrict(a, b)).toThrowError(); + expect(() => tf.lessEqualStrict(b, a)).toThrowError(); + }); it('accepts a tensor-like object', async () => { const a = [1, 4, 5]; const b = [2, 3, 5]; - const res = tf.lessEqual(a, b); + const res = tf.lessStrict(a, b); expect(res.dtype).toBe('bool'); - expectArraysClose(await res.data(), [1, 0, 1]); + expectArraysClose(await res.data(), [1, 0, 0]); }); }); diff --git a/tfjs-core/src/ops/less_equal.ts b/tfjs-core/src/ops/less_equal.ts new file mode 100644 index 00000000000..93dd68206ce --- /dev/null +++ b/tfjs-core/src/ops/less_equal.ts @@ -0,0 +1,66 @@ +/** + * @license + * Copyright 2020 Google Inc. All Rights Reserved. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================================= + */ +import {ENGINE, ForwardFunc} from '../engine'; +import {LessEqual, LessEqualInputs} from '../kernel_names'; +import {Tensor} from '../tensor'; +import {NamedTensorMap} from '../tensor_types'; +import {makeTypesMatch} from '../tensor_util'; +import {convertToTensor} from '../tensor_util_env'; +import {TensorLike} from '../types'; + +import {assertAndGetBroadcastShape} from './broadcast_util'; +import {op} from './operation'; + +/** + * Returns the truth value of (a <= b) element-wise. Supports broadcasting. + * + * We also expose `tf.lessEqualStrict` which has the same signature as this op + * and asserts that `a` and `b` are the same shape (does not broadcast). + * + * ```js + * const a = tf.tensor1d([1, 2, 3]); + * const b = tf.tensor1d([2, 2, 2]); + * + * a.lessEqual(b).print(); + * ``` + * + * @param a The first input tensor. + * @param b The second input tensor. Must have the same dtype as `a`. + */ +/** @doc {heading: 'Operations', subheading: 'Logical'} */ +function lessEqual_( + a: Tensor|TensorLike, b: Tensor|TensorLike): T { + let $a = convertToTensor(a, 'a', 'lessEqual'); + let $b = convertToTensor(b, 'b', 'lessEqual'); + [$a, $b] = makeTypesMatch($a, $b); + + assertAndGetBroadcastShape($a.shape, $b.shape); + + const forward: ForwardFunc = (backend, save) => { + const res = backend.lessEqual($a, $b); + save([$a, $b]); + return res; + }; + + const inputs: LessEqualInputs = {a: $a, b: $b}; + + return ENGINE.runKernelFunc( + forward, inputs as {} as NamedTensorMap, null /* grad */, + LessEqual) as T; +} + +export const lessEqual = op({lessEqual_}); diff --git a/tfjs-core/src/ops/less_equal_test.ts b/tfjs-core/src/ops/less_equal_test.ts new file mode 100644 index 00000000000..b63d19ac32d --- /dev/null +++ b/tfjs-core/src/ops/less_equal_test.ts @@ -0,0 +1,345 @@ +/** + * @license + * Copyright 2020 Google Inc. All Rights Reserved. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================================= + */ +import * as tf from '../index'; +import {ALL_ENVS, describeWithFlags} from '../jasmine_util'; +import {expectArraysClose} from '../test_util'; + +describeWithFlags('lessEqual', ALL_ENVS, () => { + it('Tensor1D - int32', async () => { + let a = tf.tensor1d([1, 4, 5], 'int32'); + let b = tf.tensor1d([2, 3, 5], 'int32'); + let res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 0, 1]); + + a = tf.tensor1d([2, 2, 2], 'int32'); + b = tf.tensor1d([2, 2, 2], 'int32'); + res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1]); + + a = tf.tensor1d([0, 0], 'int32'); + b = tf.tensor1d([3, 3], 'int32'); + res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1]); + }); + it('Tensor1D - float32', async () => { + let a = tf.tensor1d([1.1, 4.1, 5.1], 'float32'); + let b = tf.tensor1d([2.2, 3.2, 5.1], 'float32'); + let res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 0, 1]); + + a = tf.tensor1d([2.31, 2.31, 2.31], 'float32'); + b = tf.tensor1d([2.31, 2.31, 2.31], 'float32'); + res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1]); + + a = tf.tensor1d([0.45, 0.123], 'float32'); + b = tf.tensor1d([3.123, 3.321], 'float32'); + res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1]); + }); + + it('upcasts when dtypes dont match', async () => { + const a = [1.1, 4.1, 5]; + const b = [2.2, 3.2, 5]; + + let res = + tf.lessEqual(tf.tensor(a, [3], 'float32'), tf.tensor(b, [3], 'int32')); + expect(res.dtype).toBe('bool'); + expect(res.shape).toEqual([3]); + expectArraysClose(await res.data(), [1, 0, 1]); + + res = tf.lessEqual(tf.tensor(a, [3], 'int32'), tf.tensor(b, [3], 'bool')); + expect(res.dtype).toBe('bool'); + expect(res.shape).toEqual([3]); + expectArraysClose(await res.data(), [1, 0, 0]); + }); + + it('TensorLike', async () => { + const a = [1.1, 4.1, 5.1]; + const b = [2.2, 3.2, 5.1]; + const res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 0, 1]); + }); + it('TensorLike Chained', async () => { + const a = tf.tensor1d([1.1, 4.1, 5.1], 'float32'); + const b = [2.2, 3.2, 5.1]; + const res = a.lessEqual(b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 0, 1]); + }); + it('mismatched Tensor1D shapes - int32', () => { + const a = tf.tensor1d([1, 2], 'int32'); + const b = tf.tensor1d([1, 2, 3], 'int32'); + const f = () => { + tf.lessEqual(a, b); + }; + expect(f).toThrowError(); + }); + it('mismatched Tensor1D shapes - float32', () => { + const a = tf.tensor1d([1.1, 2.1], 'float32'); + const b = tf.tensor1d([1.1, 2.1, 3.1], 'float32'); + const f = () => { + tf.lessEqual(a, b); + }; + expect(f).toThrowError(); + }); + it('NaNs in Tensor1D - float32', async () => { + const a = tf.tensor1d([1.1, NaN, 2.1], 'float32'); + const b = tf.tensor1d([2.1, 3.1, NaN], 'float32'); + const res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 0, 0]); + }); + + // Tensor2D: + it('Tensor2D - int32', async () => { + let a = tf.tensor2d([[1, 4, 5], [8, 9, 12]], [2, 3], 'int32'); + let b = tf.tensor2d([[2, 3, 6], [7, 10, 11]], [2, 3], 'int32'); + let res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 0, 1, 0, 1, 0]); + + a = tf.tensor2d([[0, 0], [1, 1]], [2, 2], 'int32'); + b = tf.tensor2d([[0, 0], [1, 1]], [2, 2], 'int32'); + res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1, 1]); + }); + it('Tensor2D - float32', async () => { + let a = tf.tensor2d([[1.1, 4.1, 5.1], [8.1, 9.1, 12.1]], [2, 3], 'float32'); + let b = + tf.tensor2d([[2.1, 3.1, 6.1], [7.1, 10.1, 11.1]], [2, 3], 'float32'); + let res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 0, 1, 0, 1, 0]); + + a = tf.tensor2d([[0.2, 0.2], [1.2, 1.2]], [2, 2], 'float32'); + b = tf.tensor2d([[0.2, 0.2], [1.2, 1.2]], [2, 2], 'float32'); + res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1, 1]); + }); + it('broadcasting Tensor2D shapes - int32', async () => { + const a = tf.tensor2d([[3], [7]], [2, 1], 'int32'); + const b = tf.tensor2d([[2, 3, 4], [7, 8, 9]], [2, 3], 'int32'); + const res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [0, 1, 1, 1, 1, 1]); + }); + it('broadcasting Tensor2D shapes - float32', async () => { + const a = tf.tensor2d([[1.1], [7.1]], [2, 1], 'float32'); + const b = + tf.tensor2d([[0.1, 1.1, 2.1], [7.1, 8.1, 9.1]], [2, 3], 'float32'); + const res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [0, 1, 1, 1, 1, 1]); + }); + it('NaNs in Tensor2D - float32', async () => { + const a = tf.tensor2d([[1.1, NaN], [0.1, NaN]], [2, 2], 'float32'); + const b = tf.tensor2d([[0.1, NaN], [1.1, NaN]], [2, 2], 'float32'); + const res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [0, 0, 1, 0]); + }); + + // Tensor3D: + it('Tensor3D - int32', async () => { + let a = + tf.tensor3d([[[1], [4], [5]], [[8], [9], [12]]], [2, 3, 1], 'int32'); + let b = + tf.tensor3d([[[2], [3], [6]], [[7], [10], [11]]], [2, 3, 1], 'int32'); + let res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 0, 1, 0, 1, 0]); + + a = tf.tensor3d([[[0], [0], [0]], [[1], [1], [1]]], [2, 3, 1], 'int32'); + b = tf.tensor3d([[[0], [0], [0]], [[1], [1], [1]]], [2, 3, 1], 'int32'); + res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1, 1, 1, 1]); + }); + it('Tensor3D - float32', async () => { + let a = tf.tensor3d( + [[[1.1], [4.1], [5.1]], [[8.1], [9.1], [12.1]]], [2, 3, 1], 'float32'); + let b = tf.tensor3d( + [[[2.1], [3.1], [6.1]], [[7.1], [10.1], [11.1]]], [2, 3, 1], 'float32'); + let res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 0, 1, 0, 1, 0]); + + a = tf.tensor3d( + [[[0.1], [0.1], [0.1]], [[1.1], [1.1], [1.2]]], [2, 3, 1], 'float32'); + b = tf.tensor3d( + [[[0.1], [0.1], [0.1]], [[1.1], [1.1], [1.1]]], [2, 3, 1], 'float32'); + res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1, 1, 1, 0]); + }); + it('broadcasting Tensor3D shapes - int32', async () => { + const a = tf.tensor3d( + [[[1, 0], [2, 3], [4, 5]], [[6, 7], [9, 8], [10, 11]]], [2, 3, 2], + 'int32'); + const b = + tf.tensor3d([[[1], [2], [3]], [[7], [10], [9]]], [2, 3, 1], 'int32'); + const res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0]); + }); + it('broadcasting Tensor3D float32', async () => { + const a = tf.tensor3d( + [ + [[1.1, 0.1], [2.1, 3.1], [4.1, 5.1]], + [[6.1, 7.1], [9.1, 8.1], [10.1, 11.1]] + ], + [2, 3, 2], 'float32'); + const b = tf.tensor3d( + [[[1.1], [2.1], [3.1]], [[7.1], [10.1], [9.1]]], [2, 3, 1], 'float32'); + const res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0]); + }); + it('NaNs in Tensor3D - float32', async () => { + const a = tf.tensor3d( + [[[1.1], [NaN], [1.1]], [[0.1], [0.1], [0.1]]], [2, 3, 1], 'float32'); + const b = tf.tensor3d( + [[[0.1], [0.1], [1.1]], [[1.1], [0.1], [NaN]]], [2, 3, 1], 'float32'); + const res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [0, 0, 1, 1, 1, 0]); + }); + + // Tensor4D: + it('Tensor4D - int32', async () => { + let a = tf.tensor4d([1, 4, 5, 8], [2, 2, 1, 1], 'int32'); + let b = tf.tensor4d([2, 3, 6, 7], [2, 2, 1, 1], 'int32'); + let res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 0, 1, 0]); + + a = tf.tensor4d([0, 1, 2, 3], [2, 2, 1, 1], 'int32'); + b = tf.tensor4d([0, 1, 2, 3], [2, 2, 1, 1], 'int32'); + res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1, 1]); + + a = tf.tensor4d([1, 1, 1, 1], [2, 2, 1, 1], 'int32'); + b = tf.tensor4d([2, 2, 2, 2], [2, 2, 1, 1], 'int32'); + res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1, 1]); + }); + it('Tensor4D - float32', async () => { + let a = tf.tensor4d([1.1, 4.1, 5.1, 8.1], [2, 2, 1, 1], 'float32'); + let b = tf.tensor4d([2.1, 3.1, 6.1, 7.1], [2, 2, 1, 1], 'float32'); + let res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 0, 1, 0]); + + a = tf.tensor4d([0.1, 1.1, 2.2, 3.3], [2, 2, 1, 1], 'float32'); + b = tf.tensor4d([0.1, 1.1, 2.2, 3.3], [2, 2, 1, 1], 'float32'); + res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1, 1]); + + a = tf.tensor4d([0.1, 0.1, 0.1, 0.1], [2, 2, 1, 1], 'float32'); + b = tf.tensor4d([1.1, 1.1, 1.1, 1.1], [2, 2, 1, 1], 'float32'); + res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1, 1]); + }); + it('broadcasting Tensor4D shapes - int32', async () => { + const a = tf.tensor4d([1, 2, 5, 9], [2, 2, 1, 1], 'int32'); + const b = tf.tensor4d( + [[[[1, 2]], [[3, 4]]], [[[5, 6]], [[7, 8]]]], [2, 2, 1, 2], 'int32'); + const res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1, 1, 1, 1, 0, 0]); + }); + it('broadcasting Tensor4D shapes - float32', async () => { + const a = tf.tensor4d([1.1, 2.1, 5.1, 9.1], [2, 2, 1, 1], 'float32'); + const b = tf.tensor4d( + [[[[1.1, 2.1]], [[3.1, 4.1]]], [[[5.1, 6.1]], [[7.1, 8.1]]]], + [2, 2, 1, 2], 'float32'); + const res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 1, 1, 1, 1, 1, 0, 0]); + }); + it('NaNs in Tensor4D - float32', async () => { + const a = tf.tensor4d([1.1, NaN, 0.1, 0.1], [2, 2, 1, 1], 'float32'); + const b = tf.tensor4d([0.1, 1.1, 1.1, NaN], [2, 2, 1, 1], 'float32'); + const res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [0, 0, 1, 0]); + }); + + it('throws when passed a as a non-tensor', () => { + expect(() => tf.lessEqual({} as tf.Tensor, tf.scalar(1))) + .toThrowError(/Argument 'a' passed to 'lessEqual' must be a Tensor/); + }); + it('throws when passed b as a non-tensor', () => { + expect(() => tf.lessEqual(tf.scalar(1), {} as tf.Tensor)) + .toThrowError(/Argument 'b' passed to 'lessEqual' must be a Tensor/); + }); + + it('accepts a tensor-like object', async () => { + const a = [1, 4, 5]; + const b = [2, 3, 5]; + const res = tf.lessEqual(a, b); + + expect(res.dtype).toBe('bool'); + expectArraysClose(await res.data(), [1, 0, 1]); + }); +}); diff --git a/tfjs-core/src/ops/ops.ts b/tfjs-core/src/ops/ops.ts index 282a8c17fd6..96599087fc7 100644 --- a/tfjs-core/src/ops/ops.ts +++ b/tfjs-core/src/ops/ops.ts @@ -35,6 +35,7 @@ export {equal} from './equal'; export {eye} from './eye'; export {greater} from './greater'; export {less} from './less'; +export {lessEqual} from './less_equal'; export {multinomial} from './multinomial'; export {notEqual} from './not_equal'; export {oneHot} from './one_hot'; diff --git a/tfjs-core/src/public/chained_ops/less_equal.ts b/tfjs-core/src/public/chained_ops/less_equal.ts new file mode 100644 index 00000000000..996c3194f75 --- /dev/null +++ b/tfjs-core/src/public/chained_ops/less_equal.ts @@ -0,0 +1,31 @@ +/** + * @license + * Copyright 2020 Google LLC. All Rights Reserved. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================================= + */ +import {lessEqual} from '../../ops/less_equal'; +import {Tensor} from '../../tensor'; +import {Rank, TensorLike} from '../../types'; + +declare module '../../tensor' { + interface Tensor { + lessEqual(b: Tensor|TensorLike): T; + } +} + +Tensor.prototype.lessEqual = function(b: Tensor| + TensorLike): T { + this.throwIfDisposed(); + return lessEqual(this, b); +}; diff --git a/tfjs-core/src/public/chained_ops/register_all_chained_ops.ts b/tfjs-core/src/public/chained_ops/register_all_chained_ops.ts index ba3d0691b1d..b50bd7e3ea7 100644 --- a/tfjs-core/src/public/chained_ops/register_all_chained_ops.ts +++ b/tfjs-core/src/public/chained_ops/register_all_chained_ops.ts @@ -23,6 +23,7 @@ import './div_no_nan'; import './equal'; import './greater'; import './less'; +import './less_equal'; import './one_hot'; import './not_equal'; import './pad'; diff --git a/tfjs-core/src/public/chained_ops/register_all_chained_ops_test.ts b/tfjs-core/src/public/chained_ops/register_all_chained_ops_test.ts index 1aadb870969..42cec4bf901 100644 --- a/tfjs-core/src/public/chained_ops/register_all_chained_ops_test.ts +++ b/tfjs-core/src/public/chained_ops/register_all_chained_ops_test.ts @@ -24,9 +24,9 @@ import {ALL_ENVS, describeWithFlags} from '../../jasmine_util'; // flexibility to change in future. const CHAINED_OPS = [ - 'add', 'batchNorm', 'broadcastTo', 'concat', 'div', 'divNoNan', 'greater', - 'less', 'equal', 'notEqual', 'oneHot', 'pad', 'split', 'square', 'sub', - 'tile', 'transpose' + 'add', 'batchNorm', 'broadcastTo', 'concat', 'div', 'divNoNan', 'equal', + 'greater', 'less', 'lessEqual', 'notEqual', 'oneHot', 'pad', 'split', + 'square', 'sub', 'tile', 'transpose' ]; describeWithFlags('chained ops', ALL_ENVS, () => { diff --git a/tfjs-core/src/tensor.ts b/tfjs-core/src/tensor.ts index 4ee16a46fd7..804040e9e9a 100644 --- a/tfjs-core/src/tensor.ts +++ b/tfjs-core/src/tensor.ts @@ -230,7 +230,6 @@ export interface OpHandler { notEqualStrict(a: T, b: T|TensorLike): T; lessStrict(a: T, b: T|TensorLike): T; equalStrict(a: T, b: T|TensorLike): T; - lessEqual(a: Tensor, b: Tensor|TensorLike): T; lessEqualStrict(a: T, b: T|TensorLike): T; greaterStrict(a: T, b: T|TensorLike): T; greaterEqual(a: Tensor, b: Tensor|TensorLike): T; @@ -934,10 +933,6 @@ export class Tensor { this.throwIfDisposed(); return opHandler.equalStrict(this, x); } - lessEqual(x: Tensor|TensorLike): T { - this.throwIfDisposed(); - return opHandler.lessEqual(this, x); - } lessEqualStrict(this: T, x: T|TensorLike): T { this.throwIfDisposed(); return opHandler.lessEqualStrict(this, x); diff --git a/tfjs-core/src/tests.ts b/tfjs-core/src/tests.ts index 222b8687bd1..23b3f4e1e69 100644 --- a/tfjs-core/src/tests.ts +++ b/tfjs-core/src/tests.ts @@ -72,6 +72,7 @@ import './ops/gather_nd_test'; import './ops/greater_test'; import './ops/image_ops_test'; import './ops/in_top_k_test'; +import './ops/less_equal_test'; import './ops/less_test'; import './ops/linalg_ops_test'; import './ops/logical_ops_test';