Merge pull request #166 from amcamd/refactor_tests

refactor set/get vector/matrix for host/dev ptr mode

Author: amcamd

clients/benchmarks/client.cpp

@@ -22,6 +22,8 @@
 #include "testing_trtri.hpp"
 #include "testing_trtri_batched.hpp"
 #include "testing_geam.hpp"
+#include "testing_set_get_vector.hpp"
+#include "testing_set_get_matrix.hpp"
 #if BUILD_WITH_TENSILE
     #include "testing_gemm.hpp"
     #include "testing_gemm_strided_batched.hpp"
@@ -171,6 +173,18 @@ int main(int argc, char *argv[])
         else if (precision == 'd')
             testing_geam<double>( argus );
     }
+    else if (function == "set_get_vector"){
+        if (precision == 's')
+            testing_set_get_vector<float>( argus );
+        else if (precision == 'd')
+            testing_set_get_vector<double>( argus );
+    }
+    else if (function == "set_get_matrix"){
+        if (precision == 's')
+            testing_set_get_matrix<float>( argus );
+        else if (precision == 'd')
+            testing_set_get_matrix<double>( argus );
+    }
 #if BUILD_WITH_TENSILE
     else if (function == "gemm"){
 

clients/common/arg_check.cpp

@@ -35,6 +35,20 @@ void set_get_matrix_arg_check(rocblas_status status, rocblas_int rows, rocblas_i
     #endif
 }
 
+void set_get_vector_arg_check(rocblas_status status, rocblas_int M, rocblas_int incx, 
+    rocblas_int incy, rocblas_int incd)
+{
+    #ifdef GOOGLE_TEST
+    ASSERT_EQ(status, rocblas_status_invalid_size);
+    #else
+    if (status != rocblas_status_invalid_size)
+    {
+        std::cerr << "ERROR in arguments M, incx, incy, incd: ";
+        std::cerr << M << ',' << incx << ',' << incy << ',' << incd << std::endl;
+    }
+    #endif
+}
+
 void gemv_ger_arg_check(rocblas_status status, rocblas_int M, rocblas_int N, rocblas_int lda, 
     rocblas_int incx, rocblas_int incy)
 {

clients/gtest/set_get_matrix_gtest.cpp

@@ -159,22 +159,44 @@ TEST_P(set_matrix_get_matrix_gtest, float)
     rocblas_status status = testing_set_get_matrix<float>( arg );
 
     // if not success, then the input argument is problematic, so detect the error message
-    if(status != rocblas_status_success){
-        if( arg.rows < 0 ){
+    if (status != rocblas_status_success)
+    {
+        if (arg.rows < 0)
+        {
             EXPECT_EQ(rocblas_status_invalid_size, status);
         }
-        else if(arg.cols <= 0){
+        else if (arg.cols <= 0)
+        {
             EXPECT_EQ(rocblas_status_invalid_size, status);
         }
-        else if(arg.lda <= 0){
+        else if (arg.lda <= 0)
+        {
             EXPECT_EQ(rocblas_status_invalid_size, status);
         }
-        else if(arg.ldb <= 0){
+        else if (arg.ldb <= 0)
+        {
             EXPECT_EQ(rocblas_status_invalid_size, status);
         }
-        else if(arg.ldc <= 0){
+        else if (arg.ldc <= 0)
+        {
             EXPECT_EQ(rocblas_status_invalid_size, status);
         }
+        else if (arg.lda < arg.rows)
+        {
+            EXPECT_EQ(rocblas_status_invalid_size, status);
+        }
+        else if (arg.ldb < arg.rows)
+        {
+            EXPECT_EQ(rocblas_status_invalid_size, status);
+        }
+        else if (arg.ldc < arg.rows)
+        {
+            EXPECT_EQ(rocblas_status_invalid_size, status);
+        }
+        else
+        {
+            EXPECT_EQ(rocblas_status_success, status);
+        }
     }
 }
 

clients/gtest/set_get_vector_gtest.cpp

@@ -43,10 +43,10 @@ Representative sampling is sufficient, endless brute-force sampling is not neces
 const
 int M_range[] = { 600, 6000000 };
 
-//vector of vector, each triple is a {incx, incy, incd};
+//vector of vector, each triple is a {incx, incy, incb};
 //add/delete this list in pairs, like {1, 1, 1}
 const
-vector<vector<int>> incx_incy_incd_range = {
+vector<vector<int>> incx_incy_incb_range = {
                                             {1, 1, 1},
                                             {1, 1, 2},
                                             {1, 1, 3},
@@ -87,17 +87,17 @@ Arguments setup_set_get_vector_arguments(set_get_vector_tuple tup)
 {
 
     int M = std::get<0>(tup);
-    vector<int> incx_incy_incd = std::get<1>(tup);
+    vector<int> incx_incy_incb = std::get<1>(tup);
 
     Arguments arg;
 
     // see the comments about vector_size_range above
     arg.M = M;
 
     // see the comments about matrix_size_range above
-    arg.incx = incx_incy_incd[0];
-    arg.incy = incx_incy_incd[1];
-    arg.incd = incx_incy_incd[2];
+    arg.incx = incx_incy_incb[0];
+    arg.incy = incx_incy_incb[1];
+    arg.incb = incx_incy_incb[2];
 
     return arg;
 }
@@ -126,19 +126,28 @@ TEST_P(set_vector_get_vector_gtest, float)
     rocblas_status status = testing_set_get_vector<float>( arg );
 
     // if not success, then the input argument is problematic, so detect the error message
-    if(status != rocblas_status_success){
-        if( arg.M < 0 ){
+    if(status != rocblas_status_success)
+    {
+        if( arg.M < 0 )
+        {
             EXPECT_EQ(rocblas_status_invalid_size, status);
         }
-        else if(arg.incx <= 0){
+        else if(arg.incx <= 0)
+        {
             EXPECT_EQ(rocblas_status_invalid_size, status);
         }
-        else if(arg.incy <= 0){
+        else if(arg.incy <= 0)
+        {
             EXPECT_EQ(rocblas_status_invalid_size, status);
         }
-        else if(arg.incd <= 0){
+        else if(arg.incb <= 0)
+        {
             EXPECT_EQ(rocblas_status_invalid_size, status);
         }
+        else
+        {
+            EXPECT_EQ(rocblas_status_success, status);
+        }
     }
 }
 
@@ -150,6 +159,6 @@ TEST_P(set_vector_get_vector_gtest, float)
 INSTANTIATE_TEST_CASE_P(rocblas_auxiliary_small,
                         set_vector_get_vector_gtest,
                         Combine(
-                                  ValuesIn(M_range), ValuesIn(incx_incy_incd_range)
+                                  ValuesIn(M_range), ValuesIn(incx_incy_incb_range)
                                )
                         );

clients/include/arg_check.h

@@ -37,6 +37,8 @@
 
     void set_get_matrix_arg_check(rocblas_status status, rocblas_int rows, rocblas_int cols, rocblas_int lda, rocblas_int ldb, rocblas_int ldc);
 
+    void set_get_vector_arg_check(rocblas_status status, rocblas_int M, rocblas_int incx, rocblas_int incy, rocblas_int incd);
+
     void gemv_ger_arg_check(rocblas_status status, rocblas_int M, rocblas_int N, rocblas_int lda, rocblas_int incx, rocblas_int incy);
 
     void gemm_arg_check(rocblas_status status, rocblas_int M, rocblas_int N, rocblas_int K, rocblas_int lda, rocblas_int ldb, rocblas_int ldc);