mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-06-17 01:44:45 +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>
251 lines
9.8 KiB
TypeScript
251 lines
9.8 KiB
TypeScript
// Copyright (c) Microsoft Corporation. All rights reserved.
|
|
// Licensed under the MIT License.
|
|
|
|
import {resolveBackendAndExecutionProviders} from './backend-impl.js';
|
|
import {SessionHandler, TrainingSessionHandler} from './backend.js';
|
|
import {InferenceSession as InferenceSession} from './inference-session.js';
|
|
import {OnnxValue} from './onnx-value.js';
|
|
import {Tensor} from './tensor.js';
|
|
import {TrainingSession as TrainingSessionInterface, TrainingSessionCreateOptions} from './training-session.js';
|
|
|
|
type SessionOptions = InferenceSession.SessionOptions;
|
|
type FeedsType = InferenceSession.FeedsType;
|
|
type FetchesType = InferenceSession.FetchesType;
|
|
type ReturnType = InferenceSession.ReturnType;
|
|
type RunOptions = InferenceSession.RunOptions;
|
|
|
|
const noBackendErrMsg: string = 'Training backend could not be resolved. ' +
|
|
'Make sure you\'re using the correct configuration & WebAssembly files.';
|
|
|
|
export class TrainingSession implements TrainingSessionInterface {
|
|
private constructor(handler: TrainingSessionHandler, hasOptimizerModel: boolean, hasEvalModel: boolean) {
|
|
this.handler = handler;
|
|
this.hasOptimizerModel = hasOptimizerModel;
|
|
this.hasEvalModel = hasEvalModel;
|
|
}
|
|
private handler: TrainingSessionHandler;
|
|
private hasOptimizerModel: boolean;
|
|
private hasEvalModel: boolean;
|
|
|
|
get trainingInputNames(): readonly string[] {
|
|
return this.handler.inputNames;
|
|
}
|
|
get trainingOutputNames(): readonly string[] {
|
|
return this.handler.outputNames;
|
|
}
|
|
|
|
get evalInputNames(): readonly string[] {
|
|
if (this.hasEvalModel) {
|
|
return this.handler.evalInputNames;
|
|
} else {
|
|
throw new Error('This training session has no evalModel loaded.');
|
|
}
|
|
}
|
|
get evalOutputNames(): readonly string[] {
|
|
if (this.hasEvalModel) {
|
|
return this.handler.evalOutputNames;
|
|
} else {
|
|
throw new Error('This training session has no evalModel loaded.');
|
|
}
|
|
}
|
|
|
|
static async create(trainingOptions: TrainingSessionCreateOptions, sessionOptions?: SessionOptions):
|
|
Promise<TrainingSession> {
|
|
const evalModel: string|Uint8Array = trainingOptions.evalModel || '';
|
|
const optimizerModel: string|Uint8Array = trainingOptions.optimizerModel || '';
|
|
const options: SessionOptions = sessionOptions || {};
|
|
|
|
// resolve backend, update session options with validated EPs, and create session handler
|
|
const [backend, optionsWithValidatedEPs] = await resolveBackendAndExecutionProviders(options);
|
|
if (backend.createTrainingSessionHandler) {
|
|
const handler = await backend.createTrainingSessionHandler(
|
|
trainingOptions.checkpointState, trainingOptions.trainModel, evalModel, optimizerModel,
|
|
optionsWithValidatedEPs);
|
|
return new TrainingSession(handler, !!trainingOptions.optimizerModel, !!trainingOptions.evalModel);
|
|
} else {
|
|
throw new Error(noBackendErrMsg);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Helper function for runTrainStep and future runStep methods that handles the type-narrowing conversion from
|
|
* the given parameters to SessionHandler.FetchesType and RunOptions.
|
|
*
|
|
* @param inputNames the feeds object is checked that they contain all input names in the provided list of input
|
|
* names.
|
|
* @param outputNames the fetches object is checked that their keys match up with valid names in the list of output
|
|
* names.
|
|
* @param feeds the required input
|
|
* @param arg1 narrowed & converted into the SessionHandler.FetchesType or RunOptions object
|
|
* @param arg2 optional RunOptions object.
|
|
* @returns
|
|
*/
|
|
typeNarrowingForRunStep(
|
|
inputNames: readonly string[], outputNames: readonly string[], feeds: FeedsType, arg1?: FetchesType|RunOptions,
|
|
arg2?: RunOptions): [SessionHandler.FetchesType, RunOptions] {
|
|
const fetches: {[name: string]: OnnxValue|null} = {};
|
|
let options: RunOptions = {};
|
|
// check inputs
|
|
if (typeof feeds !== 'object' || feeds === null || feeds instanceof Tensor || Array.isArray(feeds)) {
|
|
throw new TypeError(
|
|
'\'feeds\' must be an object that use input names as keys and OnnxValue as corresponding values.');
|
|
}
|
|
|
|
let isFetchesEmpty = true;
|
|
// determine which override is being used
|
|
if (typeof arg1 === 'object') {
|
|
if (arg1 === null) {
|
|
throw new TypeError('Unexpected argument[1]: cannot be null.');
|
|
}
|
|
if (arg1 instanceof Tensor) {
|
|
throw new TypeError('\'fetches\' cannot be a Tensor');
|
|
}
|
|
|
|
if (Array.isArray(arg1)) {
|
|
if (arg1.length === 0) {
|
|
throw new TypeError('\'fetches\' cannot be an empty array.');
|
|
}
|
|
isFetchesEmpty = false;
|
|
// output names
|
|
for (const name of arg1) {
|
|
if (typeof name !== 'string') {
|
|
throw new TypeError('\'fetches\' must be a string array or an object.');
|
|
}
|
|
if (outputNames.indexOf(name) === -1) {
|
|
throw new RangeError(`'fetches' contains invalid output name: ${name}.`);
|
|
}
|
|
fetches[name] = null;
|
|
}
|
|
|
|
if (typeof arg2 === 'object' && arg2 !== null) {
|
|
options = arg2;
|
|
} else if (typeof arg2 !== 'undefined') {
|
|
throw new TypeError('\'options\' must be an object.');
|
|
}
|
|
} else {
|
|
// decide whether arg1 is fetches or options
|
|
// if any output name is present and its value is valid OnnxValue, we consider it fetches
|
|
let isFetches = false;
|
|
const arg1Keys = Object.getOwnPropertyNames(arg1);
|
|
for (const name of outputNames) {
|
|
if (arg1Keys.indexOf(name) !== -1) {
|
|
const v = (arg1 as InferenceSession.NullableOnnxValueMapType)[name];
|
|
if (v === null || v instanceof Tensor) {
|
|
isFetches = true;
|
|
isFetchesEmpty = false;
|
|
fetches[name] = v;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (isFetches) {
|
|
if (typeof arg2 === 'object' && arg2 !== null) {
|
|
options = arg2;
|
|
} else if (typeof arg2 !== 'undefined') {
|
|
throw new TypeError('\'options\' must be an object.');
|
|
}
|
|
} else {
|
|
options = arg1 as RunOptions;
|
|
}
|
|
}
|
|
} else if (typeof arg1 !== 'undefined') {
|
|
throw new TypeError('Unexpected argument[1]: must be \'fetches\' or \'options\'.');
|
|
}
|
|
|
|
// check if all inputs are in feed
|
|
for (const name of inputNames) {
|
|
if (typeof feeds[name] === 'undefined') {
|
|
throw new Error(`input '${name}' is missing in 'feeds'.`);
|
|
}
|
|
}
|
|
|
|
// if no fetches is specified, we use the full output names list
|
|
if (isFetchesEmpty) {
|
|
for (const name of outputNames) {
|
|
fetches[name] = null;
|
|
}
|
|
}
|
|
|
|
return [fetches, options];
|
|
}
|
|
|
|
/**
|
|
* Helper method for runTrainStep and any other runStep methods. Takes the ReturnType result from the SessionHandler
|
|
* and changes it into a map of Tensors.
|
|
*
|
|
* @param results
|
|
* @returns
|
|
*/
|
|
convertHandlerReturnTypeToMapOfTensors(results: SessionHandler.ReturnType): ReturnType {
|
|
const returnValue: {[name: string]: OnnxValue} = {};
|
|
for (const key in results) {
|
|
if (Object.hasOwnProperty.call(results, key)) {
|
|
const result = results[key];
|
|
if (result instanceof Tensor) {
|
|
returnValue[key] = result;
|
|
} else {
|
|
returnValue[key] = new Tensor(result.type, result.data, result.dims);
|
|
}
|
|
}
|
|
}
|
|
return returnValue;
|
|
}
|
|
|
|
async lazyResetGrad(): Promise<void> {
|
|
await this.handler.lazyResetGrad();
|
|
}
|
|
|
|
runTrainStep(feeds: FeedsType, options?: RunOptions): Promise<ReturnType>;
|
|
runTrainStep(feeds: FeedsType, fetches: FetchesType, options?: RunOptions): Promise<ReturnType>;
|
|
async runTrainStep(feeds: FeedsType, arg1?: FetchesType|RunOptions, arg2?: RunOptions): Promise<ReturnType> {
|
|
const [fetches, options] =
|
|
this.typeNarrowingForRunStep(this.trainingInputNames, this.trainingOutputNames, feeds, arg1, arg2);
|
|
const results = await this.handler.runTrainStep(feeds, fetches, options);
|
|
return this.convertHandlerReturnTypeToMapOfTensors(results);
|
|
}
|
|
|
|
async runOptimizerStep(options?: InferenceSession.RunOptions|undefined): Promise<void> {
|
|
if (this.hasOptimizerModel) {
|
|
await this.handler.runOptimizerStep(options || {});
|
|
} else {
|
|
throw new Error('This TrainingSession has no OptimizerModel loaded.');
|
|
}
|
|
}
|
|
|
|
runEvalStep(feeds: FeedsType, options?: RunOptions|undefined): Promise<ReturnType>;
|
|
runEvalStep(feeds: FeedsType, fetches: FetchesType, options?: RunOptions|undefined): Promise<ReturnType>;
|
|
async runEvalStep(feeds: FeedsType, arg1?: FetchesType|RunOptions, arg2?: RunOptions): Promise<ReturnType> {
|
|
if (this.hasEvalModel) {
|
|
const [fetches, options] =
|
|
this.typeNarrowingForRunStep(this.evalInputNames, this.evalOutputNames, feeds, arg1, arg2);
|
|
const results = await this.handler.runEvalStep(feeds, fetches, options);
|
|
return this.convertHandlerReturnTypeToMapOfTensors(results);
|
|
} else {
|
|
throw new Error('This TrainingSession has no EvalModel loaded.');
|
|
}
|
|
}
|
|
|
|
async getParametersSize(trainableOnly = true): Promise<number> {
|
|
return this.handler.getParametersSize(trainableOnly);
|
|
}
|
|
|
|
async loadParametersBuffer(array: Uint8Array, trainableOnly = true): Promise<void> {
|
|
const paramsSize = await this.getParametersSize(trainableOnly);
|
|
// checking that the size of the Uint8Array is equivalent to the byte length of a Float32Array of the number
|
|
// of parameters
|
|
if (array.length !== 4 * paramsSize) {
|
|
throw new Error(
|
|
'Size of the buffer passed into loadParametersBuffer must match the number of parameters in ' +
|
|
'the model. Please use getParametersSize method to check.');
|
|
}
|
|
return this.handler.loadParametersBuffer(array, trainableOnly);
|
|
}
|
|
|
|
async getContiguousParameters(trainableOnly = true): Promise<OnnxValue> {
|
|
return this.handler.getContiguousParameters(trainableOnly);
|
|
}
|
|
|
|
async release(): Promise<void> {
|
|
return this.handler.dispose();
|
|
}
|
|
}
|