From d3e72e87c44c275766a160d18c4e4d5e22e53e7c Mon Sep 17 00:00:00 2001 From: "assistant-librarian[bot]" Date: Mon, 27 Oct 2025 18:15:18 +0000 Subject: [PATCH] Merge commit '6c2ca1211ae29802281049843d284ba1bd6511f8' into develop --- .../20_grouped_convolution/CMakeLists.txt | 3 + ...grouped_convolution_forward_bias_clamp.cpp | 58 ++ .../grouped_convolution_forward_invoker.hpp | 13 +- ...ped_convolution_fwd_bias_clamp_example.inc | 301 ++++++++++ .../run_grouped_convolution_fwd_example.inc | 14 +- experimental/builder/README.md | 13 +- .../include/ck_tile/builder/builder_utils.hpp | 143 +++++ .../builder/conv_algorithm_concepts.hpp | 141 +++++ .../ck_tile/builder/conv_algorithm_limits.hpp | 33 ++ .../include/ck_tile/builder/conv_builder.hpp | 38 ++ .../include/ck_tile/builder/conv_factory.hpp | 539 ++++++++++++++++++ .../builder/conv_signature_concepts.hpp | 74 +++ .../builder/reflect/instance_traits_util.hpp | 5 +- .../builder/include/ck_tile/builder/types.hpp | 90 +++ .../include/ck_tile/builder/versions.hpp | 18 + experimental/builder/test/CMakeLists.txt | 9 + .../test/conv/test_ckb_conv_fwd_2d_bf16.cpp | 47 ++ .../test/conv/test_ckb_conv_fwd_2d_fp16.cpp | 26 + .../test/conv/test_ckb_conv_fwd_2d_fp32.cpp | 26 + .../test/conv/test_ckb_conv_fwd_3d_bf16.cpp | 27 + .../test/conv/test_ckb_conv_fwd_3d_fp16.cpp | 27 + .../test/conv/test_ckb_conv_fwd_3d_fp32.cpp | 27 + .../test/impl/conv_algorithm_types.hpp | 119 ++++ .../test/impl/conv_signature_types.hpp | 23 + .../test/utils/ckb_conv_test_common.hpp | 103 ++++ .../element/unary_element_wise_operation.hpp | 2 + .../reference/reference_grouped_conv_fwd.hpp | 33 +- .../unary_element_wise_operation.hpp | 66 +++ .../ops/epilogue/cshuffle_epilogue.hpp | 10 +- .../grouped_convolution_forward_kernel.hpp | 24 +- .../utils/grouped_convolution_utils.hpp | 29 +- .../elementwise/test_elementwise_1d.cpp | 14 +- 32 files changed, 2051 insertions(+), 44 deletions(-) create mode 100644 example/ck_tile/20_grouped_convolution/grouped_convolution_forward_bias_clamp.cpp create mode 100644 example/ck_tile/20_grouped_convolution/run_grouped_convolution_fwd_bias_clamp_example.inc create mode 100644 experimental/builder/include/ck_tile/builder/builder_utils.hpp create mode 100644 experimental/builder/include/ck_tile/builder/conv_algorithm_concepts.hpp create mode 100644 experimental/builder/include/ck_tile/builder/conv_algorithm_limits.hpp create mode 100644 experimental/builder/include/ck_tile/builder/conv_builder.hpp create mode 100644 experimental/builder/include/ck_tile/builder/conv_factory.hpp create mode 100644 experimental/builder/include/ck_tile/builder/conv_signature_concepts.hpp create mode 100644 experimental/builder/include/ck_tile/builder/types.hpp create mode 100644 experimental/builder/include/ck_tile/builder/versions.hpp create mode 100644 experimental/builder/test/conv/test_ckb_conv_fwd_2d_bf16.cpp create mode 100644 experimental/builder/test/conv/test_ckb_conv_fwd_2d_fp16.cpp create mode 100644 experimental/builder/test/conv/test_ckb_conv_fwd_2d_fp32.cpp create mode 100644 experimental/builder/test/conv/test_ckb_conv_fwd_3d_bf16.cpp create mode 100644 experimental/builder/test/conv/test_ckb_conv_fwd_3d_fp16.cpp create mode 100644 experimental/builder/test/conv/test_ckb_conv_fwd_3d_fp32.cpp create mode 100644 experimental/builder/test/impl/conv_algorithm_types.hpp create mode 100644 experimental/builder/test/impl/conv_signature_types.hpp create mode 100644 experimental/builder/test/utils/ckb_conv_test_common.hpp diff --git a/example/ck_tile/20_grouped_convolution/CMakeLists.txt b/example/ck_tile/20_grouped_convolution/CMakeLists.txt index 10332137e2..e9614061e1 100644 --- a/example/ck_tile/20_grouped_convolution/CMakeLists.txt +++ b/example/ck_tile/20_grouped_convolution/CMakeLists.txt @@ -4,6 +4,9 @@ list(APPEND EXAMPLE_CONV_COMPILE_OPTIONS -mllvm -enable-noalias-to-md-conversion add_executable(tile_example_grouped_conv_fwd EXCLUDE_FROM_ALL grouped_convolution_forward.cpp) target_compile_options(tile_example_grouped_conv_fwd PRIVATE ${EXAMPLE_GEMM_COMPILE_OPTIONS}) +add_executable(tile_example_grouped_conv_fwd_bias_clamp EXCLUDE_FROM_ALL grouped_convolution_forward_bias_clamp.cpp) +target_compile_options(tile_example_grouped_conv_fwd_bias_clamp PRIVATE ${EXAMPLE_GEMM_COMPILE_OPTIONS}) + add_executable(tile_example_grouped_conv_bwd_weight EXCLUDE_FROM_ALL grouped_convolution_backward_weight.cpp) target_compile_options(tile_example_grouped_conv_bwd_weight PRIVATE ${EXAMPLE_GEMM_COMPILE_OPTIONS}) diff --git a/example/ck_tile/20_grouped_convolution/grouped_convolution_forward_bias_clamp.cpp b/example/ck_tile/20_grouped_convolution/grouped_convolution_forward_bias_clamp.cpp new file mode 100644 index 0000000000..ed215cb178 --- /dev/null +++ b/example/ck_tile/20_grouped_convolution/grouped_convolution_forward_bias_clamp.cpp @@ -0,0 +1,58 @@ +// SPDX-License-Identifier: MIT +// Copyright (c) 2025, Advanced Micro Devices, Inc. All rights reserved. + +#include + +#include +#include +#include +#include +#include + +#include "ck_tile/host.hpp" +#include "grouped_convolution_utils.hpp" +#include "grouped_convolution_forward_invoker.hpp" +#include "run_grouped_convolution_fwd_bias_clamp_example.inc" + +template