-
Notifications
You must be signed in to change notification settings - Fork 2k
webgpu: support BroadcastArgs kernel #7247
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.
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
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /** | ||
| * @license | ||
| * Copyright 2023 Google LLC. | ||
| * 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 {getMainHeaderString as main, WebGPUProgram} from './webgpu_program'; | ||
| import {computeDispatch, flatDispatchLayout} from './webgpu_util'; | ||
|
|
||
| export class BroadcastArgsProgram implements WebGPUProgram { | ||
| outputShape: number[] = []; | ||
| shaderKey: string; | ||
| dispatchLayout: {x: number[]}; | ||
| dispatch: [number, number, number]; | ||
| variableNames = ['s0', 's1']; | ||
| uniforms = 's0Size : i32, s1Size : i32, '; | ||
| workgroupSize: [number, number, number] = [64, 1, 1]; | ||
| size = true; | ||
|
|
||
| constructor(shape: number) { | ||
| this.outputShape = [shape]; | ||
| this.dispatchLayout = flatDispatchLayout(this.outputShape); | ||
| this.dispatch = computeDispatch( | ||
| this.dispatchLayout, this.outputShape, this.workgroupSize); | ||
|
|
||
| this.shaderKey = 'broadcastArgs'; | ||
| } | ||
|
|
||
| getUserCode(): string { | ||
| const userCode = ` | ||
| ${main('index')} { | ||
| if (index < uniforms.size) { | ||
| var s0 = 1.0; | ||
| var s1 = 1.0; | ||
| let indexS0 = index - uniforms.size + uniforms.s0Size; | ||
| let indexS1 = index - uniforms.size + uniforms.s1Size; | ||
| if (indexS0 >= 0) { | ||
| s0 = getS0(indexS0); | ||
| } | ||
| if (indexS1 >= 0) { | ||
| s1 = getS1(indexS1); | ||
| } | ||
|
|
||
| if (s0 == 1.0) { | ||
| setOutputAtIndex(index, s1); | ||
| } else if (s1 == 1.0) { | ||
| setOutputAtIndex(index, s0); | ||
| } else if (s0 != s1) { | ||
| setOutputAtIndex(index, uniforms.NAN); | ||
| } else { | ||
| setOutputAtIndex(index, s0); | ||
| } | ||
| } | ||
| } | ||
| `; | ||
| return userCode; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /** | ||
| * @license | ||
| * Copyright 2023 Google LLC. | ||
| * 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 {backend_util, BroadcastArgs, BroadcastArgsInputs, KernelConfig, KernelFunc, TensorInfo, TypedArray, util} from '@tensorflow/tfjs-core'; | ||
|
|
||
| import {WebGPUBackend} from '../backend_webgpu'; | ||
| import {BroadcastArgsProgram} from '../broadcast_args_webgpu'; | ||
|
|
||
| export function broadcastArgs(args: { | ||
| inputs: BroadcastArgsInputs, | ||
| backend: WebGPUBackend, | ||
| }): TensorInfo { | ||
| const {inputs, backend} = args; | ||
| const {s0, s1} = inputs; | ||
|
|
||
| if (backend.shouldExecuteOnCPU([s0, s1])) { | ||
| const s0TensorInfo = backend.tensorMap.get(s0.dataId); | ||
| const s1TensorInfo = backend.tensorMap.get(s1.dataId); | ||
| const s0Vals = s0TensorInfo.values as TypedArray; | ||
| const s1Vals = s1TensorInfo.values as TypedArray; | ||
| const broadcastShape = backend_util.assertAndGetBroadcastShape( | ||
| Array.from(s0Vals), Array.from(s1Vals)); | ||
| return backend.makeTensorInfo( | ||
| [broadcastShape.length], 'int32', Int32Array.from(broadcastShape)); | ||
| } | ||
|
|
||
| const s0Size = util.sizeFromShape(s0.shape); | ||
| const s1Size = util.sizeFromShape(s1.shape); | ||
| const outputSize = Math.max(s0Size, s1Size); | ||
|
|
||
| const program = new BroadcastArgsProgram(outputSize); | ||
| const uniformData = | ||
| [{type: 'int32', data: [s0Size]}, {type: 'int32', data: [s1Size]}]; | ||
| return backend.runWebGPUProgram(program, [s0, s1], 'int32', uniformData); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you also add a cpu path if |
||
| } | ||
|
|
||
| export const broadcastArgsConfig: KernelConfig = { | ||
| kernelName: BroadcastArgs, | ||
| backendName: 'webgpu', | ||
| kernelFunc: broadcastArgs as unknown as KernelFunc | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why don't we reuse the CPU impl?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Per discussion, a similar interface (xxxImplCPU) to be used as CPU fallback is a good approach. However, this may need some changes at CPU backend, so let's refine this in a future PR. LGTM with this one.