Skip to content

remove chaining api from norm #3500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 23, 2020
Merged

remove chaining api from norm #3500

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions tfjs-core/src/ops/norm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,15 @@ import {convertToTensor} from '../tensor_util_env';
import {TensorLike} from '../types';
import {parseAxisParam} from '../util';

import {reshape} from './array_ops';
import * as axis_util from './axis_util';
import {max} from './max';
import {op} from './operation';
import {pow} from './pow';
import {min, sum} from './reduction_ops';
import {square} from './square';
import {scalar} from './tensor_ops';
import {abs, sqrt} from './unary_ops';

/**
* Computes the norm of scalar, vectors, and matrices.
Expand Down Expand Up @@ -78,29 +84,29 @@ function norm_(
function normImpl(
x: Tensor, p: number|string, axis: number|number[] = null): Tensor {
if (x.rank === 0) {
return x.abs();
return abs(x);
}

// consider vector when no axis is specified
if (x.rank !== 1 && axis === null) {
return normImpl(x.reshape([-1]), p, axis);
return normImpl(reshape(x, [-1]), p, axis);
}

// vector
if (x.rank === 1 || typeof axis === 'number' ||
Array.isArray(axis) && axis.length === 1) {
if (p === 1) {
return x.abs().sum(axis);
return sum(abs(x), axis);
}
if (p === Infinity) {
return x.abs().max(axis);
return max(abs(x), axis);
}
if (p === -Infinity) {
return x.abs().min(axis);
return min(abs(x), axis);
}
if (p === 'euclidean' || p === 2) {
// norm(x, 2) = sum(abs(xi) ^ 2) ^ 1/2
return x.abs().pow(scalar(2, 'int32')).sum(axis).sqrt();
return sqrt(sum(pow(abs(x), scalar(2, 'int32')), axis));
}

throw new Error(`Error in norm: invalid ord value: ${p}`);
Expand All @@ -109,17 +115,17 @@ function normImpl(
// matrix (assumption axis[0] < axis[1])
if (Array.isArray(axis) && axis.length === 2) {
if (p === 1) {
return x.abs().sum(axis[0]).max(axis[1] - 1);
return max(sum(abs(x), axis[0]), axis[1] - 1);
}
if (p === Infinity) {
return x.abs().sum(axis[1]).max(axis[0]);
return max(sum(abs(x), axis[1]), axis[0]);
}
if (p === -Infinity) {
return x.abs().sum(axis[1]).min(axis[0]);
return min(sum(abs(x), axis[1]), axis[0]);
}
if (p === 'fro' || p === 'euclidean') {
// norm(x) = sqrt(sum(pow(x, 2)))
return x.square().sum(axis).sqrt();
return sqrt(sum(square(x), axis));
}

throw new Error(`Error in norm: invalid ord value: ${p}`);
Expand Down