From 9fde1d98adf9ed34d6b3bd2aaa39cccc920147c1 Mon Sep 17 00:00:00 2001 From: "assistant-librarian[bot]" Date: Thu, 23 Oct 2025 20:13:04 +0000 Subject: [PATCH] Merge commit 'd0364641ed7f7520ed0163e4768d900b8c07af7a' into develop --- .github/workflows/therock-test-component.yml | 1 + .github/workflows/therock-test-packages.yml | 1 + cmake/EnableCompilerWarnings.cmake | 3 ++ .../builder/reflect/instance_traits_util.hpp | 45 ++++++++----------- tile_engine/ops/gemm/CMakeLists.txt | 1 + .../ops/gemm_preshuffle/CMakeLists.txt | 1 + 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/therock-test-component.yml b/.github/workflows/therock-test-component.yml index 068dbe3033..1ccc1d57bc 100644 --- a/.github/workflows/therock-test-component.yml +++ b/.github/workflows/therock-test-component.yml @@ -51,6 +51,7 @@ jobs: uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: repository: "ROCm/TheRock" + ref: c2921b151b8285a1d29942aceb33cfe0fea77ac9 # 10-15-2025 commit - name: Run setup test environment workflow uses: './.github/actions/setup_test_environment' diff --git a/.github/workflows/therock-test-packages.yml b/.github/workflows/therock-test-packages.yml index 54e068eb3d..efb5a6b1a0 100644 --- a/.github/workflows/therock-test-packages.yml +++ b/.github/workflows/therock-test-packages.yml @@ -27,6 +27,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: repository: "ROCm/TheRock" + ref: c2921b151b8285a1d29942aceb33cfe0fea77ac9 # 10-15-2025 commit - name: "Configuring CI options" env: diff --git a/cmake/EnableCompilerWarnings.cmake b/cmake/EnableCompilerWarnings.cmake index 0c81f8df98..4fdbb896de 100644 --- a/cmake/EnableCompilerWarnings.cmake +++ b/cmake/EnableCompilerWarnings.cmake @@ -99,6 +99,9 @@ else() -Wno-unused-lambda-capture -Wno-nvcc-compat ) + if(CK_CXX_STANDARD GREATER_EQUAL 20) + list(APPEND CMAKE_COMPILER_WARNINGS -Wno-c++20-compat) + endif() else() if (CMAKE_${COMPILER}_COMPILER_ID MATCHES "GNU" AND ${COMPILER} MATCHES "CXX") # cmake 3.5.2 does not support >=. diff --git a/experimental/builder/include/ck_tile/builder/reflect/instance_traits_util.hpp b/experimental/builder/include/ck_tile/builder/reflect/instance_traits_util.hpp index 160a560529..90e42528e1 100644 --- a/experimental/builder/include/ck_tile/builder/reflect/instance_traits_util.hpp +++ b/experimental/builder/include/ck_tile/builder/reflect/instance_traits_util.hpp @@ -60,45 +60,38 @@ consteval std::string_view type_name() template constexpr std::string_view layout_name() { - // Convolution layouts - if constexpr(std::is_same_v) - return "GNHWC"; - else if constexpr(std::is_same_v) - return "GKYXC"; - else if constexpr(std::is_same_v) - return "GNHWK"; - else if constexpr(std::is_same_v) - return "GKZYXC"; - else if constexpr(std::is_same_v) - return "GNDHWC"; - else if constexpr(std::is_same_v) - return "GNDHWK"; - else if constexpr(std::is_same_v) - return "NHWGC"; - else if constexpr(std::is_same_v) - return "KYXGC"; - else if constexpr(std::is_same_v) - return "NHWGK"; + if constexpr(requires { + { T::name } -> std::convertible_to; + }) + return T::name; else - static_assert(false, "unknown_layout"); + static_assert(false, "layout type is missing name attribute"); } // Convert element-wise operation types to string names template constexpr std::string_view elementwise_op_name() { - if constexpr(std::is_same_v) + namespace element_wise = ck::tensor_operation::element_wise; + + if constexpr(std::is_same_v) return "PassThrough"; - else if constexpr(std::is_same_v) + else if constexpr(std::is_same_v) return "Scale"; - else if constexpr(std::is_same_v) + else if constexpr(std::is_same_v) return "Bilinear"; - else if constexpr(std::is_same_v) + else if constexpr(std::is_same_v) return "Add"; - else if constexpr(std::is_same_v) + else if constexpr(std::is_same_v) return "AddRelu"; - else if constexpr(std::is_same_v) + else if constexpr(std::is_same_v) return "Relu"; + else if constexpr(std::is_same_v) + return "BiasNormalizeInInferClamp"; + else if constexpr(std::is_same_v) + return "Clamp"; + else if constexpr(std::is_same_v) + return "AddClamp"; else static_assert(false, "unknown_op"); } diff --git a/tile_engine/ops/gemm/CMakeLists.txt b/tile_engine/ops/gemm/CMakeLists.txt index 91fd69d549..0e0ca41c9a 100644 --- a/tile_engine/ops/gemm/CMakeLists.txt +++ b/tile_engine/ops/gemm/CMakeLists.txt @@ -64,6 +64,7 @@ function(create_individual_gemm_target datatype layout trait tile_config config_ # Create the executable add_executable(${target_name} + EXCLUDE_FROM_ALL ${GEMM_SOURCE_DIR}/benchmark_gemm_single.cpp ${instance_header} ) diff --git a/tile_engine/ops/gemm_preshuffle/CMakeLists.txt b/tile_engine/ops/gemm_preshuffle/CMakeLists.txt index dae4b61345..972ad9d0db 100644 --- a/tile_engine/ops/gemm_preshuffle/CMakeLists.txt +++ b/tile_engine/ops/gemm_preshuffle/CMakeLists.txt @@ -64,6 +64,7 @@ function(create_individual_gemm_preshuffle_target datatype layout trait tile_con # Create the executable add_executable(${target_name} + EXCLUDE_FROM_ALL ${GEMM_PRESHUFFLE_SOURCE_DIR}/benchmark_gemm_preshuffle_single.cpp ${instance_header} )