From de95d329d4d9c3ab813b14f22c1b4043b59bc538 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Tue, 25 Feb 2025 11:47:06 +0100
Subject: [PATCH] starpu: Silent warnings to compile in -Werror mode
---
sopalin/starpu/codelet_blok_zadd.c | 4 +++-
sopalin/starpu/codelet_blok_zgemmsp.c | 3 ++-
sopalin/starpu/codelet_blok_zgetrfsp.c | 2 ++
sopalin/starpu/codelet_blok_zhetrfsp.c | 2 ++
sopalin/starpu/codelet_blok_zpotrfsp.c | 2 ++
sopalin/starpu/codelet_blok_zpxtrfsp.c | 2 ++
sopalin/starpu/codelet_blok_zscalo.c | 2 ++
sopalin/starpu/codelet_blok_zsytrfsp.c | 2 ++
sopalin/starpu/codelet_blok_ztrsmsp.c | 2 ++
sopalin/starpu/codelet_cblk_zadd.c | 3 +++
sopalin/starpu/codelet_cblk_zgemmsp.c | 2 ++
sopalin/starpu/codelet_cblk_zgetrfsp.c | 2 ++
sopalin/starpu/codelet_cblk_zhetrfsp.c | 2 ++
sopalin/starpu/codelet_cblk_zpotrfsp.c | 2 ++
sopalin/starpu/codelet_cblk_zpxtrfsp.c | 2 ++
sopalin/starpu/codelet_cblk_zsytrfsp.c | 2 ++
sopalin/starpu/codelet_template.c | 2 ++
sopalin/starpu/starpu_rhs.c | 11 ++++++-----
sopalin/starpu/starpu_ztrsm.c | 5 ++++-
19 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/sopalin/starpu/codelet_blok_zadd.c b/sopalin/starpu/codelet_blok_zadd.c
index c44ba895..735ee524 100644
--- a/sopalin/starpu/codelet_blok_zadd.c
+++ b/sopalin/starpu/codelet_blok_zadd.c
@@ -106,6 +106,7 @@ static void (*blok_zadd_callback)(void*) = cl_profiling_callback;
#endif /* defined( PASTIX_STARPU_PROFILING ) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -161,10 +162,11 @@ fct_blok_zadd_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_blok_zadd_model = {
-#if defined( PASTIX_STARPU_COST_PER_ARCH )
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
.type = STARPU_PER_ARCH,
.arch_cost_function = fct_blok_zadd_cost,
#else
diff --git a/sopalin/starpu/codelet_blok_zgemmsp.c b/sopalin/starpu/codelet_blok_zgemmsp.c
index 653ca057..9dc17d6f 100644
--- a/sopalin/starpu/codelet_blok_zgemmsp.c
+++ b/sopalin/starpu/codelet_blok_zgemmsp.c
@@ -108,6 +108,7 @@ static void (*blok_zgemmsp_callback)(void*) = cl_profiling_callback;
#endif /* defined( PASTIX_STARPU_PROFILING ) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -163,7 +164,7 @@ fct_blok_zgemmsp_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
-
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_blok_zgemmsp_model = {
diff --git a/sopalin/starpu/codelet_blok_zgetrfsp.c b/sopalin/starpu/codelet_blok_zgetrfsp.c
index 454cf4f4..b4edd50c 100644
--- a/sopalin/starpu/codelet_blok_zgetrfsp.c
+++ b/sopalin/starpu/codelet_blok_zgetrfsp.c
@@ -98,6 +98,7 @@ static void (*blok_zgetrfsp_callback)(void*) = cl_profiling_callback;
#endif /* defined(PASTIX_STARPU_PROFILING) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -151,6 +152,7 @@ fct_blok_zgetrfsp_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_blok_zgetrfsp_model = {
diff --git a/sopalin/starpu/codelet_blok_zhetrfsp.c b/sopalin/starpu/codelet_blok_zhetrfsp.c
index bc07e19c..d073d0f5 100644
--- a/sopalin/starpu/codelet_blok_zhetrfsp.c
+++ b/sopalin/starpu/codelet_blok_zhetrfsp.c
@@ -98,6 +98,7 @@ static void (*blok_zhetrfsp_callback)(void*) = cl_profiling_callback;
#endif /* defined(PASTIX_STARPU_PROFILING) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -151,6 +152,7 @@ fct_blok_zhetrfsp_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_blok_zhetrfsp_model = {
diff --git a/sopalin/starpu/codelet_blok_zpotrfsp.c b/sopalin/starpu/codelet_blok_zpotrfsp.c
index 28e6631b..020ec960 100644
--- a/sopalin/starpu/codelet_blok_zpotrfsp.c
+++ b/sopalin/starpu/codelet_blok_zpotrfsp.c
@@ -98,6 +98,7 @@ static void (*blok_zpotrfsp_callback)(void*) = cl_profiling_callback;
#endif /* defined(PASTIX_STARPU_PROFILING) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -151,6 +152,7 @@ fct_blok_zpotrfsp_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_blok_zpotrfsp_model = {
diff --git a/sopalin/starpu/codelet_blok_zpxtrfsp.c b/sopalin/starpu/codelet_blok_zpxtrfsp.c
index e293d922..e76e2c66 100644
--- a/sopalin/starpu/codelet_blok_zpxtrfsp.c
+++ b/sopalin/starpu/codelet_blok_zpxtrfsp.c
@@ -99,6 +99,7 @@ static void (*blok_zpxtrfsp_callback)(void*) = cl_profiling_callback;
#ifndef DOXYGEN_SHOULD_SKIP_THIS
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -152,6 +153,7 @@ fct_blok_zpxtrfsp_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
static struct starpu_perfmodel starpu_blok_zpxtrfsp_model = {
#if defined(PASTIX_STARPU_COST_PER_ARCH)
diff --git a/sopalin/starpu/codelet_blok_zscalo.c b/sopalin/starpu/codelet_blok_zscalo.c
index 78d7dc68..f7fa83f5 100644
--- a/sopalin/starpu/codelet_blok_zscalo.c
+++ b/sopalin/starpu/codelet_blok_zscalo.c
@@ -71,6 +71,7 @@ static void (*blok_ztrsmsp_callback)(void*) = cl_profiling_callback;
#endif /* defined( PASTIX_STARPU_PROFILING ) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
* @brief Cost model function
*
@@ -107,6 +108,7 @@ fct_blok_zscalo_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
static struct starpu_perfmodel starpu_blok_zscalo_model = {
#if defined(PASTIX_STARPU_COST_PER_ARCH)
diff --git a/sopalin/starpu/codelet_blok_zsytrfsp.c b/sopalin/starpu/codelet_blok_zsytrfsp.c
index cd67d970..b842643a 100644
--- a/sopalin/starpu/codelet_blok_zsytrfsp.c
+++ b/sopalin/starpu/codelet_blok_zsytrfsp.c
@@ -99,6 +99,7 @@ static void (*blok_zsytrfsp_callback)(void*) = cl_profiling_callback;
#ifndef DOXYGEN_SHOULD_SKIP_THIS
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -152,6 +153,7 @@ fct_blok_zsytrfsp_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
static struct starpu_perfmodel starpu_blok_zsytrfsp_model = {
#if defined(PASTIX_STARPU_COST_PER_ARCH)
diff --git a/sopalin/starpu/codelet_blok_ztrsmsp.c b/sopalin/starpu/codelet_blok_ztrsmsp.c
index d896c199..dad2a195 100644
--- a/sopalin/starpu/codelet_blok_ztrsmsp.c
+++ b/sopalin/starpu/codelet_blok_ztrsmsp.c
@@ -107,6 +107,7 @@ static void (*blok_ztrsmsp_callback)(void*) = cl_profiling_callback;
#endif /* defined( PASTIX_STARPU_PROFILING ) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -161,6 +162,7 @@ fct_blok_ztrsmsp_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_blok_ztrsmsp_model = {
diff --git a/sopalin/starpu/codelet_cblk_zadd.c b/sopalin/starpu/codelet_cblk_zadd.c
index 5b5bc745..8783af7c 100644
--- a/sopalin/starpu/codelet_cblk_zadd.c
+++ b/sopalin/starpu/codelet_cblk_zadd.c
@@ -102,6 +102,7 @@ static void (*cblk_zadd_callback)(void*) = cl_profiling_callback;
#endif /* defined( PASTIX_STARPU_PROFILING ) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -156,6 +157,7 @@ fct_cblk_zadd_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_cblk_zadd_model = {
@@ -371,6 +373,7 @@ starpu_task_cblk_zadd_fanin( sopalin_data_t *sopalin_data,
#endif
0);
+ (void)sopalin_data;
(void)prio;
}
diff --git a/sopalin/starpu/codelet_cblk_zgemmsp.c b/sopalin/starpu/codelet_cblk_zgemmsp.c
index 9231d557..84b1065f 100644
--- a/sopalin/starpu/codelet_cblk_zgemmsp.c
+++ b/sopalin/starpu/codelet_cblk_zgemmsp.c
@@ -111,6 +111,7 @@ static void (*cblk_zgemmsp_callback)(void*) = cl_profiling_callback;
#endif /* defined( PASTIX_STARPU_PROFILING ) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -169,6 +170,7 @@ fct_cblk_zgemmsp_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_cblk_zgemmsp_model = {
diff --git a/sopalin/starpu/codelet_cblk_zgetrfsp.c b/sopalin/starpu/codelet_cblk_zgetrfsp.c
index 7b948a78..16d00b8c 100644
--- a/sopalin/starpu/codelet_cblk_zgetrfsp.c
+++ b/sopalin/starpu/codelet_cblk_zgetrfsp.c
@@ -100,6 +100,7 @@ static void (*cblk_zgetrfsp_callback)(void*) = cl_profiling_callback;
#endif /* defined(PASTIX_STARPU_PROFILING) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -158,6 +159,7 @@ fct_cblk_zgetrfsp_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_cblk_zgetrfsp_model = {
diff --git a/sopalin/starpu/codelet_cblk_zhetrfsp.c b/sopalin/starpu/codelet_cblk_zhetrfsp.c
index cf621c6d..49de7d81 100644
--- a/sopalin/starpu/codelet_cblk_zhetrfsp.c
+++ b/sopalin/starpu/codelet_cblk_zhetrfsp.c
@@ -101,6 +101,7 @@ static void (*cblk_zhetrfsp_callback)(void*) = cl_profiling_callback;
#endif /* defined(PASTIX_STARPU_PROFILING) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -159,6 +160,7 @@ fct_cblk_zhetrfsp_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_cblk_zhetrfsp_model = {
diff --git a/sopalin/starpu/codelet_cblk_zpotrfsp.c b/sopalin/starpu/codelet_cblk_zpotrfsp.c
index 1d42a2e5..38a3dd19 100644
--- a/sopalin/starpu/codelet_cblk_zpotrfsp.c
+++ b/sopalin/starpu/codelet_cblk_zpotrfsp.c
@@ -100,6 +100,7 @@ static void (*cblk_zpotrfsp_callback)(void*) = cl_profiling_callback;
#endif /* defined(PASTIX_STARPU_PROFILING) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -158,6 +159,7 @@ fct_cblk_zpotrfsp_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_cblk_zpotrfsp_model = {
diff --git a/sopalin/starpu/codelet_cblk_zpxtrfsp.c b/sopalin/starpu/codelet_cblk_zpxtrfsp.c
index 1542138a..37bb5841 100644
--- a/sopalin/starpu/codelet_cblk_zpxtrfsp.c
+++ b/sopalin/starpu/codelet_cblk_zpxtrfsp.c
@@ -99,6 +99,7 @@ static void (*cblk_zpxtrfsp_callback)(void*) = cl_profiling_callback;
#endif /* defined(PASTIX_STARPU_PROFILING) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -157,6 +158,7 @@ fct_cblk_zpxtrfsp_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_cblk_zpxtrfsp_model = {
diff --git a/sopalin/starpu/codelet_cblk_zsytrfsp.c b/sopalin/starpu/codelet_cblk_zsytrfsp.c
index 390fa63f..5d117bc9 100644
--- a/sopalin/starpu/codelet_cblk_zsytrfsp.c
+++ b/sopalin/starpu/codelet_cblk_zsytrfsp.c
@@ -101,6 +101,7 @@ static void (*cblk_zsytrfsp_callback)(void*) = cl_profiling_callback;
#endif /* defined(PASTIX_STARPU_PROFILING) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
*******************************************************************************
*
@@ -159,6 +160,7 @@ fct_cblk_zsytrfsp_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_cblk_zsytrfsp_model = {
diff --git a/sopalin/starpu/codelet_template.c b/sopalin/starpu/codelet_template.c
index c9929fdf..ffdcb245 100644
--- a/sopalin/starpu/codelet_template.c
+++ b/sopalin/starpu/codelet_template.c
@@ -100,6 +100,7 @@ static void (*template_callback)(void*) = cl_profiling_callback;
#endif /* defined( PASTIX_STARPU_PROFILING ) */
+#if defined(PASTIX_STARPU_COST_PER_ARCH)
/**
* @brief Cost model function
*
@@ -137,6 +138,7 @@ fct_template_cost( struct starpu_task *task,
(void)nimpl;
return cost;
}
+#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
static struct starpu_perfmodel starpu_template_model = {
diff --git a/sopalin/starpu/starpu_rhs.c b/sopalin/starpu/starpu_rhs.c
index db51da43..8bc1c805 100644
--- a/sopalin/starpu/starpu_rhs.c
+++ b/sopalin/starpu/starpu_rhs.c
@@ -158,10 +158,9 @@ starpu_rhs_init( SolverMatrix *solvmtx,
starpu_data_handle_t *handler;
SolverCblk *cblk;
pastix_int_t cblknbr, cblknum, nrow;
- pastix_int_t ncol = rhsb->n;
- int64_t tag_desc;
+ pastix_int_t ncol = rhsb->n;
+ starpu_rhs_desc_t *rhsdesc = rhsb->starpu_desc;
- starpu_rhs_desc_t *rhsdesc = rhsb->starpu_desc;
if ( rhsdesc != NULL ) {
if ( ( ncol == rhsdesc->ncol ) &&
( rhsb->b == rhsdesc->dataptr ) ) {
@@ -176,8 +175,10 @@ starpu_rhs_init( SolverMatrix *solvmtx,
cblknbr = solvmtx->cblknbr;
#if defined(PASTIX_WITH_MPI)
- tag_desc = ( (int64_t) ( solvmtx->gcblknbr + solvmtx->gfanincblknbr ) );
- rhsdesc->mpitag = pastix_starpu_tag_book( tag_desc );
+ {
+ int64_t tag_desc = ( (int64_t) ( solvmtx->gcblknbr + solvmtx->gfanincblknbr ) );
+ rhsdesc->mpitag = pastix_starpu_tag_book( tag_desc );
+ }
#endif
rhsdesc->ncol = ncol;
rhsdesc->typesze = pastix_size_of( typesize );
diff --git a/sopalin/starpu/starpu_ztrsm.c b/sopalin/starpu/starpu_ztrsm.c
index 5905f806..6aede0af 100644
--- a/sopalin/starpu/starpu_ztrsm.c
+++ b/sopalin/starpu/starpu_ztrsm.c
@@ -267,7 +267,10 @@ starpu_ztrsm_sp1dplus( pastix_data_t *pastix_data,
const args_solve_t *enums )
{
SolverMatrix *datacode = sopalin_data->solvmtx;
- SolverCblk *cblk, *fcblk;
+ SolverCblk *cblk;
+#if defined(PASTIX_WITH_MPI)
+ SolverCblk *fcblk;
+#endif
pastix_int_t i, cblknbr, prio;
/* Backward like */
--
GitLab