Skip to content

Commit

Permalink
Merge pull request #105 from abouteiller/cleanup/recursive_cb_nodev_w…
Browse files Browse the repository at this point in the history
…arnings

Silence warnings about having the recursive callbacks defined
  • Loading branch information
bosilca authored Oct 24, 2023
2 parents e476e39 + 900d5f2 commit ee05dc6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
4 changes: 4 additions & 0 deletions src/zgeqrf.jdf
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ extern "C" %{
#include "dplasmajdf.h"
#include "parsec/data_dist/matrix/matrix.h"

#if defined(PARSEC_HAVE_DEV_RECURSIVE_SUPPORT)
#include "parsec/data_dist/matrix/subtile.h"
#include "parsec/recursive.h"
static void zgeqrt_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_callback_t* data);
static void zunmqr_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_callback_t* data);
static void ztsqrt_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_callback_t* data);
static void ztsmqr_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_callback_t* data);
#endif /* PARSEC_HAVE_DEV_RECURSIVE_SUPPORT */

#if defined(DPLASMA_HAVE_CUDA)
#include "cores/dplasma_zcores.h"
Expand Down Expand Up @@ -586,6 +588,7 @@ BODY
END

extern "C" %{
#if defined(PARSEC_HAVE_DEV_RECURSIVE_SUPPORT)
static void zgeqrt_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_callback_t* data) {
(void)data;
dplasma_zgeqrfr_geqrt_Destruct(tp);
Expand All @@ -602,4 +605,5 @@ static void ztsmqr_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_ca
(void)data;
dplasma_zgeqrfr_tsmqr_Destruct(tp);
}
#endif /* PARSEC_HAVE_DEV_RECURSIVE_SUPPORT */
%}
5 changes: 4 additions & 1 deletion src/zpotrf_L.jdf
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ extern "C" %{
#include "dplasmajdf.h"
#include "parsec/data_dist/matrix/matrix.h"

#if defined(PARSEC_HAVE_DEV_RECURSIVE_SUPPORT)
#include "parsec/data_dist/matrix/subtile.h"
#include "parsec/recursive.h"
static void zpotrf_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_callback_t* data);
static void zgemm_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_callback_t* data);
static void zherk_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_callback_t* data);
static void ztrsm_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_callback_t* data);
#endif /* PARSEC_HAVE_DEV_RECURSIVE_SUPPORT */

/* Define the different shapes this JDF is using */
#define DEFAULT 0
Expand Down Expand Up @@ -553,6 +555,7 @@ static int64_t zgemm_time_estimate(const parsec_task_t *task, parsec_device_modu
return (int64_t)FLOPS_ZGEMM(mb, mb, mb) / dev->gflops_fp64;
}

#if defined(PARSEC_HAVE_DEV_RECURSIVE_SUPPORT)
/*
* 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
Expand Down Expand Up @@ -587,6 +590,6 @@ static void ztrsm_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_cal
(void)data;
dplasma_ztrsm_Destruct(tp);
}

#endif /* PARSEC_HAVE_DEV_RECURSIVE_SUPPORT */
%}

5 changes: 4 additions & 1 deletion src/zpotrf_U.jdf
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ extern "C" %{
#include "dplasmajdf.h"
#include "parsec/data_dist/matrix/matrix.h"

#if defined(PARSEC_HAVE_DEV_RECURSIVE_SUPPORT)
#include "parsec/data_dist/matrix/subtile.h"
#include "parsec/recursive.h"
static void zpotrf_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_callback_t* data);
static void zgemm_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_callback_t* data);
static void zherk_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_callback_t* data);
static void ztrsm_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_callback_t* data);
#endif /* PARSEC_HAVE_DEV_RECURSIVE_SUPPORT */

/* Define the different shapes this JDF is using */
#define DEFAULT 0
Expand Down Expand Up @@ -566,6 +568,7 @@ static int64_t zgemm_time_estimate(const parsec_task_t *task, parsec_device_modu
return (int64_t)FLOPS_ZGEMM(mb, mb, mb) / dev->gflops_fp64;
}

#if defined(PARSEC_HAVE_DEV_RECURSIVE_SUPPORT)
/*
* 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
Expand Down Expand Up @@ -600,6 +603,6 @@ static void ztrsm_recursive_cb(parsec_taskpool_t* tp, const parsec_recursive_cal
(void)data;
dplasma_ztrsm_Destruct(tp);
}

#endif /* PARSEC_HAVE_DEV_RECURSIVE_SUPPORT */
%}

0 comments on commit ee05dc6

Please sign in to comment.