Merge branch 'master' into feature/hip

ICLDisco · Jun 5, 2023 · 5deec12 · 5deec12
2 parents f006860 + a59a535
commit 5deec12
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 28 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -29,15 +29,15 @@ jobs:
       BUILD_DIRECTORY : "${{github.workspace}}/build/${{ matrix.build_type }}/shared_${{matrix.shared_type}}"
       INSTALL_DIRECTORY : "${{github.workspace}}/install/${{ matrix.build_type }}/shared_${{matrix.shared_type}}"
       RUNNER_ENV : github_runner
-      # Disable DPLASMA_WITH_RECURSIVE in CI tests until a real solution to https://github.com/ICLDisco/parsec/issues/548 is implemented
+      # Disable RECURSIVE in CI tests until a real solution to https://github.com/ICLDisco/parsec/issues/548 is implemented
       BUILD_CONFIG : >
         -G Ninja
         -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
         -DBUILD_SHARED_LIBS=${{ matrix.shared_type }}
         -DMPIEXEC_PREFLAGS='--bind-to;none;--oversubscribe'
         -DCMAKE_INSTALL_PREFIX=$INSTALL_DIRECTORY
         -DDPLASMA_PRECISIONS=d
-        -DPLASMA_WITH_RECURSIVE=OFF
+        -DPARSEC_HAVE_DEV_RECURSIVE_SUPPORT=OFF
 
     steps:
     - uses: actions/checkout@v2

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,9 +33,6 @@ option(BUILD_SHARED_LIBS
 option(DPLASMA_WITH_SCALAPACK_WRAPPER
   "Build a ScaLAPACK compatible API to DPLASMA" ON)
 
-option(DPLASMA_WITH_RECURSIVE
-  "Enable recursive kernels to be called when available" ON)
-
 option(DPLASMA_TRACE_KERNELS
   "Enable tracing dplasma kernel calls for debugging (slow)" OFF)
 

diff --git a/src/include/dplasma/config.h.in b/src/include/dplasma/config.h.in
@@ -2,7 +2,6 @@
 #define DPLASMA_CONFIG_H_HAS_BEEN_INCLUDED
 
 /* Optional features */
-#cmakedefine DPLASMA_WITH_RECURSIVE
 #cmakedefine DPLASMA_TRACE_KERNELS
 
 /* GPU Backends */

diff --git a/src/zgeqrf.jdf b/src/zgeqrf.jdf
@@ -13,10 +13,8 @@ extern "C" %{
 #include "dplasmajdf.h"
 #include "parsec/data_dist/matrix/matrix.h"
 
-#if defined(DPLASMA_WITH_RECURSIVE)
 #include "parsec/data_dist/matrix/subtile.h"
 #include "parsec/recursive.h"
-#endif
 
 #if defined(DPLASMA_HAVE_CUDA)
 #include "cores/dplasma_zcores.h"

diff --git a/src/zpotrf_L.jdf b/src/zpotrf_L.jdf
@@ -1,6 +1,6 @@
 extern "C" %{
 /*
- * Copyright (c) 2010-2022 The University of Tennessee and The University
+ * Copyright (c) 2010-2023 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2013      Inria. All rights reserved.
@@ -12,16 +12,15 @@ extern "C" %{
 #include "dplasmajdf.h"
 #include "parsec/data_dist/matrix/matrix.h"
 
-#if defined(DPLASMA_WITH_RECURSIVE)
 #include "parsec/data_dist/matrix/subtile.h"
 #include "parsec/recursive.h"
-#endif
+static void zpotrf_L_update_INFO(parsec_taskpool_t* _tp, const parsec_recursive_callback_t* data);
 
 #include "potrf_gpu_workspaces.h"
 
 #if defined(DPLASMA_HAVE_CUDA)
 #include <cublas_v2.h>
-#include <cusolverDn.h>
+#include "potrf_cublas_utils.h"
 #endif  /* defined(DPLASMA_HAVE_CUDA) */
 #if defined(DPLASMA_HAVE_HIP)
 #include <hipblas.h>
@@ -56,10 +55,6 @@ extern "C" %{
  *
  */
 
-#if defined(DPLASMA_WITH_RECURSIVE)
-static void zpotrf_L_update_INFO(parsec_taskpool_t* _tp, const parsec_recursive_callback_t* data);
-#endif  /* defined(DPLASMA_WITH_RECURSIVE) */
-
 /*
  * Priorities used in this jdf:
  *      - potrf_zpotrf(k)    : (MT-k)**3
@@ -647,7 +642,6 @@ END
 
 extern "C" %{
 
-#if defined(DPLASMA_WITH_RECURSIVE)
 /*
  * A function to recursively update the value of the INFO argument for
  * recursive calls. We need a special function because the recursive calls being asynchronous
@@ -670,7 +664,6 @@ static void zpotrf_L_update_INFO(parsec_taskpool_t* _tp, const parsec_recursive_
     }
     dplasma_zpotrf_Destruct(_tp);
 }
-#endif  /* defined(DPLASMA_WITH_RECURSIVE) */
 
 %}
 
diff --git a/src/zpotrf_U.jdf b/src/zpotrf_U.jdf
@@ -1,6 +1,6 @@
 extern "C" %{
 /*
- * Copyright (c) 2010-2022 The University of Tennessee and The University
+ * Copyright (c) 2010-2023 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2013      Inria. All rights reserved.
@@ -12,16 +12,15 @@ extern "C" %{
 #include "dplasmajdf.h"
 #include "parsec/data_dist/matrix/matrix.h"
 
-#if defined(DPLASMA_WITH_RECURSIVE)
 #include "parsec/data_dist/matrix/subtile.h"
 #include "parsec/recursive.h"
-#endif
+static void zpotrf_U_update_INFO(parsec_taskpool_t* _tp, const parsec_recursive_callback_t* data);
 
 #include "potrf_gpu_workspaces.h"
 
 #if defined(DPLASMA_HAVE_CUDA)
 #include <cublas_v2.h>
-#include <cusolverDn.h>
+#include "potrf_cublas_utils.h"
 #endif  /* defined(DPLASMA_HAVE_CUDA) */
 #if defined(DPLASMA_HAVE_HIP)
 #include <hipblas.h>
@@ -56,10 +55,6 @@ extern "C" %{
  *
  */
 
-#if defined(DPLASMA_WITH_RECURSIVE)
-static void zpotrf_U_update_INFO(parsec_taskpool_t* _tp, const parsec_recursive_callback_t* data);
-#endif  /* defined(DPLASMA_WITH_RECURSIVE) */
-
 /*
  * Priorities used in this jdf:
  *      - potrf_zpotrf(k)    : (MT-k)**3
@@ -662,7 +657,6 @@ END
 
 extern "C" %{
 
-#if defined(DPLASMA_WITH_RECURSIVE)
 /*
  * A function to recursively update the value of the INFO argument for
  * recursive calls. We need a special function because the recursive calls being asynchronous
@@ -685,7 +679,6 @@ static void zpotrf_U_update_INFO(parsec_taskpool_t* _tp, const parsec_recursive_
     }
     dplasma_zpotrf_Destruct(_tp);
 }
-#endif  /* defined(DPLASMA_WITH_RECURSIVE) */
 
 %}