gtests: rnn: cleanup

Author: mgouicem

tests/gtests/test_rnn_forward.cpp

@@ -505,9 +505,7 @@ CPU_INSTANTIATE_TEST_SUITE_P(TestRnn, rnn_forward_test_f32,
                         dir::unidirectional_left2right,
                         {fmt::tnc, fmt::undef, fmt::ldigo, fmt::ldigo,
                                 fmt::ldgo, fmt::tnc, fmt::undef},
-                        test_rnn_sizes_t(3, 1, 5, 1, 4, 4, 4, 4)}
-
-                ));
+                        test_rnn_sizes_t(3, 1, 5, 1, 4, 4, 4, 4)}));
 
 TEST_P(lstm_forward_test_f32, TestsLSTM) {}
 CPU_INSTANTIATE_TEST_SUITE_P(TestLSTM, lstm_forward_test_f32,
@@ -517,29 +515,11 @@ CPU_INSTANTIATE_TEST_SUITE_P(TestLSTM, lstm_forward_test_f32,
                         {fmt::tnc, fmt::ldnc, fmt::ldigo, fmt::ldigo, fmt::ldgo,
                                 fmt::tnc, fmt::ldnc},
                         test_rnn_sizes_t(1, 1, 10, 16, 100, 100, 100, 100)},
-                /* Check if not passing dst_iter impacts results */
-                cfg_f32 {NOT_RNN, prop_kind::forward_inference,
-                        dir::unidirectional_left2right,
-                        {fmt::tnc, fmt::ldnc, fmt::ldigo, fmt::ldigo, fmt::ldgo,
-                                fmt::tnc, fmt::undef},
-                        test_rnn_sizes_t(3, 1, 5, 1, 4, 4, 4, 4)}));
-
-CPU_INSTANTIATE_TEST_SUITE_P(TestLSTM_failure, lstm_forward_test_f32,
-        ::testing::Values(cfg_f32 {NOT_RNN, prop_kind::forward_inference,
-                dir::unidirectional_left2right,
-                {fmt::tnc, fmt::ldnc, fmt::ldigo, fmt::ldigo, fmt::ldgo,
-                        fmt::tnc, fmt::ldnc},
-                //               L  D  T  MB  SLC  SIC  DLC  DIC
-                test_rnn_sizes_t(1, 1, 1, 1, 10, 5, 5, 5)}));
-
-TEST_P(gru_forward_test_f32, TestsGRU_failure) {}
-CPU_INSTANTIATE_TEST_SUITE_P(TestGRU_failure, gru_forward_test_f32,
-        ::testing::Values(
+                /* Non uniform sizes tests */
                 cfg_f32 {NOT_RNN, prop_kind::forward_inference,
                         dir::unidirectional_left2right,
                         {fmt::tnc, fmt::ldnc, fmt::ldigo, fmt::ldigo, fmt::ldgo,
                                 fmt::tnc, fmt::ldnc},
-                        //               L  D  T  MB  SLC  SIC  DLC  DIC
                         test_rnn_sizes_t(1, 1, 1, 1, 10, 5, 5, 5)},
                 /* Check if not passing dst_iter impacts results */
                 cfg_f32 {NOT_RNN, prop_kind::forward_inference,
@@ -548,29 +528,32 @@ CPU_INSTANTIATE_TEST_SUITE_P(TestGRU_failure, gru_forward_test_f32,
                                 fmt::tnc, fmt::undef},
                         test_rnn_sizes_t(3, 1, 5, 1, 4, 4, 4, 4)}));
 
-TEST_P(lbr_gru_forward_test_f32, TestsGRUlbr_failure) {}
-CPU_INSTANTIATE_TEST_SUITE_P(TestGRUlbr_failure, lbr_gru_forward_test_f32,
-        ::testing::Values(
+TEST_P(gru_forward_test_f32, TestsGRU) {}
+CPU_INSTANTIATE_TEST_SUITE_P(TestGRU, gru_forward_test_f32,
+        ::testing::Values(cfg_f32 {NOT_RNN, prop_kind::forward_inference,
+                                  dir::unidirectional_left2right,
+                                  {fmt::tnc, fmt::ldnc, fmt::ldigo, fmt::ldigo,
+                                          fmt::ldgo, fmt::tnc, fmt::ldnc},
+                                  test_rnn_sizes_t(1, 1, 1, 1, 10, 5, 5, 5)},
+                /* Check if not passing dst_iter impacts results */
                 cfg_f32 {NOT_RNN, prop_kind::forward_inference,
                         dir::unidirectional_left2right,
                         {fmt::tnc, fmt::ldnc, fmt::ldigo, fmt::ldigo, fmt::ldgo,
-                                fmt::tnc, fmt::ldnc},
-                        //               L  D  T  MB  SLC  SIC  DLC  DIC
-                        test_rnn_sizes_t(1, 1, 1, 1, 10, 5, 5, 5)},
+                                fmt::tnc, fmt::undef},
+                        test_rnn_sizes_t(3, 1, 5, 1, 4, 4, 4, 4)}));
+
+TEST_P(lbr_gru_forward_test_f32, TestsGRUlbr) {}
+CPU_INSTANTIATE_TEST_SUITE_P(TestGRUlbr, lbr_gru_forward_test_f32,
+        ::testing::Values(cfg_f32 {NOT_RNN, prop_kind::forward_inference,
+                                  dir::unidirectional_left2right,
+                                  {fmt::tnc, fmt::ldnc, fmt::ldigo, fmt::ldigo,
+                                          fmt::ldgo, fmt::tnc, fmt::ldnc},
+                                  test_rnn_sizes_t(1, 1, 1, 1, 10, 5, 5, 5)},
                 /* Check if not passing dst_iter impacts results */
                 cfg_f32 {NOT_RNN, prop_kind::forward_inference,
                         dir::unidirectional_left2right,
                         {fmt::tnc, fmt::ldnc, fmt::ldigo, fmt::ldigo, fmt::ldgo,
                                 fmt::tnc, fmt::undef},
                         test_rnn_sizes_t(3, 1, 5, 1, 4, 4, 4, 4)}));
 
-TEST_P(rnn_forward_test_f32, TestsRNN_failure) {}
-CPU_INSTANTIATE_TEST_SUITE_P(TestRNN_failure, rnn_forward_test_f32,
-        ::testing::Values(cfg_f32 {PLAIN_RNN(alg::eltwise_logistic),
-                prop_kind::forward_inference, dir::unidirectional_left2right,
-                {fmt::tnc, fmt::ldnc, fmt::ldigo, fmt::ldigo, fmt::ldgo,
-                        fmt::tnc, fmt::ldnc},
-                //               L  D  T  MB  SLC  SIC  DLC  DIC
-                test_rnn_sizes_t(1, 1, 1, 1, 10, 5, 5, 5)}));
-
 } // namespace dnnl