Skip to content

Add support for conv1D (fixes w2l) #5

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
DenisVieriu97 merged 10 commits into from
Nov 30, 2023
Merged

Add support for conv1D (fixes w2l) #5

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fa9d4b1
Fix mps_executor_runner build when using cmake
DenisVieriu97 Nov 14, 2023
5f39ac9
Add CI scripts to run supported executorch networks through MPS (#1)
DenisVieriu97 Nov 15, 2023
96fbb7d
Don't specialize the executable for the current device (#3)
georgepaw Nov 18, 2023
23c1ac6
Update CI script to run test_mps (#4)
DenisVieriu97 Nov 29, 2023
2966c28
Add support for conv1D (fixes w2l)
DenisVieriu97 Nov 30, 2023
9853d93
Perf imprv - Map conv2D to depthwiseConv3D
DenisVieriu97 Nov 30, 2023
45d20f7
Add support for PyTorch style printing of output tensors
DenisVieriu97 Nov 30, 2023
cf2804a
Fix lint
DenisVieriu97 Nov 30, 2023
055257d
Remove unused headers
DenisVieriu97 Nov 30, 2023
9bc203b
Remove unused headers #2
DenisVieriu97 Nov 30, 2023
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
Prev Previous commit
Next Next commit
Perf imprv - Map conv2D to depthwiseConv3D
  • Loading branch information
@DenisVieriu97
DenisVieriu97 committed Nov 30, 2023
commit 9853d9325baabffb51d790fa5cb802a3c148acd0
58 changes: 33 additions & 25 deletions backends/apple/mps/operations/ConvolutionOps.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,35 +41,43 @@
}

if(is_depthwise){
MPSGraphDepthwiseConvolution2DOpDescriptor* desc = [MPSGraphDepthwiseConvolution2DOpDescriptor
descriptorWithStrideInX:stride[0]
strideInY:stride[1]
dilationRateInX:dilation[0]
dilationRateInY:dilation[1]
paddingLeft:padding[1]
paddingRight:padding[1]
paddingTop:padding[0]
paddingBottom:padding[0]
paddingStyle:MPSGraphPaddingStyleExplicit
dataLayout:MPSGraphTensorNamedDataLayoutNCHW
weightsLayout:MPSGraphTensorNamedDataLayoutOIHW];
MPSGraphDepthwiseConvolution3DOpDescriptor* depthWiseConv3dDescriptor =
[[MPSGraphDepthwiseConvolution3DOpDescriptor new] autorelease];
depthWiseConv3dDescriptor.strides =
@[ @1, [[NSNumber alloc] initWithInteger:stride[0]], [[NSNumber alloc] initWithInteger:stride[1]] ];
depthWiseConv3dDescriptor.dilationRates =
@[ @1, [[NSNumber alloc] initWithInteger:dilation[0]], [[NSNumber alloc] initWithInteger:dilation[1]] ];

MPSGraphTensor* depthwiseConv2DTensor = [mpsGraph depthwiseConvolution2DWithSourceTensor:primaryTensor
weightsTensor:secondaryTensor
descriptor:desc
name:@"depthwiseConv2D"];
depthWiseConv3dDescriptor.paddingStyle = MPSGraphPaddingStyleExplicit;
depthWiseConv3dDescriptor.paddingValues = @[
@0,
@0,
[[NSNumber alloc] initWithInteger:padding[0]],
[[NSNumber alloc] initWithInteger:padding[0]],
[[NSNumber alloc] initWithInteger:padding[1]],
[[NSNumber alloc] initWithInteger:padding[1]]
];
depthWiseConv3dDescriptor.channelDimensionIndex = -3LL;
MPSGraphTensor* weightTransposeTensor = [mpsGraph transposeTensor:secondaryTensor
dimension:-3
withDimension:-4
name:nil];
MPSGraphTensor* depthwiseConvTensor = [mpsGraph depthwiseConvolution3DWithSourceTensor:primaryTensor
weightsTensor:weightTransposeTensor
descriptor:depthWiseConv3dDescriptor
name:nil];
//Can be a nullptr
if(biasTensor){
//Need to add correct dimension to bias to avoid broadcasting issues
biasTensor = [mpsGraph expandDimsOfTensor:biasTensor
axes:@[@0, @2, @3]
name:nil];
depthwiseConv2DTensor = [mpsGraph additionWithPrimaryTensor:depthwiseConv2DTensor
depthwiseConvTensor = [mpsGraph additionWithPrimaryTensor:depthwiseConvTensor
secondaryTensor:biasTensor
name:@"depthwiseConv2DWithBiasAdd"];
}

return depthwiseConv2DTensor;
return depthwiseConvTensor;
} else {
MPSGraphConvolution2DOpDescriptor* desc = [MPSGraphConvolution2DOpDescriptor
descriptorWithStrideInX:stride[1]
Expand All @@ -90,7 +98,7 @@
descriptor:desc
name:@"conv2D"];

//Can be a nullptr
// Can be a nullptr
if(biasTensor){
//Need to add correct dimension to bias to avoid broadcasting issues
biasTensor = [mpsGraph expandDimsOfTensor:biasTensor
Expand All @@ -101,13 +109,13 @@
name:@"conv2DWithBiasAdd"];
}

if (isConv1D) {
conv2DTensor = [mpsGraph squeezeTensor:conv2DTensor
axis:2
name:@"squeeze"];
}
if (isConv1D) {
conv2DTensor = [mpsGraph squeezeTensor:conv2DTensor
axis:2
name:@"squeeze"];
}

return conv2DTensor;
return conv2DTensor;
}
}
} //namespace mps