Merge pull request #99 from abouteiller/cleanup/cuda_check_error

Return the proper PARSEC_HOOK_RETURN_ERROR in GPU error cases
ICLDisco · Oct 24, 2023 · 94c442a · 94c442a
2 parents dd7db25 + ec55b0b
commit 94c442a
Show file tree

Hide file tree

Showing 21 changed files with 31 additions and 63 deletions.
diff --git a/src/zgemm_NN.jdf b/src/zgemm_NN.jdf
@@ -190,8 +190,7 @@ BODY [type=CUDA]
                      (cuDoubleComplex*)B, ldbk,
              lbeta,  (cuDoubleComplex*)C, ldcm );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/zgemm_NN_summa.jdf b/src/zgemm_NN_summa.jdf
@@ -237,8 +237,7 @@ BODY [type=CUDA
                      (cuDoubleComplex*)B, ldbk,
              lbeta,  (cuDoubleComplex*)C, ldcm );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/zgemm_NT.jdf b/src/zgemm_NT.jdf
@@ -195,8 +195,7 @@ BODY [type=CUDA
                      (cuDoubleComplex*)B, ldbn,
              lbeta,  (cuDoubleComplex*)C, ldcm );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/zgemm_NT_summa.jdf b/src/zgemm_NT_summa.jdf
@@ -237,8 +237,7 @@ BODY [type=CUDA
                      (cuDoubleComplex*)B, ldbn,
              lbeta,  (cuDoubleComplex*)C, ldcm );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/zgemm_TN.jdf b/src/zgemm_TN.jdf
@@ -195,8 +195,7 @@ BODY [type=CUDA
                      (cuDoubleComplex*)B, ldbk,
              lbeta,  (cuDoubleComplex*)C, ldcm );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/zgemm_TN_summa.jdf b/src/zgemm_TN_summa.jdf
@@ -236,8 +236,7 @@ BODY [type=CUDA
                      (cuDoubleComplex*)B, ldbk,
              lbeta,  (cuDoubleComplex*)C, ldcm );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/zgemm_TT.jdf b/src/zgemm_TT.jdf
@@ -195,8 +195,7 @@ BODY [type=CUDA
                      (cuDoubleComplex*)B, ldbn,
              lbeta,  (cuDoubleComplex*)C, ldcm );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/zgemm_TT_summa.jdf b/src/zgemm_TT_summa.jdf
@@ -239,8 +239,7 @@ BODY [type=CUDA
     if(status != CUBLAS_STATUS_SUCCESS){
       printf("ISSUE\n");
     }
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/zgetrf_nopiv.jdf b/src/zgetrf_nopiv.jdf
@@ -230,8 +230,7 @@ BODY [type=CUDA
                     (cuDoubleComplex*)B, ldak_B,
              zone,  (cuDoubleComplex*)C, ldam_C);
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/zpoinv_L.jdf b/src/zpoinv_L.jdf
@@ -161,8 +161,7 @@ BODY [type=CUDA]
                         (cuDoubleComplex*)B, ldan,
                  zone,  (cuDoubleComplex*)C, ldam );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 
@@ -268,8 +267,7 @@ BODY [type=CUDA]
                        (cuDoubleComplex*)B, ldak,
                  zone, (cuDoubleComplex*)C, ldam );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 
@@ -437,8 +435,7 @@ BODY [type=CUDA]
                        (cuDoubleComplex*)B, ldak,
                  zone, (cuDoubleComplex*)C, ldam );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/zpoinv_U.jdf b/src/zpoinv_U.jdf
@@ -160,8 +160,7 @@ BODY [type=CUDA]
                         (cuDoubleComplex*)B, ldak,
                  zone,  (cuDoubleComplex*)C, ldan );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 
@@ -266,8 +265,7 @@ BODY [type=CUDA]
                        (cuDoubleComplex*)B, ldak,
                  zone, (cuDoubleComplex*)C, ldam );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 
