Skip to content

[ET-VK][convolution] Nest convolution sources by route #23722

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

Closed
pytorchbot wants to merge 1 commit into from
+1,574 −1,254
Closed

[ET-VK][convolution] Nest convolution sources by route #23722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions backends/vulkan/op_registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ def register_max_pool2d_with_indices():


# =============================================================================
# Convolution.cpp
# convolution/Convolution.cpp
# =============================================================================


Expand Down Expand Up @@ -989,7 +989,7 @@ def pick_conv_storage(


# =============================================================================
# Q8taConv2d*.cpp
# convolution/conv2d/q8ta/**/Q8taConv2d*.cpp
# =============================================================================


Expand Down
0 ...vulkan/runtime/graph/ops/glsl/conv1d.glsl → ...h/ops/glsl/convolution/conv1d/conv1d.glsl
View file
Open in desktop
File renamed without changes.
0 ...vulkan/runtime/graph/ops/glsl/conv1d.yaml → ...h/ops/glsl/convolution/conv1d/conv1d.yaml
View file
Open in desktop
File renamed without changes.
0 ...kan/runtime/graph/ops/glsl/conv1d_dw.glsl → ...ps/glsl/convolution/conv1d/conv1d_dw.glsl
View file
Open in desktop
File renamed without changes.
0 ...kan/runtime/graph/ops/glsl/conv1d_dw.yaml → ...ps/glsl/convolution/conv1d/conv1d_dw.yaml
View file
Open in desktop
File renamed without changes.
0 ...kan/runtime/graph/ops/glsl/conv1d_pw.glsl → ...ps/glsl/convolution/conv1d/conv1d_pw.glsl
View file
Open in desktop
File renamed without changes.
0 ...kan/runtime/graph/ops/glsl/conv1d_pw.yaml → ...ps/glsl/convolution/conv1d/conv1d_pw.yaml
View file
Open in desktop
File renamed without changes.
0 ...vulkan/runtime/graph/ops/glsl/conv2d.glsl → ...h/ops/glsl/convolution/conv2d/conv2d.glsl
View file
Open in desktop
File renamed without changes.
0 ...vulkan/runtime/graph/ops/glsl/conv2d.yaml → ...h/ops/glsl/convolution/conv2d/conv2d.yaml
View file
Open in desktop
File renamed without changes.
0 ...untime/graph/ops/glsl/conv2d_common.glslh → ...sl/convolution/conv2d/conv2d_common.glslh
View file
Open in desktop
File renamed without changes.
0 ...kan/runtime/graph/ops/glsl/conv2d_dw.glsl → ...ps/glsl/convolution/conv2d/conv2d_dw.glsl
View file
Open in desktop
File renamed without changes.
0 ...kan/runtime/graph/ops/glsl/conv2d_dw.yaml → ...ps/glsl/convolution/conv2d/conv2d_dw.yaml
View file
Open in desktop
File renamed without changes.
0 ...graph/ops/glsl/conv2d_dw_output_tile.glsl → ...olution/conv2d/conv2d_dw_output_tile.glsl
View file
Open in desktop
File renamed without changes.
0 ...graph/ops/glsl/conv2d_dw_output_tile.yaml → ...olution/conv2d/conv2d_dw_output_tile.yaml
View file
Open in desktop
File renamed without changes.
0 .../ops/glsl/conv2d_dw_sned_output_tile.glsl → ...on/conv2d/conv2d_dw_sned_output_tile.glsl
View file
Open in desktop
File renamed without changes.
0 .../ops/glsl/conv2d_dw_sned_output_tile.yaml → ...on/conv2d/conv2d_dw_sned_output_tile.yaml
View file
Open in desktop
File renamed without changes.
0 ...kan/runtime/graph/ops/glsl/conv2d_pw.glsl → ...ps/glsl/convolution/conv2d/conv2d_pw.glsl
View file
Open in desktop
File renamed without changes.
0 ...kan/runtime/graph/ops/glsl/conv2d_pw.yaml → ...ps/glsl/convolution/conv2d/conv2d_pw.yaml
View file
Open in desktop
File renamed without changes.
0 ...untime/graph/ops/glsl/conv2d_pw_s1p0.glsl → ...sl/convolution/conv2d/conv2d_pw_s1p0.glsl
View file
Open in desktop
File renamed without changes.
0 ...untime/graph/ops/glsl/conv2d_pw_s1p0.yaml → ...sl/convolution/conv2d/conv2d_pw_s1p0.yaml
View file
Open in desktop
File renamed without changes.
0 ...ntime/graph/ops/glsl/conv2d_pw_tiled.glsl → ...l/convolution/conv2d/conv2d_pw_tiled.glsl
View file
Open in desktop
File renamed without changes.
0 ...ntime/graph/ops/glsl/conv2d_pw_tiled.yaml → ...l/convolution/conv2d/conv2d_pw_tiled.yaml
View file
Open in desktop
File renamed without changes.
0 ...n/runtime/graph/ops/glsl/conv2d_gemm.glsl → ...onvolution/conv2d/im2col/conv2d_gemm.glsl
View file
Open in desktop
File renamed without changes.
0 ...n/runtime/graph/ops/glsl/conv2d_gemm.yaml → ...onvolution/conv2d/im2col/conv2d_gemm.yaml
View file
Open in desktop
File renamed without changes.
0 ...runtime/graph/ops/glsl/conv2d_im2col.glsl → ...volution/conv2d/im2col/conv2d_im2col.glsl
View file
Open in desktop
File renamed without changes.
0 ...runtime/graph/ops/glsl/conv2d_im2col.yaml → ...volution/conv2d/im2col/conv2d_im2col.yaml
View file
Open in desktop
File renamed without changes.
0 ...aph/ops/glsl/pack_conv2d_gemm_weight.glsl → ...pack_weights/pack_conv2d_gemm_weight.glsl
View file
Open in desktop
File renamed without changes.
0 ...aph/ops/glsl/pack_conv2d_gemm_weight.yaml → ...pack_weights/pack_conv2d_gemm_weight.yaml
View file
Open in desktop
File renamed without changes.
0 ...h/ops/glsl/conv2d_dw_prepack_weights.glsl → ...ck_weights/conv2d_dw_prepack_weights.glsl
View file
Open in desktop
File renamed without changes.
0 ...h/ops/glsl/conv2d_dw_prepack_weights.yaml → ...ck_weights/conv2d_dw_prepack_weights.yaml
View file
Open in desktop
File renamed without changes.
0 ...raph/ops/glsl/conv2d_prepack_weights.glsl → .../pack_weights/conv2d_prepack_weights.glsl
View file
Open in desktop
File renamed without changes.
0 ...raph/ops/glsl/conv2d_prepack_weights.yaml → .../pack_weights/conv2d_prepack_weights.yaml
View file
Open in desktop
File renamed without changes.
0 ...e/graph/ops/glsl/conv2d_dw_q8_utils.glslh → ...tion/conv2d/q8ta/conv2d_dw_q8_utils.glslh
View file
Open in desktop
File renamed without changes.
0 ...h/ops/glsl/conv2d_dw_q8ta_q8csw_q8to.glsl → ...onv2d/q8ta/conv2d_dw_q8ta_q8csw_q8to.glsl
View file
Open in desktop
File renamed without changes.
0 ...h/ops/glsl/conv2d_dw_q8ta_q8csw_q8to.yaml → ...onv2d/q8ta/conv2d_dw_q8ta_q8csw_q8to.yaml
View file
Open in desktop
File renamed without changes.
0 ...n/runtime/graph/ops/glsl/q8ta_im2col.glsl → ...ution/conv2d/q8ta/im2col/q8ta_im2col.glsl
View file
Open in desktop
File renamed without changes.
0 ...n/runtime/graph/ops/glsl/q8ta_im2col.yaml → ...ution/conv2d/q8ta/im2col/q8ta_im2col.yaml
View file
Open in desktop
File renamed without changes.
0 ...h/ops/glsl/pack_q8_conv2d_dw_weights.glsl → ...ck_weights/pack_q8_conv2d_dw_weights.glsl
View file
Open in desktop
File renamed without changes.
0 ...h/ops/glsl/pack_q8_conv2d_dw_weights.yaml → ...ck_weights/pack_q8_conv2d_dw_weights.yaml
View file
Open in desktop
File renamed without changes.
0 ...raph/ops/glsl/pack_q8_conv2d_weights.glsl → .../pack_weights/pack_q8_conv2d_weights.glsl
View file
Open in desktop
File renamed without changes.
0 ...raph/ops/glsl/pack_q8_conv2d_weights.yaml → .../pack_weights/pack_q8_conv2d_weights.yaml
View file
Open in desktop
File renamed without changes.
0 ...n/runtime/graph/ops/glsl/q8ta_conv2d.glsl → .../convolution/conv2d/q8ta/q8ta_conv2d.glsl
View file
Open in desktop
File renamed without changes.
0 ...n/runtime/graph/ops/glsl/q8ta_conv2d.yaml → .../convolution/conv2d/q8ta/q8ta_conv2d.yaml
View file
Open in desktop
File renamed without changes.
0 ...untime/graph/ops/glsl/q8ta_conv2d_dw.glsl → ...nvolution/conv2d/q8ta/q8ta_conv2d_dw.glsl
View file
Open in desktop
File renamed without changes.
0 ...untime/graph/ops/glsl/q8ta_conv2d_dw.yaml → ...nvolution/conv2d/q8ta/q8ta_conv2d_dw.yaml
View file
Open in desktop
File renamed without changes.
0 ...untime/graph/ops/glsl/q8ta_conv2d_pw.glsl → ...nvolution/conv2d/q8ta/q8ta_conv2d_pw.glsl
View file
Open in desktop
File renamed without changes.
0 ...untime/graph/ops/glsl/q8ta_conv2d_pw.yaml → ...nvolution/conv2d/q8ta/q8ta_conv2d_pw.yaml
View file
Open in desktop
File renamed without changes.
0 ...raph/ops/glsl/q8ta_conv2d_transposed.glsl → ...ta/transposed/q8ta_conv2d_transposed.glsl
View file
Open in desktop
File renamed without changes.
0 ...raph/ops/glsl/q8ta_conv2d_transposed.yaml → ...ta/transposed/q8ta_conv2d_transposed.yaml
View file
Open in desktop
File renamed without changes.
0 ...vulkan/runtime/graph/ops/glsl/col2im.glsl → ...ution/conv2d/quantized_legacy/col2im.glsl
View file
Open in desktop
File renamed without changes.
0 ...vulkan/runtime/graph/ops/glsl/col2im.yaml → ...ution/conv2d/quantized_legacy/col2im.yaml
View file
Open in desktop
File renamed without changes.
0 ...aph/ops/glsl/conv2d_fp_im2col_block.glslh → ...tized_legacy/conv2d_fp_im2col_block.glslh
View file
Open in desktop
File renamed without changes.
0 ...ps/glsl/conv2d_fp_im2col_block_load.glslh → ..._legacy/conv2d_fp_im2col_block_load.glslh
View file
Open in desktop
File renamed without changes.
0 ...s/glsl/conv2d_fp_im2col_block_store.glslh → ...legacy/conv2d_fp_im2col_block_store.glslh
View file
Open in desktop
File renamed without changes.
0 ...s/glsl/conv2d_int8_input_block_load.glslh → ...legacy/conv2d_int8_input_block_load.glslh
View file
Open in desktop
File renamed without changes.
0 ...ps/glsl/conv2d_int8_input_tile_load.glslh → ..._legacy/conv2d_int8_input_tile_load.glslh
View file
Open in desktop
File renamed without changes.
0 .../glsl/conv2d_int8_output_tile_store.glslh → ...egacy/conv2d_int8_output_tile_store.glslh
View file
Open in desktop
File renamed without changes.
0 ...glsl/conv2d_pw_q8ta_q8csw_q8to_tiled.glsl → ...gacy/conv2d_pw_q8ta_q8csw_q8to_tiled.glsl
View file
Open in desktop
File renamed without changes.
0 ...glsl/conv2d_pw_q8ta_q8csw_q8to_tiled.yaml → ...gacy/conv2d_pw_q8ta_q8csw_q8to_tiled.yaml
View file
Open in desktop
File renamed without changes.
0 ...time/graph/ops/glsl/conv2d_q8_utils.glslh → ...2d/quantized_legacy/conv2d_q8_utils.glslh
View file
Open in desktop
File renamed without changes.
0 ...h/ops/glsl/conv2d_q8csw_linear_tiled.glsl → ...zed_legacy/conv2d_q8csw_linear_tiled.glsl
View file
Open in desktop
File renamed without changes.
0 ...h/ops/glsl/conv2d_q8csw_linear_tiled.yaml → ...zed_legacy/conv2d_q8csw_linear_tiled.yaml
View file
Open in desktop
File renamed without changes.
0 .../glsl/conv2d_q8ta_q8csw_linear_tiled.glsl → ...egacy/conv2d_q8ta_q8csw_linear_tiled.glsl
View file
Open in desktop
File renamed without changes.
0 .../glsl/conv2d_q8ta_q8csw_linear_tiled.yaml → ...egacy/conv2d_q8ta_q8csw_linear_tiled.yaml
View file
Open in desktop
File renamed without changes.
0 ...raph/ops/glsl/conv2d_q8ta_q8csw_q8to.glsl → ...ntized_legacy/conv2d_q8ta_q8csw_q8to.glsl
View file
Open in desktop
File renamed without changes.
0 ...raph/ops/glsl/conv2d_q8ta_q8csw_q8to.yaml → ...ntized_legacy/conv2d_q8ta_q8csw_q8to.yaml
View file
Open in desktop
File renamed without changes.
0 .../conv2d_q8ta_q8csw_q8to_linear_tiled.glsl → .../conv2d_q8ta_q8csw_q8to_linear_tiled.glsl
View file
Open in desktop
File renamed without changes.
0 .../conv2d_q8ta_q8csw_q8to_linear_tiled.yaml → .../conv2d_q8ta_q8csw_q8to_linear_tiled.yaml
View file
Open in desktop
File renamed without changes.
0 ...vulkan/runtime/graph/ops/glsl/im2col.glsl → ...ution/conv2d/quantized_legacy/im2col.glsl
View file
Open in desktop
File renamed without changes.
0 ...vulkan/runtime/graph/ops/glsl/im2col.yaml → ...ution/conv2d/quantized_legacy/im2col.yaml
View file
Open in desktop
File renamed without changes.
0 ...me/graph/ops/glsl/im2col_packed_int8.glsl → .../quantized_legacy/im2col_packed_int8.glsl
View file
Open in desktop
File renamed without changes.
0 ...me/graph/ops/glsl/im2col_packed_int8.yaml → .../quantized_legacy/im2col_packed_int8.yaml
View file
Open in desktop
File renamed without changes.
0 ...h/ops/glsl/im2col_packed_int8_utils.glslh → ...zed_legacy/im2col_packed_int8_utils.glslh
View file
Open in desktop
File renamed without changes.
0 ...ph/ops/glsl/quantize_and_pack_im2col.glsl → ...ized_legacy/quantize_and_pack_im2col.glsl
View file
Open in desktop
File renamed without changes.
0 ...ph/ops/glsl/quantize_and_pack_im2col.yaml → ...ized_legacy/quantize_and_pack_im2col.yaml
View file
Open in desktop
File renamed without changes.
0 ...time/graph/ops/glsl/conv_transpose2d.glsl → ...n/conv2d/transposed/conv_transpose2d.glsl
View file
Open in desktop
File renamed without changes.
0 ...time/graph/ops/glsl/conv_transpose2d.yaml → ...n/conv2d/transposed/conv_transpose2d.yaml
View file
Open in desktop
File renamed without changes.
0 ...lsl/conv_transpose2d_prepack_weights.glsl → ...hts/conv_transpose2d_prepack_weights.glsl
View file
Open in desktop
File renamed without changes.
0 ...lsl/conv_transpose2d_prepack_weights.yaml → ...hts/conv_transpose2d_prepack_weights.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion backends/vulkan/runtime/graph/ops/glsl/quantize_and_pack_4w4c.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $if INPUT_STORAGE == "buffer":

layout(std430) buffer;

#include "conv2d_common.glslh"
#include "convolution/conv2d/conv2d_common.glslh"

${layout_declare_tensor(B, "w", "t_packed_int8_input", "int", OUTPUT_STORAGE, is_scalar_array=False)}
${layout_declare_tensor(B, "r", "t_fp_input", DTYPE, INPUT_STORAGE)}
Expand Down
2 changes: 1 addition & 1 deletion backends/vulkan/runtime/graph/ops/glsl/unpack_4w4c_and_dequantize.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $if INPUT_STORAGE == "buffer":

layout(std430) buffer;

#include "conv2d_common.glslh"
#include "convolution/conv2d/conv2d_common.glslh"

${layout_declare_tensor(B, "w", "t_fp_output", DTYPE, OUTPUT_STORAGE)}
${layout_declare_tensor(B, "r", "t_packed_int8_output", "int", INPUT_STORAGE, is_scalar_array=False)}
Expand Down
Loading
Loading