Merge branch 'develop' of...

Merge branch 'develop' of https://github.com/ROCmSoftwarePlatform/composable_kernel into simple_gemm_dl

test/normalization/test_groupnorm_fp16.cpp

@@ -17,6 +17,7 @@ class TestGroupnorm : public ::testing::Test
     using BetaDataType           = std::tuple_element_t<2, Tuple>;
     using ComputeDataType        = std::tuple_element_t<3, Tuple>;
     using YDataType              = std::tuple_element_t<4, Tuple>;
+    using SaveMeanInvStdDataType = std::tuple_element_t<5, Tuple>;
 
     void Run()
     {
@@ -37,7 +38,9 @@ class TestGroupnorm : public ::testing::Test
                                                      GammaDataType,
                                                      BetaDataType,
                                                      ComputeDataType,
-                                                     YDataType>(true, 2, false, false, length);
+                                                     YDataType,
+                                                     SaveMeanInvStdDataType,
+                                                     true>(true, 2, false, false, length);
             EXPECT_TRUE(success);
         }
     }
@@ -45,7 +48,7 @@ class TestGroupnorm : public ::testing::Test
 
 using KernelTypes = ::testing::Types<
     // XDataType, GammaDataType, BetaDataType, ComputeDataType, YDataType>
-    std::tuple<F16, F16, F16, F32, F16>>;
+    std::tuple<F16, F16, F16, F32, F16, F32>>;
 
 TYPED_TEST_SUITE(TestGroupnorm, KernelTypes);
 TYPED_TEST(TestGroupnorm, Test_FP16) { this->Run(); }

test/normalization/test_groupnorm_fp32.cpp

@@ -17,6 +17,7 @@ class TestGroupnorm : public ::testing::Test
     using BetaDataType           = std::tuple_element_t<2, Tuple>;
     using ComputeDataType        = std::tuple_element_t<3, Tuple>;
     using YDataType              = std::tuple_element_t<4, Tuple>;
+    using SaveMeanInvStdDataType = std::tuple_element_t<5, Tuple>;
 
     void Run()
     {
@@ -35,7 +36,9 @@ class TestGroupnorm : public ::testing::Test
                                                      GammaDataType,
                                                      BetaDataType,
                                                      ComputeDataType,
-                                                     YDataType>(true, 2, false, false, length);
+                                                     YDataType,
+                                                     SaveMeanInvStdDataType,
+                                                     true>(true, 2, false, false, length);
             EXPECT_TRUE(success);
         }
     }
@@ -43,7 +46,7 @@ class TestGroupnorm : public ::testing::Test
 
 using KernelTypes = ::testing::Types<
     // XDataType, GammaDataType, BetaDataType, ComputeDataType, YDataType>
-    std::tuple<F32, F32, F32, F32, F32>>;
+    std::tuple<F32, F32, F32, F32, F32, F32>>;
 
 TYPED_TEST_SUITE(TestGroupnorm, KernelTypes);
 TYPED_TEST(TestGroupnorm, Test_FP32) { this->Run(); }

test/normalization/test_layernorm2d_fp16.cpp

@@ -17,6 +17,7 @@ class TestLayernorm2d : public ::testing::Test
     using BetaDataType           = std::tuple_element_t<2, Tuple>;
     using ComputeDataType        = std::tuple_element_t<3, Tuple>;
     using YDataType              = std::tuple_element_t<4, Tuple>;
+    using SaveMeanInvStdDataType = std::tuple_element_t<5, Tuple>;
 
     void Run()
     {
@@ -31,6 +32,8 @@ class TestLayernorm2d : public ::testing::Test
                                                                 BetaDataType,
                                                                 ComputeDataType,
                                                                 YDataType,
+                                                                SaveMeanInvStdDataType,
+                                                                true,
                                                                 2>(true, 2, false, false, length);
             EXPECT_TRUE(success);
         }
@@ -39,7 +42,7 @@ class TestLayernorm2d : public ::testing::Test
 
 using KernelTypes = ::testing::Types<
     // XDataType, GammaDataType, BetaDataType, ComputeDataType, YDataType>
-    std::tuple<F16, F16, F16, F32, F16>>;
+    std::tuple<F16, F16, F16, F32, F16, F32>>;
 
 TYPED_TEST_SUITE(TestLayernorm2d, KernelTypes);
 TYPED_TEST(TestLayernorm2d, Test_FP16) { this->Run(); }

test/normalization/test_layernorm2d_fp32.cpp

@@ -17,6 +17,7 @@ class TestLayernorm2d : public ::testing::Test
     using BetaDataType           = std::tuple_element_t<2, Tuple>;
     using ComputeDataType        = std::tuple_element_t<3, Tuple>;
     using YDataType              = std::tuple_element_t<4, Tuple>;
+    using SaveMeanInvStdDataType = std::tuple_element_t<5, Tuple>;
 
     void Run()
     {
@@ -31,6 +32,8 @@ class TestLayernorm2d : public ::testing::Test
                                                                 BetaDataType,
                                                                 ComputeDataType,
                                                                 YDataType,
+                                                                SaveMeanInvStdDataType,
+                                                                true,
                                                                 2>(true, 2, false, false, length);
             EXPECT_TRUE(success);
         }
@@ -39,7 +42,7 @@ class TestLayernorm2d : public ::testing::Test
 
 using KernelTypes = ::testing::Types<
     // XDataType, GammaDataType, BetaDataType, ComputeDataType, YDataType>
-    std::tuple<F32, F32, F32, F32, F32>>;
+    std::tuple<F32, F32, F32, F32, F32, F32>>;
 
 TYPED_TEST_SUITE(TestLayernorm2d, KernelTypes);
 TYPED_TEST(TestLayernorm2d, Test_FP32) { this->Run(); }