mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-07-25 19:48:11 +00:00
### Description This PR is a preview of cherry-picks for ort-web to `rel-1.17.3` based on `rel-1.17.2`. <details> <summary>Changes of ort-web to cherry-pick</summary> The following commits are from main branch. `o` stands for pick, and `x` stands for skip. ``` o2e0a388c36[js/webgpu] Add HardSigmoid support (#19215) od226e40856[js/webgpu] set query type in onRunStart (#19202) o61610ff986[js/webgpu] Add FusedConv clip test case (#18900) oa33b5bd1fa[JS/WebGPU] Added Uniforms to SkipLayerNorm. (#18788) o591f90c0b9[js/webgpu] Fix issue of timestamp query (#19258) o7252c6e747[WebNN EP] Support WebNN async API with Asyncify (#19145) o5b06505073[js/webgpu] Fix Tanh explosion (#19201) o656ca66186[js/webgpu] Support uniforms for conv, conv transpose, conv grouped (#18753) oa3f0e2422b[js/webgpu] Support f16 uniform (#19098) o9e69606360fix f16 for attention, enable slice and flatten for more types (#19262) o624b4e2063[js/webgpu] Remove enableShapesUniforms (#19279) o90883a366a[js/webgpu] Add hardSigmoid activation for fusedConv (#19233) o85cef0af8c[js/webgpu] Support capture and replay for jsep (#18989) od73131cf0f[js/webgpu] Use DataType as uniform cpu type (#19281) odd1f6ccc45[js/webgpu] resolve codescan alert (#19343) o3a2ab1963a[js/webgpu] Refactor createTensorShapeVariables (#18883) oefc17e79de[js/webgpu] Fix the undefined push error (#19366) x50806a7dd5[js/web] support external data in npm test (#19377) occbe264a39[js/webgpu] Add LeakyRelu activation for fusedConv (#19369) o5ff27ef02a[js/webgpu] support customop FastGelu (#19392) x03be65e064[js/web] fix types exports in package.json (#19458) o06269a3952[js/webgpu] allow uint8 tensors for webgpu (#19545) odfeda9019c[JS/WebGPU] Add MatMulNBits (#19446) o1b48054e1b[js/webgpu] Create Split indices helpers by rank, not by shape (#19554) o3fe2c137ee[js] small fix to workaround formatter (#19400) x70567a4b3a[js/web] use ApiTensor insteadof onnxjs Tensor in TensorResultValidator (#19358) o6e04e36e3f[js/common] upgrade tsc in common from 4.9.5 to 5.2.2 (#19317) o58f4921686[js] changes to allow Float16Array if any polyfill is available (#19305) o57d6819212[js/web] Fix fused-conv is not included in npm test (#19581) oebd220b073Misspelling in README.md (#19433) o38c3432393Bump ip from 1.1.8 to 1.1.9 in /js/react_native (#19582) ofe82fccf1a[js/webgpu] Fix Conv2DTransposeMatMul f16 compilation failure (#19596) o76a2a487a1Bump ip from 1.1.8 to 1.1.9 in /js/react_native/e2e (#19583) o29b1106033[node] Switch to setImmediate to avoid starving the Node.js event loop (#19610) oae3d73c981[JS/WebGPU] Fix Split and Where to handle corner cases. (#19613) oaec2389ad0[js/webgpu] allows a ProgramInfo's RunData to use zero sized output (#19614) obb43a0f133[js/webgpu] minor fixes to make tinyllama work (#19564) o0edb035808[js/web] fix suite test list for zero sized tensor (#19638) o3cb81cdde2[js/common] move 'env.wasm.trace' to 'env.trace' (#19617) oe30618d055[js/webgpu] use Headless for webgpu test by default (#19702) of06164ef8b[js/web] transfer input buffer back to caller thread (#19677) xa788514027[js/web] dump debug logs for karma for diagnose purpose (#19785) o24b72d2613[JS/WebGPU] Preserve zero size input tensor dims. (#19737) o4538d31a8b[js/webgpu] expose a few properties in WebGPU API (#19857) o53de2d8cb0[js/webgpu] Enable GroupedConvVectorize path (#19791) oed250b88c3[JS/WebGPU] Optimize MatMulNBits (#19852) xe771a763c3[js/test] align web test runner flags with ort.env (#19790) o79e50aeef3[js/web] rewrite backend resolve to allow multiple EPs (#19735) oacb0df2280Fix #19931 broken Get Started link of "ONNX Runtime JavaScript API" page (#19932) ob29849a287[js/common] fix typedoc warnings (#19933) oafdab62f53Bump follow-redirects from 1.15.4 to 1.15.6 in /js/web (#19949) o28ad6c3955Bump follow-redirects from 1.15.4 to 1.15.6 in /js/node (#19951) o7e0d424934accumulate in fp32 for Reduce* (#19868) o4c6a6a37f7[js/webgpu] Fix NAN caused by un-initialized buffer in instance-norm (#19387) o01c7aaf6aa[js/webgpu] allow setting env.webgpu.adapter (#19940) oc45cff60cf[js/webgpu] fix maxpool / fp16 (#19981) ``` </details> <details> <summary>Cherry-pick commandlines</summary> ```sh git cherry-pick2e0a388c36git cherry-pickd226e40856git cherry-pick61610ff986git cherry-picka33b5bd1fagit cherry-pick591f90c0b9git cherry-pick7252c6e747git cherry-pick5b06505073git cherry-pick656ca66186git cherry-picka3f0e2422bgit cherry-pick9e69606360git cherry-pick624b4e2063git cherry-pick90883a366agit cherry-pick85cef0af8c#<<<<< Note: conflicts git cherry-pickd73131cf0fgit cherry-pickdd1f6ccc45git cherry-pick3a2ab1963agit cherry-pickefc17e79degit cherry-pickccbe264a39git cherry-pick5ff27ef02agit cherry-pick06269a3952git cherry-pickdfeda9019cgit cherry-pick1b48054e1bgit cherry-pick3fe2c137eegit cherry-pick6e04e36e3fgit cherry-pick58f4921686git cherry-pick57d6819212git cherry-pickebd220b073git cherry-pick38c3432393git cherry-pickfe82fccf1agit cherry-pick76a2a487a1git cherry-pick29b1106033git cherry-pickae3d73c981git cherry-pickaec2389ad0git cherry-pickbb43a0f133git cherry-pick0edb035808git cherry-pick3cb81cdde2git cherry-picke30618d055git cherry-pickf06164ef8bgit cherry-pick24b72d2613git cherry-pick4538d31a8bgit cherry-pick53de2d8cb0git cherry-picked250b88c3git cherry-pick79e50aeef3git cherry-pickacb0df2280git cherry-pickb29849a287git cherry-pickafdab62f53git cherry-pick28ad6c3955git cherry-pick7e0d424934git cherry-pick4c6a6a37f7git cherry-pick01c7aaf6aagit cherry-pickc45cff60cf``` </details> <details> <summary>Cherry-pick conflicts</summary> -85cef0af8c#18989 this change is for enabling graph capture feature for JSEP, and it is done after ROCM EP enabled graph capture feature. However, the ROCM EP graph capture feature is not cherry-picked in rel-1.17.2. </details> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Jiajia Qin <jiajia.qin@intel.com> Co-authored-by: Xu Xing <xing.xu@intel.com> Co-authored-by: satyajandhyala <satya.k.jandhyala@gmail.com> Co-authored-by: Yang Gu <yang.gu@intel.com> Co-authored-by: Wanming Lin <wanming.lin@intel.com> Co-authored-by: Jiajie Hu <jiajie.hu@intel.com> Co-authored-by: Guenther Schmuelling <guschmue@microsoft.com> Co-authored-by: Matttttt <18152455+martholomew@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Segev Finer <segev208@gmail.com> Co-authored-by: Belem Zhang <belem.zhang@intel.com>
201 lines
8.5 KiB
TypeScript
201 lines
8.5 KiB
TypeScript
// Copyright (c) Microsoft Corporation. All rights reserved.
|
|
// Licensed under the MIT License.
|
|
|
|
import {DataType} from '../../../wasm-common';
|
|
import {TensorView} from '../../tensor-view';
|
|
import {ShapeUtil} from '../../util';
|
|
import {AttributeWithCacheKey, createAttributeWithCacheKey} from '../attribute-with-cache-key';
|
|
import {ComputeContext, ProgramInfo, ProgramUniform, TensorInfo} from '../types';
|
|
|
|
import {createTensorShapeVariables, getElementAt, IndicesHelper, inputVariable, outputVariable, ShaderHelper, UniformsArrayType} from './common';
|
|
|
|
export interface SliceAttributes extends AttributeWithCacheKey {
|
|
readonly starts: number[];
|
|
readonly ends: number[];
|
|
readonly axes: number[];
|
|
}
|
|
|
|
const validateInputs = (inputs: readonly TensorView[], attributes: SliceAttributes): void => {
|
|
if (!inputs || inputs.length < 1) {
|
|
throw new Error('too few inputs');
|
|
}
|
|
if (attributes.axes.length !== 0) {
|
|
if (attributes.axes.length !== attributes.starts.length || attributes.axes.length !== attributes.ends.length) {
|
|
throw new Error('axes, starts and ends must have the same length');
|
|
}
|
|
} else if (attributes.starts.length !== attributes.ends.length) {
|
|
throw new Error('starts and ends must have the same length');
|
|
}
|
|
inputs.slice(1).forEach((_, idx) => {
|
|
if (inputs[idx + 1].dataType !== DataType.int32 && inputs[idx + 1].dataType !== DataType.int64) {
|
|
throw new Error(`Input ${idx} must be an array of int32 or int64`);
|
|
}
|
|
});
|
|
};
|
|
|
|
const readInput = (inputs: readonly TensorView[], idx: number): number[] => {
|
|
const input: number[] = [];
|
|
if (inputs.length > idx) {
|
|
if (inputs[idx].dataType === DataType.int64) {
|
|
inputs[idx].getBigInt64Array().forEach(v => input.push(Number(v)));
|
|
} else if (inputs[idx].dataType === DataType.int32) {
|
|
inputs[idx].getInt32Array().forEach(v => input.push(Number(v)));
|
|
} else {
|
|
throw new Error(`Input ${idx} must be an array of int32 or int64`);
|
|
}
|
|
}
|
|
return input;
|
|
};
|
|
|
|
const createSliceAttributesFromInputs =
|
|
(inputs: readonly TensorView[], attributes: SliceAttributes): SliceAttributes => {
|
|
if (inputs.length > 1) {
|
|
const starts: number[] = readInput(inputs, 1);
|
|
const ends: number[] = readInput(inputs, 2);
|
|
let axes: number[] = readInput(inputs, 3);
|
|
if (axes.length === 0) {
|
|
axes = [...Array(inputs[0].dims.length).keys()];
|
|
}
|
|
return createAttributeWithCacheKey({starts, ends, axes});
|
|
} else {
|
|
return attributes;
|
|
}
|
|
};
|
|
|
|
const fixStartEndValues =
|
|
(value: number, index: number, inputShape: readonly number[], axes: readonly number[], steps: readonly number[]):
|
|
number => {
|
|
let newValue = value;
|
|
if (value < 0) {
|
|
newValue += inputShape[axes[index]];
|
|
}
|
|
if (steps[index] < 0) {
|
|
return Math.max(0, Math.min(newValue, inputShape[axes[index]] - 1));
|
|
} else {
|
|
return Math.max(0, Math.min(newValue, inputShape[axes[index]]));
|
|
}
|
|
};
|
|
|
|
const calculateInputIndicesImpl =
|
|
(input: IndicesHelper, output: IndicesHelper, inputShape: readonly number[]): string =>
|
|
`fn calculateInputIndices(output_indices: ${output.type.indices}) -> ${input.type.indices} {
|
|
var input_indices: ${input.type.indices};
|
|
var carry = 0u;
|
|
for (var i = ${inputShape.length}; i >= 0; i--) {
|
|
let input_shape_i = ${getElementAt('uniforms.input_shape', 'i', inputShape.length)};
|
|
let steps_i = ${getElementAt('uniforms.steps', 'i', inputShape.length)};
|
|
let signs_i = ${getElementAt('uniforms.signs', 'i', inputShape.length)};
|
|
let starts_i = ${getElementAt('uniforms.starts', 'i', inputShape.length)};
|
|
var output_index = ${output.indicesGet('output_indices', 'i')};
|
|
var input_index = output_index * steps_i + starts_i + carry;
|
|
carry = input_index / input_shape_i;
|
|
input_index = input_index % input_shape_i;
|
|
if (signs_i < 0) {
|
|
input_index = input_shape_i - input_index - 1u + starts_i;
|
|
}
|
|
${input.indicesSet('input_indices', 'i', 'input_index')};
|
|
}
|
|
return input_indices;
|
|
}`;
|
|
|
|
const createSliceProgramInfo = (inputs: readonly TensorView[], attributes: SliceAttributes): ProgramInfo => {
|
|
const inputShape = inputs[0].dims;
|
|
const inputSize = ShapeUtil.size(inputShape);
|
|
const axes = (attributes.axes.length > 0) ? ShapeUtil.normalizeAxes(attributes.axes, inputShape.length) :
|
|
[...Array(inputShape.length).keys()];
|
|
let steps = readInput(inputs, 4);
|
|
steps.forEach((step) => step !== 0 || (() => {
|
|
throw new Error('step cannot be 0');
|
|
}));
|
|
if (steps.length === 0) {
|
|
steps = Array(axes.length).fill(1);
|
|
}
|
|
const starts = attributes.starts.map((start, i) => fixStartEndValues(start, i, inputShape, axes, steps));
|
|
|
|
const ends = attributes.ends.map((end, i) => fixStartEndValues(end, i, inputShape, axes, steps));
|
|
|
|
if (axes.length !== starts.length || axes.length !== ends.length) {
|
|
throw new Error('start, ends and axes should have the same number of elements');
|
|
}
|
|
|
|
if (axes.length !== inputShape.length) {
|
|
for (let i = 0; i < inputShape.length; ++i) {
|
|
if (!axes.includes(i)) {
|
|
starts.splice(i, 0, 0);
|
|
ends.splice(i, 0, inputShape[i]);
|
|
steps.splice(i, 0, 1);
|
|
}
|
|
}
|
|
}
|
|
const signs = steps.map(step => Math.sign(step));
|
|
// Convert negative steps to positive steps and reverse starts and ends
|
|
steps.forEach((step, i, array) => {
|
|
if (step < 0) {
|
|
const numSteps = (ends[i] - starts[i]) / step;
|
|
const newEnd = starts[i];
|
|
const newStart = newEnd + numSteps * steps[i];
|
|
starts[i] = newStart;
|
|
ends[i] = newEnd;
|
|
array[i] = -step;
|
|
}
|
|
});
|
|
// Output rank is expected to be less than or equal to the input rank.
|
|
const outputShape = inputShape.slice(0);
|
|
axes.forEach((axis, _) => {
|
|
outputShape[axis] = Math.ceil((ends[axis] - starts[axis]) / steps[axis]);
|
|
});
|
|
const outputTensorInfo: TensorInfo = {dims: outputShape, dataType: inputs[0].dataType};
|
|
|
|
const output = outputVariable('output', inputs[0].dataType, outputShape.length);
|
|
const input = inputVariable('input', inputs[0].dataType, inputs[0].dims.length);
|
|
const outputSize = ShapeUtil.size(outputShape);
|
|
const uniforms: UniformsArrayType = [
|
|
{name: 'outputSize', type: 'u32'}, {name: 'starts', type: 'u32', length: starts.length},
|
|
{name: 'signs', type: 'i32', length: signs.length}, {name: 'steps', type: 'u32', length: steps.length}
|
|
];
|
|
|
|
const programUniforms: ProgramUniform[] = [
|
|
{type: DataType.uint32, data: outputSize}, {type: DataType.uint32, data: starts},
|
|
{type: DataType.int32, data: signs}, {type: DataType.uint32, data: steps},
|
|
...createTensorShapeVariables(inputs[0].dims, outputShape)
|
|
];
|
|
|
|
const getShaderSource = (shaderHelper: ShaderHelper) => `
|
|
${shaderHelper.registerUniforms(uniforms).declareVariables(input, output)}
|
|
${calculateInputIndicesImpl(input, output, inputShape)}
|
|
${shaderHelper.mainStart()}
|
|
${shaderHelper.guardAgainstOutOfBoundsWorkgroupSizes('uniforms.outputSize')}
|
|
let output_indices = ${output.offsetToIndices('global_idx')};
|
|
let input_indices = calculateInputIndices(output_indices);
|
|
${output.setByOffset('global_idx', input.getByIndices('input_indices'))}
|
|
}`;
|
|
return {
|
|
name: 'Slice',
|
|
shaderCache: {hint: `${signs.length}_${starts.length}_${steps.length}`, inputDependencies: ['rank']},
|
|
getShaderSource,
|
|
getRunData: () => ({
|
|
outputs: [outputTensorInfo],
|
|
dispatchGroup: {x: Math.ceil(inputSize / 64 /* workgroup size */)},
|
|
programUniforms
|
|
})
|
|
};
|
|
};
|
|
|
|
export const slice = (context: ComputeContext, attributes: SliceAttributes): void => {
|
|
validateInputs(context.inputs, attributes);
|
|
const updatedAttributes = createSliceAttributesFromInputs(context.inputs, attributes);
|
|
context.compute(createSliceProgramInfo(context.inputs, updatedAttributes), {inputs: [0]});
|
|
// if (ShapeUtil.size(program.outputs[0].dims) > 0) {
|
|
// context.compute(programInfoLoader, {inputs: [0]});
|
|
// } else {
|
|
// // TODO: support empty output
|
|
// throw new Error('slice: output size is 0');
|
|
// }
|
|
};
|
|
|
|
export const parseSliceAttributes = (attributes: Record<string, unknown>): SliceAttributes => {
|
|
const starts = attributes.starts as number[];
|
|
const ends = attributes.ends as number[];
|
|
const axes = attributes.axes as number[];
|
|
return createAttributeWithCacheKey({starts, ends, axes});
|
|
};
|