Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
composable_kernel_ROCM
Commits
95907384
Unverified
Commit
95907384
authored
Jul 03, 2024
by
Jun Liu
Committed by
GitHub
Jul 03, 2024
Browse files
Fix issue with multiple targets and remove smfmac tests from unsupported test targets (#1372)
parent
497ccb87
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
6 deletions
+16
-6
test/grouped_convnd_bwd_weight/CMakeLists.txt
test/grouped_convnd_bwd_weight/CMakeLists.txt
+4
-4
test/grouped_convnd_bwd_weight/test_grouped_convnd_bwd_weight_interface_wmma.cpp
..._weight/test_grouped_convnd_bwd_weight_interface_wmma.cpp
+8
-0
test/grouped_convnd_fwd/CMakeLists.txt
test/grouped_convnd_fwd/CMakeLists.txt
+1
-1
test/wmma_op/wmma_op_util.hpp
test/wmma_op/wmma_op_util.hpp
+3
-1
No files found.
test/grouped_convnd_bwd_weight/CMakeLists.txt
View file @
95907384
...
...
@@ -5,13 +5,13 @@ if(GPU_TARGETS MATCHES "gfx9" OR DL_KERNELS)
add_gtest_executable
(
test_grouped_convnd_bwd_weight test_grouped_convnd_bwd_weight.cpp
)
target_link_libraries
(
test_grouped_convnd_bwd_weight PRIVATE utility device_grouped_conv3d_bwd_weight_instance
)
endif
()
add_gtest_executable
(
test_grouped_convnd_bwd_weight_interface test_grouped_convnd_bwd_weight_interface_xdl.cpp
)
add_gtest_executable
(
test_grouped_convnd_bwd_weight_interface
_xdl
test_grouped_convnd_bwd_weight_interface_xdl.cpp
)
if
(
result EQUAL 0
)
target_link_libraries
(
test_grouped_convnd_bwd_weight_interface PRIVATE utility
)
target_link_libraries
(
test_grouped_convnd_bwd_weight_interface
_xdl
PRIVATE utility
)
endif
()
add_gtest_executable
(
test_grouped_convnd_bwd_weight_interface test_grouped_convnd_bwd_weight_interface_wmma.cpp
)
add_gtest_executable
(
test_grouped_convnd_bwd_weight_interface
_wmma
test_grouped_convnd_bwd_weight_interface_wmma.cpp
)
if
(
result EQUAL 0
)
target_link_libraries
(
test_grouped_convnd_bwd_weight_interface PRIVATE utility
)
target_link_libraries
(
test_grouped_convnd_bwd_weight_interface
_wmma
PRIVATE utility
)
endif
()
add_gtest_executable
(
test_grouped_conv_bwd_weight_xdl_bilinear test_grouped_conv_bwd_weight_xdl_bilinear.cpp
)
if
(
result EQUAL 0
)
...
...
test/grouped_convnd_bwd_weight/test_grouped_convnd_bwd_weight_interface_wmma.cpp
View file @
95907384
...
...
@@ -52,6 +52,14 @@ class TestGroupedConvndBwdWeight : public ::testing::Test
ck
::
utils
::
conv
::
ConvParam
conv_param
;
void
SetUp
()
override
{
if
(
!
ck
::
is_gfx11_supported
())
{
GTEST_SKIP
();
}
}
template
<
ck
::
index_t
SplitK
>
bool
Run
()
{
...
...
test/grouped_convnd_fwd/CMakeLists.txt
View file @
95907384
if
(
GPU_TARGETS MATCHES
"gfx9"
OR GPU_TARGETS MATCHES
"gfx11"
)
add_gtest_executable
(
test_grouped_convnd_fwd test_grouped_convnd_fwd.cpp
)
if
(
GPU_TARGETS MATCHES
"gfx11"
)
if
(
(
GPU_TARGETS MATCHES
"gfx11"
)
AND
(
NOT GPU_TARGETS MATCHES
"gfx9"
))
target_link_libraries
(
test_grouped_convnd_fwd PRIVATE utility device_grouped_conv2d_fwd_instance device_grouped_conv3d_fwd_instance
)
else
()
target_link_libraries
(
test_grouped_convnd_fwd PRIVATE utility device_grouped_conv1d_fwd_instance device_grouped_conv2d_fwd_instance device_grouped_conv3d_fwd_instance
)
...
...
test/wmma_op/wmma_op_util.hpp
View file @
95907384
...
...
@@ -11,6 +11,7 @@
#include "ck/library/utility/host_tensor_generator.hpp"
#include "ck/library/reference_tensor_operation/cpu/reference_gemm.hpp"
#include "ck/utility/amd_wmma.hpp"
#include "ck/host_utility/device_prop.hpp"
namespace
ck
{
namespace
wmma_op_util
{
...
...
@@ -373,7 +374,8 @@ struct TestWmma
a
,
b
,
c_host
,
a_element_op
,
b_element_op
,
c_element_op
);
// Act
bool
is_supported
=
ck
::
wmma_op_util
::
RunDeviceGEMM
(
wmma_kernel
,
a
,
b
,
c_device
);
bool
is_supported
=
ck
::
is_gfx11_supported
()
&&
ck
::
wmma_op_util
::
RunDeviceGEMM
(
wmma_kernel
,
a
,
b
,
c_device
);
if
(
is_supported
)
{
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment