mirror of
https://github.com/ROCm/composable_kernel.git
synced 2026-05-14 02:02:46 +00:00
[CK TILE] Enable CK TILE Conv Fwd tests in CI and fix check_err (#3624)
* [CK TILE] Enable CK TILE Conv Fwd tests in CI and fix check_err
* Update test_grouped_convnd_fwd_tile.cpp
* Update test_grouped_convnd_fwd_tile.cpp
* Update conv_tuning_params.hpp
* clang format fix
* Update CMakeLists.txt
[ROCm/composable_kernel commit: 3d67e6c492]
This commit is contained in:
@@ -21,13 +21,12 @@ endif()
|
||||
|
||||
if(GPU_TARGETS MATCHES "gfx9")
|
||||
if(CK_EXPERIMENTAL_BUILDER)
|
||||
# TODO: Reenable after the instance fixes
|
||||
# add_executable(test_grouped_convnd_fwd_tile test_grouped_convnd_fwd_tile.cpp)
|
||||
# target_compile_options(test_grouped_convnd_fwd_tile PRIVATE -Wno-global-constructors -Wno-undef -Wno-c++20-compat)
|
||||
# target_link_libraries(test_grouped_convnd_fwd_tile PRIVATE gtest_main getopt::getopt utility)
|
||||
# if(TARGET device_grouped_conv_fwd_tile_instances)
|
||||
# target_link_libraries(test_grouped_convnd_fwd_tile PRIVATE device_grouped_conv_fwd_tile_instances)
|
||||
# endif()
|
||||
add_gtest_executable(test_grouped_convnd_fwd_tile test_grouped_convnd_fwd_tile.cpp)
|
||||
target_compile_options(test_grouped_convnd_fwd_tile PRIVATE -Wno-global-constructors -Wno-undef -Wno-c++20-compat)
|
||||
target_link_libraries(test_grouped_convnd_fwd_tile PRIVATE gtest_main getopt::getopt utility)
|
||||
if(TARGET device_grouped_conv_fwd_tile_instances)
|
||||
target_link_libraries(test_grouped_convnd_fwd_tile PRIVATE device_grouped_conv_fwd_tile_instances)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
@@ -13,6 +13,8 @@
|
||||
|
||||
// TODO: Remove limitation of conv fwd gpu reference which does not support right pad
|
||||
#define CK_CONV_FWD_REF_SKIP_RIGHT_PAD_CASES 1
|
||||
// TODO: Remove this limitation after gpu reference fix
|
||||
#define ENABLE_BHALF_GROUPED_CONV_FWD_TESTS 0
|
||||
|
||||
static ck::index_t args_mask = 0xffff;
|
||||
static ck::index_t instance_index = -1;
|
||||
@@ -67,7 +69,10 @@ class TestGroupedConvndFwdTile : public ::testing::Test
|
||||
|
||||
auto inputs = alloc_inputs(args);
|
||||
auto outputs = alloc_outputs(args);
|
||||
ckt::init_inputs(args, inputs.get());
|
||||
ckt::init_tensor_buffer_uniform_fp(
|
||||
inputs.get().input, args.make_input_descriptor(), -5, 5);
|
||||
ckt::init_tensor_buffer_uniform_fp(
|
||||
inputs.get().weight, args.make_weight_descriptor(), -5, 5);
|
||||
|
||||
std::cout << args.make_input_descriptor() << std::endl;
|
||||
std::cout << args.make_weight_descriptor() << std::endl;
|
||||
@@ -150,13 +155,12 @@ using KernelTypes2d = ::testing::Types<SignatureDetails<2,
|
||||
ckb::DataType::FP32,
|
||||
ckb::TensorLayout::NHWGC,
|
||||
ckb::TensorLayout::GKYXC,
|
||||
ckb::TensorLayout::NHWGK>,
|
||||
SignatureDetails<2,
|
||||
ckb::DataType::BF16,
|
||||
ckb::DataType::FP32,
|
||||
ckb::TensorLayout::NHWGC,
|
||||
ckb::TensorLayout::GKYXC,
|
||||
ckb::TensorLayout::NHWGK>>;
|
||||
#if ENABLE_BHALF_GROUPED_CONV_FWD_TESTS
|
||||
SignatureDetails < 2, ckb::DataType::BF16, ckb::DataType::FP32, ckb::TensorLayout::NHWGC,
|
||||
ckb::TensorLayout::GKYXC, ckb::TensorLayout::NHWGK >>
|
||||
;
|
||||
#endif
|
||||
|
||||
using KernelTypes3d = ::testing::Types<SignatureDetails<3,
|
||||
ckb::DataType::FP32,
|
||||
@@ -169,13 +173,12 @@ using KernelTypes3d = ::testing::Types<SignatureDetails<3,
|
||||
ckb::DataType::FP32,
|
||||
ckb::TensorLayout::NDHWGC,
|
||||
ckb::TensorLayout::GKZYXC,
|
||||
ckb::TensorLayout::NDHWGK>,
|
||||
SignatureDetails<3,
|
||||
ckb::DataType::BF16,
|
||||
ckb::DataType::FP32,
|
||||
ckb::TensorLayout::NDHWGC,
|
||||
ckb::TensorLayout::GKZYXC,
|
||||
ckb::TensorLayout::NDHWGK>>;
|
||||
#if ENABLE_BHALF_GROUPED_CONV_FWD_TESTS
|
||||
SignatureDetails < 3, ckb::DataType::BF16, ckb::DataType::FP32, ckb::TensorLayout::NDHWGC,
|
||||
ckb::TensorLayout::GKZYXC, ckb::TensorLayout::NDHWGK >>
|
||||
;
|
||||
#endif
|
||||
|
||||
template <typename SignatureDetailsType>
|
||||
class TestGroupedConvndFwdTile2d : public TestGroupedConvndFwdTile<SignatureDetailsType>
|
||||
|
||||
Reference in New Issue
Block a user