mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-06-23 02:38:28 +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>
196 lines
7 KiB
TypeScript
196 lines
7 KiB
TypeScript
// Copyright (c) Microsoft Corporation. All rights reserved.
|
|
// Licensed under the MIT License.
|
|
|
|
import {InferenceSession} from './inference-session.js';
|
|
import {OnnxValue} from './onnx-value.js';
|
|
import {TrainingSession as TrainingSessionImpl} from './training-session-impl.js';
|
|
|
|
/* eslint-disable @typescript-eslint/no-redeclare */
|
|
|
|
export declare namespace TrainingSession {
|
|
/**
|
|
* Either URI file path (string) or Uint8Array containing model or checkpoint information.
|
|
*/
|
|
type UriOrBuffer = string|Uint8Array;
|
|
}
|
|
|
|
/**
|
|
* Represent a runtime instance of an ONNX training session,
|
|
* which contains a model that can be trained, and, optionally,
|
|
* an eval and optimizer model.
|
|
*/
|
|
export interface TrainingSession {
|
|
// #region run()
|
|
|
|
/**
|
|
* Lazily resets the gradients of all trainable parameters to zero. Should happen after the invocation of
|
|
* runOptimizerStep.
|
|
*/
|
|
lazyResetGrad(): Promise<void>;
|
|
|
|
/**
|
|
* Run TrainStep asynchronously with the given feeds and options.
|
|
*
|
|
* @param feeds - Representation of the model input. See type description of `InferenceSession.InputType` for
|
|
detail.
|
|
* @param options - Optional. A set of options that controls the behavior of model training.
|
|
* @returns A promise that resolves to a map, which uses output names as keys and OnnxValue as corresponding values.
|
|
*/
|
|
runTrainStep(feeds: InferenceSession.FeedsType, options?: InferenceSession.RunOptions):
|
|
Promise<InferenceSession.ReturnType>;
|
|
|
|
/**
|
|
* Run a single train step with the given inputs and options.
|
|
*
|
|
* @param feeds - Representation of the model input.
|
|
* @param fetches - Representation of the model output.
|
|
* detail.
|
|
* @param options - Optional. A set of options that controls the behavior of model training.
|
|
* @returns A promise that resolves to a map, which uses output names as keys and OnnxValue as corresponding
|
|
values.
|
|
*/
|
|
runTrainStep(
|
|
feeds: InferenceSession.FeedsType, fetches: InferenceSession.FetchesType,
|
|
options?: InferenceSession.RunOptions): Promise<InferenceSession.ReturnType>;
|
|
|
|
/**
|
|
* Runs a single optimizer step, which performs weight updates for the trainable parameters using the optimizer model.
|
|
*
|
|
* @param options - Optional. A set of options that controls the behavior of model optimizing.
|
|
*/
|
|
runOptimizerStep(options?: InferenceSession.RunOptions): Promise<void>;
|
|
|
|
/**
|
|
* Run a single eval step with the given inputs and options using the eval model.
|
|
*
|
|
* @param feeds - Representation of the model input.
|
|
* @param options - Optional. A set of options that controls the behavior of model eval step.
|
|
* @returns A promise that resolves to a map, which uses output names as keys and OnnxValue as corresponding
|
|
values.
|
|
*/
|
|
runEvalStep(feeds: InferenceSession.FeedsType, options?: InferenceSession.RunOptions):
|
|
Promise<InferenceSession.ReturnType>;
|
|
|
|
/**
|
|
* Run a single eval step with the given inputs and options using the eval model.
|
|
*
|
|
* @param feeds - Representation of the model input.
|
|
* @param fetches - Representation of the model output.
|
|
* detail.
|
|
* @param options - Optional. A set of options that controls the behavior of model eval step.
|
|
* @returns A promise that resolves to a map, which uses output names as keys and OnnxValue as corresponding
|
|
values.
|
|
*/
|
|
runEvalStep(
|
|
feeds: InferenceSession.FeedsType, fetches: InferenceSession.FetchesType,
|
|
options?: InferenceSession.RunOptions): Promise<InferenceSession.ReturnType>;
|
|
|
|
// #endregion
|
|
|
|
// #region copy parameters
|
|
|
|
/**
|
|
* Retrieves the size of all parameters for the training state. Calculates the total number of primitive (datatype of
|
|
* the parameters) elements of all the parameters in the training state.
|
|
*
|
|
* @param trainableOnly - When set to true, the size is calculated for trainable params only. Default value is true.
|
|
*/
|
|
getParametersSize(trainableOnly: boolean): Promise<number>;
|
|
|
|
/**
|
|
* Copies parameter values from the given buffer to the training state. Currently, only supporting models with
|
|
* parameters of type Float32.
|
|
*
|
|
* @param buffer - A Uint8Array representation of Float32 parameters.
|
|
* @param trainableOnly - True if trainable parameters only to be modified, false otherwise. Default value is true.
|
|
*/
|
|
loadParametersBuffer(buffer: Uint8Array, trainableOnly: boolean): Promise<void>;
|
|
|
|
/**
|
|
* Copies the model parameters to a contiguous buffer. Usually used in the context of Federated Learning.
|
|
* Currently, only supporting models with parameters of type Float32.
|
|
*
|
|
* @param trainableOnly - When set to true, only trainable parameters are copied. Trainable parameters are parameters
|
|
* for which requires_grad is set to true. Default value is true.
|
|
* @returns A promise that resolves to a Float32 OnnxValue of the requested parameters.
|
|
*/
|
|
getContiguousParameters(trainableOnly: boolean): Promise<OnnxValue>;
|
|
// #endregion
|
|
|
|
// #region release()
|
|
|
|
/**
|
|
* Release the inference session and the underlying resources.
|
|
*/
|
|
release(): Promise<void>;
|
|
// #endregion
|
|
|
|
// #region metadata
|
|
|
|
/**
|
|
* Get input names of the loaded training model.
|
|
*/
|
|
readonly trainingInputNames: readonly string[];
|
|
|
|
/**
|
|
* Get output names of the loaded training model.
|
|
*/
|
|
readonly trainingOutputNames: readonly string[];
|
|
|
|
/**
|
|
* Get input names of the loaded eval model. Is an empty array if no eval model is loaded.
|
|
*/
|
|
readonly evalInputNames: readonly string[];
|
|
|
|
/**
|
|
* Get output names of the loaded eval model. Is an empty array if no eval model is loaded.
|
|
*/
|
|
readonly evalOutputNames: readonly string[];
|
|
|
|
// #endregion
|
|
}
|
|
|
|
/**
|
|
* Represents the optional parameters that can be passed into the TrainingSessionFactory.
|
|
*/
|
|
export interface TrainingSessionCreateOptions {
|
|
/**
|
|
* URI or buffer for a .ckpt file that contains the checkpoint for the training model.
|
|
*/
|
|
checkpointState: TrainingSession.UriOrBuffer;
|
|
/**
|
|
* URI or buffer for the .onnx training file.
|
|
*/
|
|
trainModel: TrainingSession.UriOrBuffer;
|
|
/**
|
|
* Optional. URI or buffer for the .onnx optimizer model file.
|
|
*/
|
|
optimizerModel?: TrainingSession.UriOrBuffer;
|
|
/**
|
|
* Optional. URI or buffer for the .onnx eval model file.
|
|
*/
|
|
evalModel?: TrainingSession.UriOrBuffer;
|
|
}
|
|
|
|
/**
|
|
* Defines method overload possibilities for creating a TrainingSession.
|
|
*/
|
|
export interface TrainingSessionFactory {
|
|
// #region create()
|
|
|
|
/**
|
|
* Creates a new TrainingSession and asynchronously loads any models passed in through trainingOptions
|
|
*
|
|
* @param trainingOptions specify models and checkpoints to load into the Training Session
|
|
* @param sessionOptions specify configuration for training session behavior
|
|
*
|
|
* @returns Promise that resolves to a TrainingSession object
|
|
*/
|
|
create(trainingOptions: TrainingSessionCreateOptions, sessionOptions?: InferenceSession.SessionOptions):
|
|
Promise<TrainingSession>;
|
|
|
|
// #endregion
|
|
}
|
|
|
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
export const TrainingSession: TrainingSessionFactory = TrainingSessionImpl;
|