From 813804aecdf6befd700300e3cda78008f59e24fb Mon Sep 17 00:00:00 2001
From: SYLVAND Guillaume <guillaume.sylvand@airbus.com>
Date: Sun, 25 Apr 2021 14:12:21 +0200
Subject: [PATCH] Allow compilation without hmat
---
include/util.h | 4 ++--
src/main.c | 2 ++
src/util.c | 2 --
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/util.h b/include/util.h
index 83566ab..88e14b2 100644
--- a/include/util.h
+++ b/include/util.h
@@ -322,6 +322,8 @@ struct mpf_hmat_create_compression_args_t {
double threshold;
const void * output;
};
+int hmat_get_sync_exec(void) ;
+void mpf_hmat_compression(struct mpf_hmat_create_compression_args_t *);
#endif
#if !(defined (_WIN32)) /* It's a UNIX system, I know this ! */
@@ -429,7 +431,5 @@ double time_in_s(Time t);
double time_interval_in_seconds(Time t1, Time t2);
void simpleToDouble(void *data, size_t n) ;
void doubleToSimple(void *data, size_t n) ;
-int hmat_get_sync_exec(void) ;
-void mpf_hmat_compression(struct mpf_hmat_create_compression_args_t *);
int SCAB_Init(int* argc, char*** argv) ;
int SCAB_Exit(int* argc, char** argv) ;
diff --git a/src/main.c b/src/main.c
index 490da50..a9a1de3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -103,7 +103,9 @@ int main(int argc, char **argv) {
case _gemvHCHAMELEON:
case _gemmHCHAMELEON:
case _solveHCHAMELEON:
+#ifdef HAVE_HMAT
mpf_hmat_settings.engine = mpf_hmat_seq;
+#endif
ierr = init_hmat_interface(); CHKERRQ(ierr);
break;
case _undefined:
diff --git a/src/util.c b/src/util.c
index b370936..ea88732 100644
--- a/src/util.c
+++ b/src/util.c
@@ -953,8 +953,6 @@ int SCAB_Init(int* argc, char*** argv) {
hmat_set_parameters(&settings);
mpf_hmat_settings.progress.update = update_progress;
-#else
- SETERRQ(1, "HMatrix solver not available");
#endif
--
GitLab