mirror of
https://github.com/ROCm/composable_kernel.git
synced 2026-05-04 21:51:28 +00:00
Add Grouped Conv Fwd Large Tensor kernel (#1432)
* Support 64 bit indexing * Add new grouped conv fwd kernel for large tensors * Add instances large tensor * Fixes for transform conv to gemm * Fixes * fixes * Remove not needed instances * examples fixes * Remove not need ds arrays * Fix tests * Add 2GB check in gridwise dl * Fixes
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
// Copyright (c) 2018-2023, Advanced Micro Devices, Inc. All rights reserved.
|
||||
// Copyright (c) 2018-2024, Advanced Micro Devices, Inc. All rights reserved.
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
@@ -24,12 +24,12 @@ class TestConvUtil : public ::testing::Test
|
||||
128,
|
||||
192,
|
||||
256,
|
||||
std::vector<ck::index_t>(ndims, 3),
|
||||
std::vector<ck::index_t>(ndims, 71),
|
||||
std::vector<ck::index_t>(ndims, s),
|
||||
std::vector<ck::index_t>(ndims, d),
|
||||
std::vector<ck::index_t>(ndims, p),
|
||||
std::vector<ck::index_t>(ndims, p));
|
||||
std::vector<ck::long_index_t>(ndims, 3),
|
||||
std::vector<ck::long_index_t>(ndims, 71),
|
||||
std::vector<ck::long_index_t>(ndims, s),
|
||||
std::vector<ck::long_index_t>(ndims, d),
|
||||
std::vector<ck::long_index_t>(ndims, p),
|
||||
std::vector<ck::long_index_t>(ndims, p));
|
||||
}
|
||||
|
||||
protected:
|
||||
@@ -48,35 +48,35 @@ TEST_F(TestConvUtil, ConvParamsGetOutputSpatialLengths1D)
|
||||
{
|
||||
// stride 2, dilation 1, pad 1
|
||||
SetNDParams(1, 2, 1, 1);
|
||||
std::vector<ck::index_t> out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
std::vector<ck::long_index_t> out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(ck::utils::check_err(
|
||||
out_spatial_len, std::vector<ck::index_t>{36}, "Error: ConvParams 1D."));
|
||||
out_spatial_len, std::vector<ck::long_index_t>{36}, "Error: ConvParams 1D."));
|
||||
|
||||
// stride 1, dilation 1, pad 1
|
||||
SetNDParams(1, 1, 1, 1);
|
||||
out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(ck::utils::check_err(
|
||||
out_spatial_len, std::vector<ck::index_t>{71}, "Error: ConvParams 1D stride {1}."));
|
||||
out_spatial_len, std::vector<ck::long_index_t>{71}, "Error: ConvParams 1D stride {1}."));
|
||||
|
||||
// stride 2, dilation 1, pad 2
|
||||
SetNDParams(1, 2, 1, 2);
|
||||
out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(ck::utils::check_err(out_spatial_len,
|
||||
std::vector<ck::index_t>{37},
|
||||
std::vector<ck::long_index_t>{37},
|
||||
"Error: ConvParams 1D padding left/right {2}."));
|
||||
|
||||
// stride 2, dilation 2, pad 2
|
||||
SetNDParams(1, 2, 2, 2);
|
||||
out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(ck::utils::check_err(
|
||||
out_spatial_len, std::vector<ck::index_t>{36}, "Error: ConvParams 1D dilation {2}."));
|
||||
out_spatial_len, std::vector<ck::long_index_t>{36}, "Error: ConvParams 1D dilation {2}."));
|
||||
|
||||
// stride 3, dilation 2, pad 1
|
||||
SetNDParams(1, 3, 2, 1);
|
||||
out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(
|
||||
ck::utils::check_err(out_spatial_len,
|
||||
std::vector<ck::index_t>{23},
|
||||
std::vector<ck::long_index_t>{23},
|
||||
"Error: ConvParams 1D strides{3}, padding {1}, dilations {2}."));
|
||||
}
|
||||
|
||||
@@ -84,36 +84,38 @@ TEST_F(TestConvUtil, ConvParamsGetOutputSpatialLengths2D)
|
||||
{
|
||||
// stride 2, dilation 1, pad 1
|
||||
SetNDParams(2, 2, 1, 1);
|
||||
std::vector<ck::index_t> out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
std::vector<ck::long_index_t> out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(ck::utils::check_err(out_spatial_len,
|
||||
std::vector<ck::index_t>{36, 36},
|
||||
std::vector<ck::long_index_t>{36, 36},
|
||||
"Error: ConvParams 2D default constructor."));
|
||||
|
||||
// stride 1, dilation 1, pad 1
|
||||
SetNDParams(2, 1, 1, 1);
|
||||
out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(ck::utils::check_err(
|
||||
out_spatial_len, std::vector<ck::index_t>{71, 71}, "Error: ConvParams 2D stride {1,1}."));
|
||||
EXPECT_TRUE(ck::utils::check_err(out_spatial_len,
|
||||
std::vector<ck::long_index_t>{71, 71},
|
||||
"Error: ConvParams 2D stride {1,1}."));
|
||||
|
||||
// stride 2, dilation 1, pad 2
|
||||
SetNDParams(2, 2, 1, 2);
|
||||
out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(ck::utils::check_err(out_spatial_len,
|
||||
std::vector<ck::index_t>{37, 37},
|
||||
std::vector<ck::long_index_t>{37, 37},
|
||||
"Error: ConvParams 2D padding left/right {2,2}."));
|
||||
|
||||
// stride 2, dilation 2, pad 2
|
||||
SetNDParams(2, 2, 2, 2);
|
||||
out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(ck::utils::check_err(
|
||||
out_spatial_len, std::vector<ck::index_t>{36, 36}, "Error: ConvParams 2D dilation {2,2}."));
|
||||
EXPECT_TRUE(ck::utils::check_err(out_spatial_len,
|
||||
std::vector<ck::long_index_t>{36, 36},
|
||||
"Error: ConvParams 2D dilation {2,2}."));
|
||||
|
||||
// stride 3, dilation 2, pad 1
|
||||
SetNDParams(2, 3, 2, 1);
|
||||
out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(
|
||||
ck::utils::check_err(out_spatial_len,
|
||||
std::vector<ck::index_t>{23, 23},
|
||||
std::vector<ck::long_index_t>{23, 23},
|
||||
"Error: ConvParams 2D strides{3,3}, padding {1,1}, dilations {2,2}."));
|
||||
}
|
||||
|
||||
@@ -121,29 +123,29 @@ TEST_F(TestConvUtil, ConvParamsGetOutputSpatialLengths3D)
|
||||
{
|
||||
// stride 2, dilation 1, pad 1
|
||||
SetNDParams(3, 2, 1, 1);
|
||||
std::vector<ck::index_t> out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
std::vector<ck::long_index_t> out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(ck::utils::check_err(
|
||||
out_spatial_len, std::vector<ck::index_t>{36, 36, 36}, "Error: ConvParams 3D."));
|
||||
out_spatial_len, std::vector<ck::long_index_t>{36, 36, 36}, "Error: ConvParams 3D."));
|
||||
|
||||
// stride 1, dilation 1, pad 1
|
||||
SetNDParams(3, 1, 1, 1);
|
||||
out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(ck::utils::check_err(out_spatial_len,
|
||||
std::vector<ck::index_t>{71, 71, 71},
|
||||
std::vector<ck::long_index_t>{71, 71, 71},
|
||||
"Error: ConvParams 3D stride {1, 1, 1}."));
|
||||
|
||||
// stride 2, dilation 1, pad 2
|
||||
SetNDParams(3, 2, 1, 2);
|
||||
out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(ck::utils::check_err(out_spatial_len,
|
||||
std::vector<ck::index_t>{37, 37, 37},
|
||||
std::vector<ck::long_index_t>{37, 37, 37},
|
||||
"Error: ConvParams 3D padding left/right {2, 2, 2}."));
|
||||
|
||||
// stride 2, dilation 2, pad 2
|
||||
SetNDParams(3, 2, 2, 2);
|
||||
out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(ck::utils::check_err(out_spatial_len,
|
||||
std::vector<ck::index_t>{36, 36, 36},
|
||||
std::vector<ck::long_index_t>{36, 36, 36},
|
||||
"Error: ConvParams 3D dilation {2, 2, 2}."));
|
||||
|
||||
// stride 3, dilation 2, pad 1
|
||||
@@ -151,6 +153,6 @@ TEST_F(TestConvUtil, ConvParamsGetOutputSpatialLengths3D)
|
||||
out_spatial_len = conv_params.GetOutputSpatialLengths();
|
||||
EXPECT_TRUE(ck::utils::check_err(
|
||||
out_spatial_len,
|
||||
std::vector<ck::index_t>{23, 23, 23},
|
||||
std::vector<ck::long_index_t>{23, 23, 23},
|
||||
"Error: ConvParams 3D strides{3, 3, 3}, padding {1, 1, 1}, dilations {2, 2, 2}."));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user