Cublas: sometimes we would include cublas.h before including cusolver.h

use cublasv2 by default (req. for cusolver anyway) except if cublas(v1) is included before the dplasmajdf/aux.h include This reverts the logic for cublas.h determination, and is a first steps toward deprecating cublas(v1) usage entirely
ICLDisco · Aug 9, 2024 · 309fb5a · 309fb5a
1 parent 81e56dc
commit 309fb5a
Show file tree

Hide file tree

Showing 27 changed files with 99 additions and 133 deletions.
diff --git a/src/dplasmaaux_cuda.h b/src/dplasmaaux_cuda.h
@@ -16,11 +16,11 @@
 /**
  * DPLASMA currently supports a mix of cublas v1 and v2, but not in the same source file. Thus,
  * the simplest way to provide common headers is to require the developer to manually specify
- * when cublas_v2 is needed by including the header before dplasmaaux.h. Otherwise, we will include
- * cublas.h (v1) automatically if CUDA is enabled.
+ * when legacy cublas is needed by including the header before dplasmaaux.h. Otherwise, we will include
+ * cublas_v2.h (v2) automatically if CUDA is enabled.
  */
-#if !defined(CUBLAS_V2_H_)
-#include <cublas.h>
+#if !defined(CUBLAS_H_)
+#include <cublas_v2.h>
 #endif  /* !defined(CUBLAS_V2_H_) */
 
 #define dplasma_cublas_side(side)                                         \

diff --git a/src/dtd_wrappers/zgemm.c b/src/dtd_wrappers/zgemm.c
@@ -7,11 +7,6 @@
  *
  */
 #include "dplasma/config.h"
-
-#if defined(DPLASMA_HAVE_CUDA)
-#include <cublas_v2.h>
-#endif  /* defined(DPLASMA_HAVE_CUDA) */
-
 #include "dplasma_z_dtd.h"
 
 int

diff --git a/src/dtd_wrappers/zherk.c b/src/dtd_wrappers/zherk.c
@@ -7,11 +7,6 @@
  *
  */
 #include "dplasma/config.h"
-
-#if defined(DPLASMA_HAVE_CUDA)
-#include <cublas_v2.h>
-#endif  /* defined(DPLASMA_HAVE_CUDA) */
-
 #include "dplasma_z_dtd.h"
 
 int

diff --git a/src/dtd_wrappers/zpotrf.c b/src/dtd_wrappers/zpotrf.c
@@ -7,11 +7,6 @@
  *
  */
 #include "dplasma/config.h"
-
-#if defined(DPLASMA_HAVE_CUDA)
-#include <cublas_v2.h>
-#endif  /* defined(DPLASMA_HAVE_CUDA) */
-
 #include "dplasma_z_dtd.h"
 
 int

diff --git a/src/dtd_wrappers/ztrsm.c b/src/dtd_wrappers/ztrsm.c
@@ -7,11 +7,6 @@
  *
  */
 #include "dplasma/config.h"
-
-#if defined(DPLASMA_HAVE_CUDA)
-#include <cublas_v2.h>
-#endif  /* defined(DPLASMA_HAVE_CUDA) */
-
 #include "dplasma_z_dtd.h"
 
 int