@@ -434,8 +432,7 @@ BODY [type=CUDA]
                        (cuDoubleComplex*)B, ldan,
                  zone, (cuDoubleComplex*)C, ldam );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                            {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/zpotrf_L.jdf b/src/zpotrf_L.jdf
@@ -166,8 +166,7 @@ BODY [type=CUDA
     d_iinfo   = (int*)(wp->tmpmem + wp->lwork * sizeof(cuDoubleComplex));
 
     status = cusolverDnZpotrf( handles->cusolverDn_handle, cublas_uplo, tempkm, T, ldak, workspace, wp->lwork, d_iinfo);
-    PARSEC_CUDA_CHECK_ERROR( "cublasZpotrf_v2 ", status,
-                            {return PARSEC_HOOK_RETURN_ERROR;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZpotrf_v2 ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 
@@ -238,12 +237,10 @@ BODY [type=CUDA]
                             CUBLAS_OP_C, CUBLAS_DIAG_NON_UNIT,
                             tempmm, descA->nb,
                             &zone, T, ldak, C, ldam);
-    PARSEC_CUDA_CHECK_ERROR( "cublasZtrsm_v2 ", status,
-                            {return PARSEC_HOOK_RETURN_ERROR;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZtrsm_v2 ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 
-
 BODY [type=RECURSIVE]
 {
     int tempmm = m == descA->mt-1 ? descA->m - m * descA->mb : descA->mb;
@@ -346,8 +343,7 @@ BODY [type=CUDA]
                              tempmm, descA->mb,
                              &mzone, A, ldam_A,
                              &zone, T, ldam_T);
-    PARSEC_CUDA_CHECK_ERROR( "cublasZherk_v2 ", status,
-                            {return PARSEC_HOOK_RETURN_ERROR;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZherk_v2 ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 
@@ -469,8 +465,7 @@ BODY [type=CUDA
                              &mzone, (cuDoubleComplex*)A, ldam_A,
                                      (cuDoubleComplex*)B, ldan_B,
                              &zone,  (cuDoubleComplex*)C, ldam_C );
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm_v2 ", status,
-                            {return PARSEC_HOOK_RETURN_ERROR;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm_v2 ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/zpotrf_U.jdf b/src/zpotrf_U.jdf
@@ -165,8 +165,7 @@ BODY [type=CUDA
     d_iinfo   = (int*)(wp->tmpmem + wp->lwork * sizeof(cuDoubleComplex));
 
     status = cusolverDnZpotrf( handles->cusolverDn_handle, cublas_uplo, tempkn, T, ldak, workspace, wp->lwork, d_iinfo);
-    PARSEC_CUDA_CHECK_ERROR( "cublasZpotrf_v2 ", status,
-                            {return PARSEC_HOOK_RETURN_ERROR;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZpotrf_v2 ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 
@@ -240,8 +239,7 @@ BODY [type=CUDA]
                             CUBLAS_OP_C, CUBLAS_DIAG_NON_UNIT,
                             descA->mb, tempnn,
                             &zone, T, ldak_T, C, ldak_C);
-    PARSEC_CUDA_CHECK_ERROR( "cublasZtrsm_v2 ", status,
-                            {return PARSEC_HOOK_RETURN_ERROR;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZtrsm_v2 ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 
@@ -349,8 +347,7 @@ BODY [type=CUDA]
                              &mzone, A, ldak,
                              &zone, T, ldan);
 
-    PARSEC_CUDA_CHECK_ERROR( "cublasZherk_v2 ", status,
-                            {return PARSEC_HOOK_RETURN_ERROR;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZherk_v2 ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 
@@ -473,8 +470,7 @@ BODY [type=CUDA
                              &mzone, (cuDoubleComplex*)A, ldak_A,
                                      (cuDoubleComplex*)B, ldak_B,
                              &zone,  (cuDoubleComplex*)C, ldam_C);
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm_v2 ", status,
-                            {return PARSEC_HOOK_RETURN_ERROR;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm_v2 ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 
     printlogcuda("CUDA_zgemm( %d, %d, %d )\n\t( %s, %s, %d, %d, %d, %f, A(%d,%d)[%p], %d, A(%d,%d)[%p], %d, %f, A(%d,%d)[%p], %d)\n",
                  m, n, k,

diff --git a/src/ztrsm_LLN.jdf b/src/ztrsm_LLN.jdf
@@ -115,8 +115,7 @@ BODY [type=CUDA]
                                  (cuDoubleComplex*)D, ldbk,
                          lalpha, (cuDoubleComplex*)E, ldb );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                             {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/ztrsm_LLT.jdf b/src/ztrsm_LLT.jdf
@@ -116,8 +116,7 @@ BODY [type=CUDA]
                                  (cuDoubleComplex*)D, ldb,
                          lalpha, (cuDoubleComplex*)E, ldbm );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                             {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/ztrsm_LUN.jdf b/src/ztrsm_LUN.jdf
@@ -115,8 +115,7 @@ BODY [type=CUDA]
                                  (cuDoubleComplex*)D, ldb,
                          lalpha, (cuDoubleComplex*)E, ldbm );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                             {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/ztrsm_LUT.jdf b/src/ztrsm_LUT.jdf
@@ -115,8 +115,7 @@ BODY [type=CUDA]
                                 (cuDoubleComplex*)D, ldbk,
                          lalpha, (cuDoubleComplex*)E, ldb );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                             {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/ztrsm_RLN.jdf b/src/ztrsm_RLN.jdf
@@ -114,8 +114,7 @@ BODY [type=CUDA]
                                 (cuDoubleComplex*)D, lda,
                          lalpha, (cuDoubleComplex*)E, ldb );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                             {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/ztrsm_RLT.jdf b/src/ztrsm_RLT.jdf
@@ -113,8 +113,7 @@ BODY [type=CUDA]
                                     (cuDoubleComplex*)D, ldan,
                          zone,      (cuDoubleComplex*)E, ldb );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                             {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/ztrsm_RUN.jdf b/src/ztrsm_RUN.jdf
@@ -115,8 +115,7 @@ BODY [type=CUDA]
                                  (cuDoubleComplex*)D, lda,
                          lalpha, (cuDoubleComplex*)E, ldb );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                             {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END
 

diff --git a/src/ztrsm_RUT.jdf b/src/ztrsm_RUT.jdf
@@ -113,8 +113,7 @@ BODY [type=CUDA]
                                     (cuDoubleComplex*)D, ldan,
                          zone,      (cuDoubleComplex*)E, ldb );
     status = cublasGetError();
-    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status,
-                             {return -1;} );
+    PARSEC_CUDA_CHECK_ERROR( "cublasZgemm ", status, {return PARSEC_HOOK_RETURN_ERROR;} );
 }
 END