diff --git a/src/zgemm_NN.jdf b/src/zgemm_NN.jdf
@@ -1,23 +1,22 @@
 extern "C" %{
 /*
- * Copyright (c) 2010-2023 The University of Tennessee and The University
+ * Copyright (c) 2010-2024 The University of Tennessee and The University
  *                         of Tennessee Research Foundation. All rights
  *                         reserved.
  *
  * @precisions normal z -> s d c
  * $COPYRIGHT
  *
  */
+#include "dplasma/config.h"
+#if defined(DPLASMA_HAVE_CUDA)
+#include <cublas.h>
+#endif  /* defined(DPLASMA_HAVE_CUDA) */
 #include "dplasmajdf.h"
-#include "dplasmaaux.h"
 #include "parsec/data_dist/matrix/matrix.h"
 #include "parsec/data_dist/matrix/two_dim_rectangle_cyclic.h"
 #include <math.h>
 
-#if defined(DPLASMA_HAVE_CUDA)
-#include <cublas.h>
-#endif  /* defined(DPLASMA_HAVE_CUDA) */
-
 /* Define the different shapes this JDF is using */
 #define A_SHAPE 0
 #define B_SHAPE 1

diff --git a/src/zgemm_NN_gpu.jdf b/src/zgemm_NN_gpu.jdf
@@ -9,18 +9,14 @@ extern "C" %{
  *
  */
 
-#include <math.h>
-#include "dplasmajdf.h"
-#include "dplasmaaux.h"
-#include "parsec/data_dist/matrix/matrix.h"
-#include "parsec/data_dist/matrix/two_dim_rectangle_cyclic.h"
-
+#include "dplasma/config.h"
 #if defined(DPLASMA_HAVE_CUDA)
 #include <cublas.h>
 #endif  /* defined(DPLASMA_HAVE_CUDA) */
-#if defined(DPLASMA_HAVE_HIP)
-#include <hipblas/hipblas.h>
-#endif  /* defined(DPLASMA_HAVE_HIP) */
+#include "dplasmajdf.h"
+#include "parsec/data_dist/matrix/matrix.h"
+#include "parsec/data_dist/matrix/two_dim_rectangle_cyclic.h"
+#include <math.h>
 
 static void succ(int *x, int *y, int *z, int xMax, int yMax, int zMax, int l)
 {

diff --git a/src/zgemm_NN_summa.jdf b/src/zgemm_NN_summa.jdf
@@ -8,19 +8,15 @@ extern "C" %{
  * $COPYRIGHT
  *
  */
+#include "dplasma/config.h"
+#if defined(DPLASMA_HAVE_CUDA)
+#include <cublas.h>
+#endif  /* defined(DPLASMA_HAVE_CUDA) */
 #include "dplasmajdf.h"
-#include "dplasmaaux.h"
 #include "parsec/data_dist/matrix/matrix.h"
 #include "parsec/data_dist/matrix/two_dim_rectangle_cyclic.h"
 #include <math.h>
 
-#if defined(DPLASMA_HAVE_CUDA)
-#include <cublas.h>
-#endif  /* defined(DPLASMA_HAVE_CUDA) */
-#if defined(DPLASMA_HAVE_HIP)
-#include <hipblas/hipblas.h>
-#endif  /* defined(DPLASMA_HAVE_HIP) */
-
 /* Define the different shapes this JDF is using */
 #define A_SHAPE 0
 #define B_SHAPE 1

diff --git a/src/zgemm_NT.jdf b/src/zgemm_NT.jdf
@@ -1,23 +1,22 @@
 extern "C" %{
 /*
- * Copyright (c) 2010-2023 The University of Tennessee and The University
+ * Copyright (c) 2010-2024 The University of Tennessee and The University
  *                         of Tennessee Research Foundation. All rights
  *                         reserved.
  *
  * @precisions normal z -> s d c
  * $COPYRIGHT
  *
  */
+#include "dplasma/config.h"
+#if defined(DPLASMA_HAVE_CUDA)
+#include <cublas.h>
+#endif  /* defined(DPLASMA_HAVE_CUDA) */
 #include "dplasmajdf.h"
-#include "dplasmaaux.h"
 #include "parsec/data_dist/matrix/matrix.h"
 #include "parsec/data_dist/matrix/two_dim_rectangle_cyclic.h"
 #include <math.h>
 
-#if defined(DPLASMA_HAVE_CUDA)
-#include <cublas.h>
-#endif  /* defined(DPLASMA_HAVE_CUDA) */
-
 /* Define the different shapes this JDF is using */
 #define A_SHAPE 0
 #define B_SHAPE 1

diff --git a/src/zgemm_NT_summa.jdf b/src/zgemm_NT_summa.jdf
@@ -8,19 +8,15 @@ extern "C" %{
  * $COPYRIGHT
  *
  */
+#include "dplasma/config.h"
+#if defined(DPLASMA_HAVE_CUDA)
+#include <cublas.h>
+#endif  /* defined(DPLASMA_HAVE_CUDA) */
 #include "dplasmajdf.h"
-#include "dplasmaaux.h"
 #include "parsec/data_dist/matrix/matrix.h"
 #include "parsec/data_dist/matrix/two_dim_rectangle_cyclic.h"
 #include <math.h>
 
-#if defined(DPLASMA_HAVE_CUDA)
-#include <cublas.h>
-#endif  /* defined(DPLASMA_HAVE_CUDA) */
-#if defined(DPLASMA_HAVE_HIP)
-#include <hipblas/hipblas.h>
-#endif  /* defined(DPLASMA_HAVE_HIP) */
-
 /* Define the different shapes this JDF is using */
 #define A_SHAPE 0
 #define B_SHAPE 1

diff --git a/src/zgemm_TN.jdf b/src/zgemm_TN.jdf
@@ -1,23 +1,22 @@
 extern "C" %{
 /*
- * Copyright (c) 2010-2023 The University of Tennessee and The University
+ * Copyright (c) 2010-2024 The University of Tennessee and The University
  *                         of Tennessee Research Foundation. All rights
  *                         reserved.
  *
  * @precisions normal z -> s d c
  * $COPYRIGHT
  *
  */
+#include "dplasma/config.h"
+#if defined(DPLASMA_HAVE_CUDA)
+#include <cublas.h>
+#endif  /* defined(DPLASMA_HAVE_CUDA) */
 #include "dplasmajdf.h"
-#include "dplasmaaux.h"
 #include "parsec/data_dist/matrix/matrix.h"
 #include "parsec/data_dist/matrix/two_dim_rectangle_cyclic.h"
 #include <math.h>
 
-#if defined(DPLASMA_HAVE_CUDA)
-#include <cublas.h>
-#endif  /* defined(DPLASMA_HAVE_CUDA) */
-
 /* Define the different shapes this JDF is using */
 #define A_SHAPE 0
 #define B_SHAPE 1

diff --git a/src/zgemm_TN_summa.jdf b/src/zgemm_TN_summa.jdf
@@ -8,19 +8,15 @@ extern "C" %{
  * $COPYRIGHT
  *
  */
+#include "dplasma/config.h"
+#if defined(DPLASMA_HAVE_CUDA)
+#include <cublas.h>
+#endif  /* defined(DPLASMA_HAVE_CUDA) */
 #include "dplasmajdf.h"
-#include "dplasmaaux.h"
 #include "parsec/data_dist/matrix/matrix.h"
 #include "parsec/data_dist/matrix/two_dim_rectangle_cyclic.h"
 #include <math.h>
 
-#if defined(DPLASMA_HAVE_CUDA)
-#include <cublas.h>
-#endif  /* defined(DPLASMA_HAVE_CUDA) */
-#if defined(DPLASMA_HAVE_HIP)
-#include <hipblas/hipblas.h>
-#endif  /* defined(DPLASMA_HAVE_HIP) */
-
 /* Define the different shapes this JDF is using */
 #define A_SHAPE 0
 #define B_SHAPE 1

diff --git a/src/zgemm_TT.jdf b/src/zgemm_TT.jdf
@@ -1,23 +1,22 @@
 extern "C" %{
 /*
- * Copyright (c) 2010-2023 The University of Tennessee and The University
+ * Copyright (c) 2010-2024 The University of Tennessee and The University
  *                         of Tennessee Research Foundation. All rights
  *                         reserved.
  *
  * @precisions normal z -> s d c
  * $COPYRIGHT
  *
  */
+#include "dplasma/config.h"
+#if defined(DPLASMA_HAVE_CUDA)
+#include <cublas.h>
+#endif  /* defined(DPLASMA_HAVE_CUDA) */
 #include "dplasmajdf.h"
-#include "dplasmaaux.h"
 #include "parsec/data_dist/matrix/matrix.h"
 #include "parsec/data_dist/matrix/two_dim_rectangle_cyclic.h"
 #include <math.h>
 
-#if defined(DPLASMA_HAVE_CUDA)
-#include <cublas.h>
-#endif  /* defined(DPLASMA_HAVE_CUDA) */
-
 /* Define the different shapes this JDF is using */
 #define A_SHAPE 0
 #define B_SHAPE 1

diff --git a/src/zgemm_TT_summa.jdf b/src/zgemm_TT_summa.jdf
@@ -8,19 +8,15 @@ extern "C" %{
  * $COPYRIGHT
  *
  */
+#include "dplasma/config.h"
+#if defined(DPLASMA_HAVE_CUDA)
+#include <cublas.h>
+#endif  /* defined(DPLASMA_HAVE_CUDA) */
 #include "dplasmajdf.h"
-#include "dplasmaaux.h"
 #include "parsec/data_dist/matrix/matrix.h"
 #include "parsec/data_dist/matrix/two_dim_rectangle_cyclic.h"
 #include <math.h>
 
-#if defined(DPLASMA_HAVE_CUDA)
-#include <cublas.h>
-#endif  /* defined(DPLASMA_HAVE_CUDA) */
-#if defined(DPLASMA_HAVE_HIP)
-#include <hipblas/hipblas.h>
-#endif  /* defined(DPLASMA_HAVE_HIP) */
-
 /* Define the different shapes this JDF is using */
 #define A_SHAPE 0
 #define B_SHAPE 1

diff --git a/src/zgetrf_nopiv.jdf b/src/zgetrf_nopiv.jdf
@@ -1,6 +1,6 @@
 extern "C" %{
 /*
- * Copyright (c) 2010-2023 The University of Tennessee and The University
+ * Copyright (c) 2010-2024 The University of Tennessee and The University
  *                         of Tennessee Research Foundation. All rights
  *                         reserved.
  * Copyright (c) 2013      Inria. All rights reserved.
@@ -10,12 +10,12 @@ extern "C" %{
  * @precisions normal z -> s d c
  *
  */
-#include "dplasmajdf.h"
-#include "parsec/data_dist/matrix/matrix.h"
-
+#include "dplasma/config.h"
 #if defined(DPLASMA_HAVE_CUDA)
 #include <cublas.h>
 #endif  /* defined(DPLASMA_HAVE_CUDA) */
+#include "dplasmajdf.h"
+#include "parsec/data_dist/matrix/matrix.h"
 
 /* Define the different shapes this JDF is using */
 #define DEFAULT 0

diff --git a/src/zpoinv_L.jdf b/src/zpoinv_L.jdf
@@ -1,6 +1,6 @@
 extern "C" %{
 /*
- * Copyright (c) 2010-2020 The University of Tennessee and The University
+ * Copyright (c) 2010-2024 The University of Tennessee and The University
  *                         of Tennessee Research Foundation. All rights
  *                         reserved.
  * Copyright (c) 2013      Inria. All rights reserved.
@@ -10,13 +10,12 @@ extern "C" %{
  * @precisions normal z -> s d c
  *
  */
-#include "dplasmajdf.h"
-#include "parsec/data_dist/matrix/matrix.h"
-
+#include "dplasma/config.h"
 #if defined(DPLASMA_HAVE_CUDA)
 #include <cublas.h>
 #endif  /* defined(DPLASMA_HAVE_CUDA) */
-
+#include "dplasmajdf.h"
+#include "parsec/data_dist/matrix/matrix.h"
 %}
 
 descA     [type = "parsec_tiled_matrix_t*"]

diff --git a/src/zpoinv_U.jdf b/src/zpoinv_U.jdf
@@ -1,6 +1,6 @@
 extern "C" %{
 /*
- * Copyright (c) 2010-2020 The University of Tennessee and The University
+ * Copyright (c) 2010-2024 The University of Tennessee and The University
  *                         of Tennessee Research Foundation. All rights
  *                         reserved.
  * Copyright (c) 2013      Inria. All rights reserved.
@@ -10,13 +10,12 @@ extern "C" %{
  * @precisions normal z -> s d c
  *
  */
-#include "dplasmajdf.h"
-#include "parsec/data_dist/matrix/matrix.h"
-
+#include "dplasma/config.h"
 #if defined(DPLASMA_HAVE_CUDA)
 #include <cublas.h>
 #endif  /* defined(DPLASMA_HAVE_CUDA) */
-
+#include "dplasmajdf.h"
+#include "parsec/data_dist/matrix/matrix.h"
 %}
 
 descA     [type = "parsec_tiled_matrix_t*"]